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

output/httpd: no mutex lock while reading data from encoder

Browse Source
This commit is contained in:
Max Kellermann 2017-02-19 20:45:16 +01:00
parent 72146e7800
commit 72008d951b
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -341,10 +341,12 @@ HttpdOutput::BroadcastFromEncoder()
const std::lock_guard<Mutex> lock(mutex); const std::lock_guard<Mutex> lock(mutex);
while (!pages.empty()) while (!pages.empty())
cond.wait(mutex); cond.wait(mutex);
}
PagePtr page; PagePtr page;
while ((page = ReadPage()) != nullptr) while ((page = ReadPage()) != nullptr) {
pages.push(page); const std::lock_guard<Mutex> lock(mutex);
pages.push(std::move(page));
} }
DeferredMonitor::Schedule(); DeferredMonitor::Schedule();