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

thread/Cond: add wait() overload which takes a unique_lock<>

Browse Source 
Just like std::condition_variable, which however has no way to specify
the std::mutex directly.
This commit is contained in:
Max Kellermann
2019-04-25 18:53:38 +02:00
parent b51bae5500
commit 92022658f9
18 changed files with 66 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -198,7 +198,7 @@ UdisksStorage::OnListReply(ODBus::Message reply) noexcept
void
UdisksStorage::MountWait()
{
const std::lock_guard<Mutex> lock(mutex);
std::unique_lock<Mutex> lock(mutex);
if (mounted_storage)
/* already mounted */
@@ -210,7 +210,7 @@ UdisksStorage::MountWait()
}
while (want_mount)
cond.wait(mutex);
cond.wait(lock);
if (mount_error)
std::rethrow_exception(mount_error);
@@ -272,7 +272,7 @@ try {
void
UdisksStorage::UnmountWait()
{
const std::lock_guard<Mutex> lock(mutex);
std::unique_lock<Mutex> lock(mutex);
if (!mounted_storage)
/* not mounted */
@@ -281,7 +281,7 @@ UdisksStorage::UnmountWait()
defer_unmount.Schedule();
while (mounted_storage)
cond.wait(mutex);
cond.wait(lock);
if (mount_error)
std::rethrow_exception(mount_error);