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

db/upnp/WorkQueue: remove unnecessary "waiting" attributes

Browse Source
This commit is contained in:
Max Kellermann
2014-01-14 11:38:48 +01:00
parent 9f316e11bd
commit 5de0f3f36a
1 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -67,9 +67,6 @@ class WorkQueue {
Cond client_cond; Cond client_cond;
Cond worker_cond; Cond worker_cond;
Mutex mutex; Mutex mutex;
// Client/Worker threads currently waiting for a job
unsigned n_clients_waiting;
unsigned n_workers_waiting;
public: public:
/** Create a WorkQueue /** Create a WorkQueue
@@ -82,8 +79,7 @@ public:
:name(_name), high(hi), low(lo), :name(_name), high(hi), low(lo),
n_workers_exited(0), n_workers_exited(0),
ok(true), ok(true),
n_threads(0), threads(nullptr), n_threads(0), threads(nullptr)
n_clients_waiting(0), n_workers_waiting(0)
{ {
} }
@@ -136,20 +132,15 @@ public:
while (IsOK() && high > 0 && queue.size() >= high) { while (IsOK() && high > 0 && queue.size() >= high) {
// Keep the order: we test IsOK() AFTER the sleep... // Keep the order: we test IsOK() AFTER the sleep...
n_clients_waiting++;
client_cond.wait(mutex); client_cond.wait(mutex);
if (!IsOK()) { if (!IsOK())
n_clients_waiting--;
return false; return false;
}
n_clients_waiting--;
} }
queue.push(t); queue.push(t);
if (n_workers_waiting > 0) {
// Just wake one worker, there is only one new task. // Just wake one worker, there is only one new task.
worker_cond.signal(); worker_cond.signal();
}
return true; return true;
} }
@@ -165,9 +156,7 @@ public:
ok = false; ok = false;
while (n_workers_exited < n_threads) { while (n_workers_exited < n_threads) {
worker_cond.broadcast(); worker_cond.broadcast();
n_clients_waiting++;
client_cond.wait(mutex); client_cond.wait(mutex);
n_clients_waiting--;
} }
// Perform the thread joins and compute overall status // Perform the thread joins and compute overall status
@@ -182,7 +171,7 @@ public:
n_threads = 0; n_threads = 0;
// Reset to start state. // Reset to start state.
n_workers_exited = n_clients_waiting = n_workers_waiting = 0; n_workers_exited = 0;
ok = true; ok = true;
} }
@@ -200,7 +189,6 @@ public:
} }
while (IsOK() && queue.size() < low) { while (IsOK() && queue.size() < low) {
n_workers_waiting++;
if (queue.empty()) if (queue.empty())
client_cond.broadcast(); client_cond.broadcast();
worker_cond.wait(mutex); worker_cond.wait(mutex);
@@ -210,18 +198,15 @@ public:
LOGERR(("WorkQueue::take:%s: cond_wait failed or !ok\n", LOGERR(("WorkQueue::take:%s: cond_wait failed or !ok\n",
name.c_str())); name.c_str()));
} }
n_workers_waiting--;
return false; return false;
} }
n_workers_waiting--;
} }
tp = queue.front(); tp = queue.front();
queue.pop(); queue.pop();
if (n_clients_waiting > 0) {
// No reason to wake up more than one client thread // No reason to wake up more than one client thread
client_cond.signal(); client_cond.signal();
}
return true; return true;
} }