diff options
| author | Andrew Morrow <acm@mongodb.com> | 2017-02-26 15:15:08 -0500 |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2017-08-02 23:29:55 -0400 |
| commit | a8a1ea3b9367adb6d0b65a7da21fed89598ea093 (patch) | |
| tree | 8e969ed54b88c2a9c4c2d45a6518d053ac9f4265 /src/mongo/util/signal_handlers_synchronous.cpp | |
| parent | c02c14e30d75b02894da116f4bb1a71652ead2b4 (diff) | |
| download | mongo-a8a1ea3b9367adb6d0b65a7da21fed89598ea093.tar.gz | |
SERVER-26538 SERVER-26539 Detach from boost::thread
Also, use thread_local everywhere for our thread specific data needs
and remove the legacy support.
Diffstat (limited to 'src/mongo/util/signal_handlers_synchronous.cpp')
| -rw-r--r-- | src/mongo/util/signal_handlers_synchronous.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mongo/util/signal_handlers_synchronous.cpp b/src/mongo/util/signal_handlers_synchronous.cpp index 8107143ef55..2331190fabc 100644 --- a/src/mongo/util/signal_handlers_synchronous.cpp +++ b/src/mongo/util/signal_handlers_synchronous.cpp @@ -48,7 +48,6 @@ #include "mongo/platform/compiler.h" #include "mongo/stdx/thread.h" #include "mongo/util/concurrency/thread_name.h" -#include "mongo/util/concurrency/threadlocal.h" #include "mongo/util/debug_util.h" #include "mongo/util/debugger.h" #include "mongo/util/exception_filter_win32.h" @@ -156,12 +155,12 @@ public: private: static stdx::mutex _streamMutex; - static MONGO_TRIVIALLY_CONSTRUCTIBLE_THREAD_LOCAL int terminateDepth; + static thread_local int terminateDepth; stdx::unique_lock<stdx::mutex> _lk; }; + stdx::mutex MallocFreeOStreamGuard::_streamMutex; -MONGO_TRIVIALLY_CONSTRUCTIBLE_THREAD_LOCAL -int MallocFreeOStreamGuard::terminateDepth = 0; +thread_local int MallocFreeOStreamGuard::terminateDepth = 0; // must hold MallocFreeOStreamGuard to call void writeMallocFreeStreamToLog() { |