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

output/httpd: use std::lock_guard

Browse Source
This commit is contained in:
Max Kellermann 2017-02-19 20:32:21 +01:00
parent f7af1bb8e2
commit 72146e7800
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/output/plugins/httpd/HttpdOutputPlugin.cxx
View File

@ -325,9 +325,10 @@ HttpdOutput::BroadcastPage(PagePtr page)
{
assert(page != nullptr);
mutex.lock();
pages.emplace(std::move(page));
mutex.unlock();
{
const std::lock_guard<Mutex> lock(mutex);
pages.emplace(std::move(page));
}
DeferredMonitor::Schedule();
}
@ -336,15 +337,15 @@ void
HttpdOutput::BroadcastFromEncoder()
{
/* synchronize with the IOThread */
mutex.lock();
while (!pages.empty())
cond.wait(mutex);
{
const std::lock_guard<Mutex> lock(mutex);
while (!pages.empty())
cond.wait(mutex);
PagePtr page;
while ((page = ReadPage()) != nullptr)
pages.push(page);
mutex.unlock();
PagePtr page;
while ((page = ReadPage()) != nullptr)
pages.push(page);
}
DeferredMonitor::Schedule();
}