tursom/memgraph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix conditional wait.

Browse Source 
Summary: It could happen that the garbage collector waits for the sleep period before exiting thread since notify_one wasn't done after mutex locking.

Reviewers: mislav.bradac

Reviewed By: mislav.bradac

Differential Revision: https://phabricator.memgraph.io/D206
This commit is contained in:
Dominik Gleich 2017-03-30 13:24:54 +02:00
parent 3d2b37ed35
commit cac422f6a8
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/storage/garbage_collector.hpp
View File

@ -27,7 +27,10 @@ class GarbageCollector : public Loggable {
~GarbageCollector() { ~GarbageCollector() {
destruction_.store(true); destruction_.store(true);
condition_variable_.notify_one(); {
std::unique_lock<std::mutex> lk(mutex_);
condition_variable_.notify_one();
}
if (run_thread_.joinable()) run_thread_.join(); if (run_thread_.joinable()) run_thread_.join();
} }