Commit 72146e78 authored by Max Kellermann's avatar Max Kellermann

output/httpd: use std::lock_guard

parent f7af1bb8
...@@ -325,9 +325,10 @@ HttpdOutput::BroadcastPage(PagePtr page) ...@@ -325,9 +325,10 @@ HttpdOutput::BroadcastPage(PagePtr page)
{ {
assert(page != nullptr); assert(page != nullptr);
mutex.lock(); {
pages.emplace(std::move(page)); const std::lock_guard<Mutex> lock(mutex);
mutex.unlock(); pages.emplace(std::move(page));
}
DeferredMonitor::Schedule(); DeferredMonitor::Schedule();
} }
...@@ -336,15 +337,15 @@ void ...@@ -336,15 +337,15 @@ void
HttpdOutput::BroadcastFromEncoder() HttpdOutput::BroadcastFromEncoder()
{ {
/* synchronize with the IOThread */ /* synchronize with the IOThread */
mutex.lock(); {
while (!pages.empty()) const std::lock_guard<Mutex> lock(mutex);
cond.wait(mutex); while (!pages.empty())
cond.wait(mutex);
PagePtr page;
while ((page = ReadPage()) != nullptr) PagePtr page;
pages.push(page); while ((page = ReadPage()) != nullptr)
pages.push(page);
mutex.unlock(); }
DeferredMonitor::Schedule(); DeferredMonitor::Schedule();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment