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

72008d95 · Max Kellermann · 72146e78 · 72008d95
Commit 72008d95 authored Feb 19, 2017 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

HttpdOutputPlugin.cxx src/output/plugins/httpd/HttpdOutputPlugin.cxx +5 -3

No files found.
--- a/src/output/plugins/httpd/HttpdOutputPlugin.cxx
+++ b/src/output/plugins/httpd/HttpdOutputPlugin.cxx
@@ -341,10 +341,12 @@ HttpdOutput::BroadcastFromEncoder()
 		const std::lock_guard<Mutex> lock(mutex);
 		while (!pages.empty())
 			cond.wait(mutex);
+	}

-		PagePtr page;
-		while ((page = ReadPage()) != nullptr)
-			pages.push(page);
+	PagePtr page;
+	while ((page = ReadPage()) != nullptr) {
+		const std::lock_guard<Mutex> lock(mutex);
+		pages.push(std::move(page));
 	}

 	DeferredMonitor::Schedule();