oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

input/async: add attribute "postponed_exception"

Browse Source 
Will replace "postponed_error".
This commit is contained in:
Max Kellermann 2016-09-09 15:41:09 +02:00
parent 6ed77f2a27
commit 8092e18158
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/input/AsyncInputStream.cxx
View File

@ -88,6 +88,12 @@ AsyncInputStream::Resume()
bool bool
AsyncInputStream::Check(Error &error) AsyncInputStream::Check(Error &error)
{ {
if (postponed_exception) {
auto e = std::move(postponed_exception);
postponed_exception = std::exception_ptr();
std::rethrow_exception(e);
}
bool success = !postponed_error.IsDefined(); bool success = !postponed_error.IsDefined();
if (!success) { if (!success) {
error = std::move(postponed_error); error = std::move(postponed_error);
@ -181,6 +187,7 @@ bool
AsyncInputStream::IsAvailable() AsyncInputStream::IsAvailable()
{ {
return postponed_error.IsDefined() || return postponed_error.IsDefined() ||
postponed_exception ||
IsEOF() || IsEOF() ||
!buffer.IsEmpty(); !buffer.IsEmpty();
} }

4
src/input/AsyncInputStream.hxx
View File

@ -26,6 +26,8 @@
#include "util/CircularBuffer.hxx" #include "util/CircularBuffer.hxx"
#include "util/Error.hxx" #include "util/Error.hxx"
#include <exception>
/** /**
* Helper class for moving asynchronous (non-blocking) InputStream * Helper class for moving asynchronous (non-blocking) InputStream
* implementations to the I/O thread. Data is being read into a ring * implementations to the I/O thread. Data is being read into a ring
@ -67,6 +69,8 @@ class AsyncInputStream : public InputStream {
protected: protected:
Error postponed_error; Error postponed_error;
std::exception_ptr postponed_exception;
public: public:
/** /**
* @param _buffer a buffer allocated with HugeAllocate(); the * @param _buffer a buffer allocated with HugeAllocate(); the