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

ThreadInputStream: add assertions

Browse Source
This commit is contained in:
Max Kellermann
2014-10-11 21:57:31 +02:00
parent 538ddf7af2
commit 7cd53fb452
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/input/ThreadInputStream.cxx
View File

@@ -118,6 +118,8 @@ ThreadInputStream::ThreadFunc(void *ctx)
bool bool
ThreadInputStream::Check(Error &error) ThreadInputStream::Check(Error &error)
{ {
assert(!thread.IsInside());
if (postponed_error.IsDefined()) { if (postponed_error.IsDefined()) {
error = std::move(postponed_error); error = std::move(postponed_error);
return false; return false;
@@ -129,12 +131,16 @@ ThreadInputStream::Check(Error &error)
bool bool
ThreadInputStream::IsAvailable() ThreadInputStream::IsAvailable()
{ {
assert(!thread.IsInside());
return !buffer->IsEmpty() || eof || postponed_error.IsDefined(); return !buffer->IsEmpty() || eof || postponed_error.IsDefined();
} }
inline size_t inline size_t
ThreadInputStream::Read(void *ptr, size_t read_size, Error &error) ThreadInputStream::Read(void *ptr, size_t read_size, Error &error)
{ {
assert(!thread.IsInside());
while (true) { while (true) {
if (postponed_error.IsDefined()) { if (postponed_error.IsDefined()) {
error = std::move(postponed_error); error = std::move(postponed_error);
@@ -161,5 +167,7 @@ ThreadInputStream::Read(void *ptr, size_t read_size, Error &error)
bool bool
ThreadInputStream::IsEOF() ThreadInputStream::IsEOF()
{ {
assert(!thread.IsInside());
return eof; return eof;
} }