diff options
author | Billy Donahue <billy.donahue@mongodb.com> | 2019-01-04 12:19:37 -0500 |
---|---|---|
committer | Billy Donahue <billy.donahue@mongodb.com> | 2019-01-07 12:08:23 -0500 |
commit | 11bb071e91461b1f8e40b9b15ddf3b9e1a2d23d1 (patch) | |
tree | 7037865f9bf4445fb3295ca7ce72f4182f012554 /src/mongo/util/concurrency | |
parent | 6a0a21214dd96663c899cb8f2562d6121351ed3c (diff) | |
download | mongo-11bb071e91461b1f8e40b9b15ddf3b9e1a2d23d1.tar.gz |
SERVER-36644 remove AtomicWord typedefs
Diffstat (limited to 'src/mongo/util/concurrency')
-rw-r--r-- | src/mongo/util/concurrency/thread_name.cpp | 2 | ||||
-rw-r--r-- | src/mongo/util/concurrency/thread_pool.cpp | 2 | ||||
-rw-r--r-- | src/mongo/util/concurrency/ticketholder.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/util/concurrency/thread_name.cpp b/src/mongo/util/concurrency/thread_name.cpp index b632052330c..c6d6f68617d 100644 --- a/src/mongo/util/concurrency/thread_name.cpp +++ b/src/mongo/util/concurrency/thread_name.cpp @@ -90,7 +90,7 @@ void setWindowsThreadName(DWORD dwThreadID, const char* threadName) { } #endif -AtomicInt64 nextUnnamedThreadId{1}; +AtomicWord<long long> nextUnnamedThreadId{1}; // It is unsafe to access threadName before its dynamic initialization has completed. Use // the execution of mongo initializers (which only happens once we have entered main, and diff --git a/src/mongo/util/concurrency/thread_pool.cpp b/src/mongo/util/concurrency/thread_pool.cpp index 83114e8bda2..158396e6a93 100644 --- a/src/mongo/util/concurrency/thread_pool.cpp +++ b/src/mongo/util/concurrency/thread_pool.cpp @@ -47,7 +47,7 @@ namespace mongo { namespace { // Counter used to assign unique names to otherwise-unnamed thread pools. -AtomicInt32 nextUnnamedThreadPoolId{1}; +AtomicWord<int> nextUnnamedThreadPoolId{1}; /** * Sets defaults and checks bounds limits on "options", and returns it. diff --git a/src/mongo/util/concurrency/ticketholder.h b/src/mongo/util/concurrency/ticketholder.h index 0865e36a430..4b1ffcb5ce0 100644 --- a/src/mongo/util/concurrency/ticketholder.h +++ b/src/mongo/util/concurrency/ticketholder.h @@ -87,12 +87,12 @@ private: mutable sem_t _sem; // You can read _outof without a lock, but have to hold _resizeMutex to change. - AtomicInt32 _outof; + AtomicWord<int> _outof; stdx::mutex _resizeMutex; #else bool _tryAcquire(); - AtomicInt32 _outof; + AtomicWord<int> _outof; int _num; stdx::mutex _mutex; stdx::condition_variable _newTicket; |