diff options
author | Andrew Morrow <acm@mongodb.com> | 2015-06-18 15:02:54 -0400 |
---|---|---|
committer | Andrew Morrow <acm@mongodb.com> | 2015-06-19 22:51:28 -0400 |
commit | 1178eff1ddf60a7dac3a8cd71e2fdd278aa01b52 (patch) | |
tree | ee3096045eb4d2e4f69d57ef85c66b3be69e4302 /src/mongo/db/range_deleter.h | |
parent | 4b5fa5fc711e4cf94291665575fd1c742ad3e7c3 (diff) | |
download | mongo-1178eff1ddf60a7dac3a8cd71e2fdd278aa01b52.tar.gz |
SERVER-19041 Simplify SimpleMutex
Diffstat (limited to 'src/mongo/db/range_deleter.h')
-rw-r--r-- | src/mongo/db/range_deleter.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mongo/db/range_deleter.h b/src/mongo/db/range_deleter.h index db56a86576b..eaf8fa35e1d 100644 --- a/src/mongo/db/range_deleter.h +++ b/src/mongo/db/range_deleter.h @@ -39,6 +39,7 @@ #include "mongo/db/jsobj.h" #include "mongo/db/operation_context.h" #include "mongo/db/write_concern_options.h" +#include "mongo/stdx/mutex.h" #include "mongo/stdx/thread.h" #include "mongo/util/concurrency/mutex.h" #include "mongo/util/concurrency/synchronization.h" @@ -203,7 +204,7 @@ namespace mongo { std::unique_ptr<stdx::thread> _worker; // Protects _stopRequested. - mutable mutex _stopMutex; + mutable stdx::mutex _stopMutex; // If set, no other delete taks should be accepted. bool _stopRequested; @@ -214,7 +215,7 @@ namespace mongo { stdx::condition_variable _nothingInProgressCV; // Protects all the data structure below this. - mutable mutex _queueMutex; + mutable stdx::mutex _queueMutex; // _taskQueue has a task ready to work on. stdx::condition_variable _taskQueueNotEmptyCV; @@ -240,7 +241,7 @@ namespace mongo { size_t _deletesInProgress; // Protects _statsHistory - mutable mutex _statsHistoryMutex; + mutable stdx::mutex _statsHistoryMutex; std::deque<DeleteJobStats*> _statsHistory; }; |