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

db/upnp/WorkQueue: pass reference to take()

Browse Source
This commit is contained in:
Max Kellermann
2014-01-14 11:02:04 +01:00
parent e259474362
commit c13facdaca
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/db/upnp/Discovery.cxx
View File

@@ -109,7 +109,7 @@ discoExplorer(void *)
{ {
for (;;) { for (;;) {
DiscoveredTask *tsk = 0; DiscoveredTask *tsk = 0;
if (!discoveredQueue.take(&tsk)) { if (!discoveredQueue.take(tsk)) {
discoveredQueue.workerExit(); discoveredQueue.workerExit();
return (void*)1; return (void*)1;
} }

4
src/db/upnp/WorkQueue.hxx
View File

@@ -241,7 +241,7 @@ public:
* Sleeps if there are not enough. Signal if we go to sleep on empty * Sleeps if there are not enough. Signal if we go to sleep on empty
* queue: client may be waiting for our going idle. * queue: client may be waiting for our going idle.
*/ */
bool take(T* tp) bool take(T &tp)
{ {
const ScopeLock protect(m_mutex); const ScopeLock protect(m_mutex);
@@ -266,7 +266,7 @@ public:
m_workers_waiting--; m_workers_waiting--;
} }
*tp = m_queue.front(); tp = m_queue.front();
m_queue.pop(); m_queue.pop();
if (m_clients_waiting > 0) { if (m_clients_waiting > 0) {
// No reason to wake up more than one client thread // No reason to wake up more than one client thread