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

event/Call, ...: use wait() with predicate

Browse Source
This commit is contained in:
Max Kellermann
2019-05-07 20:01:45 +02:00
parent 72fc117393
commit 973c87b351
12 changed files with 20 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/storage/plugins/CurlStorage.cxx
View File

@@ -125,8 +125,7 @@ public:
void Wait() {
std::unique_lock<Mutex> lock(mutex);
while (!done)
cond.wait(lock);
cond.wait(lock, [this]{ return done; });
if (postponed_error)
std::rethrow_exception(postponed_error);

6
src/storage/plugins/UdisksStorage.cxx
View File

@@ -209,8 +209,7 @@ UdisksStorage::MountWait()
defer_mount.Schedule();
}
while (want_mount)
cond.wait(lock);
cond.wait(lock, [this]{ return !want_mount; });
if (mount_error)
std::rethrow_exception(mount_error);
@@ -280,8 +279,7 @@ UdisksStorage::UnmountWait()
defer_unmount.Schedule();
while (mounted_storage)
cond.wait(lock);
cond.wait(lock, [this]{ return !mounted_storage; });
if (mount_error)
std::rethrow_exception(mount_error);