summaryrefslogtreecommitdiff
path: root/lib/cpp
diff options
context:
space:
mode:
authorDavid Reiss <dreiss@apache.org>2008-06-10 22:55:04 +0000
committerDavid Reiss <dreiss@apache.org>2008-06-10 22:55:04 +0000
commite3a64923e9620ebf99ff51ed5bfcb366e503c79e (patch)
tree2d7212edec32b8f46d3451ed6a0dc8c3fa5173f8 /lib/cpp
parent791a57f528e12829acd6d2950d50e65139080f49 (diff)
downloadthrift-e3a64923e9620ebf99ff51ed5bfcb366e503c79e.tar.gz
Fix locking bug in ThreadManager.
It looks like the scheduler waits on monitor_, but the worker notifies workerMonitor_. Also, it does so out of critical section. git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@666361 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'lib/cpp')
-rw-r--r--lib/cpp/src/concurrency/ThreadManager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/cpp/src/concurrency/ThreadManager.cpp b/lib/cpp/src/concurrency/ThreadManager.cpp
index 604602e04..34acc4cfd 100644
--- a/lib/cpp/src/concurrency/ThreadManager.cpp
+++ b/lib/cpp/src/concurrency/ThreadManager.cpp
@@ -251,7 +251,7 @@ class ThreadManager::Worker: public Runnable {
thread that might be blocked on add. */
if (manager_->pendingTaskCountMax_ != 0 &&
manager_->tasks_.size() == manager_->pendingTaskCountMax_ - 1) {
- manager_->workerMonitor_.notify();
+ manager_->monitor_.notify();
}
}
} else {