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

thread/*Cond: rename methods to match std::condition_variable

Browse Source
This commit is contained in:
Max Kellermann
2019-04-25 18:33:09 +02:00
parent 5bc8cd0ecb
commit b51bae5500
25 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/input/BufferedInputStream.cxx
View File

@@ -50,7 +50,7 @@ BufferedInputStream::~BufferedInputStream() noexcept
{
const std::lock_guard<Mutex> lock(mutex);
stop = true;
wake_cond.signal();
wake_cond.notify_one();
}
thread.Join();
@@ -81,7 +81,7 @@ BufferedInputStream::Seek(offset_type new_offset)
seek_offset = new_offset;
seek = true;
wake_cond.signal();
wake_cond.notify_one();
while (seek)
client_cond.wait(mutex);
@@ -123,21 +123,21 @@ BufferedInputStream::Read(void *ptr, size_t s)
if (!IsAvailable()) {
/* wake up the sleeping thread */
idle = false;
wake_cond.signal();
wake_cond.notify_one();
}
return nbytes;
}
if (read_error) {
wake_cond.signal();
wake_cond.notify_one();
std::rethrow_exception(std::exchange(read_error, {}));
}
if (idle) {
/* wake up the sleeping thread */
idle = false;
wake_cond.signal();
wake_cond.notify_one();
}
client_cond.wait(mutex);
@@ -163,7 +163,7 @@ BufferedInputStream::RunThread() noexcept
idle = false;
seek = false;
client_cond.signal();
client_cond.notify_one();
} else if (!idle && !read_error &&
input->IsAvailable() && !input->IsEOF()) {
const auto read_offset = input->GetOffset();
@@ -186,7 +186,7 @@ BufferedInputStream::RunThread() noexcept
input->Seek(offset);
} catch (...) {
read_error = std::current_exception();
client_cond.signal();
client_cond.notify_one();
InvokeOnAvailable();
}
}
@@ -202,7 +202,7 @@ BufferedInputStream::RunThread() noexcept
read_error = std::current_exception();
}
client_cond.signal();
client_cond.notify_one();
InvokeOnAvailable();
} else
wake_cond.wait(mutex);