diff options
| author |  Abseil Team <absl-team@google.com> | 2018-01-28 22:33:45 -0800 |
|---|---|---|
| committer |  jueminyang <jueminyang@google.com> | 2018-01-29 10:41:30 -0500 |
| commit | 46ed9d96d1412223d22430ca2aed4411894c2d63 (patch) | |
| tree | d6d162ed8946b141c6b7d7c54f15ad763af74b76 /absl | |
| parent | b301ce157fa252c93ffbaeeed525304c80815269 (diff) | |
Changes imported from Abseil "staging" branch:
- bf0a6e6c8e5baf66a041741588e19ddf68180879 Inline Mutex constructor. by Abseil Team <absl-team@google.com>
- d53a9c76bc8a16bf79ed7118ca279ca8bebdf18b Internal merge of https://github.com/abseil/abseil-cpp/pu... by Jon Cohen <cohenjon@google.com>
GitOrigin-RevId: bf0a6e6c8e5baf66a041741588e19ddf68180879
Change-Id: Iebb4f88f59b7476012e19895ea6f348a2af4a1ae
Diffstat (limited to 'absl')
| -rw-r--r-- | absl/synchronization/mutex.cc | 5 | ||||
| -rw-r--r-- | absl/synchronization/mutex.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/absl/synchronization/mutex.cc b/absl/synchronization/mutex.cc index 06a058cf..33f92d8f 100644 --- a/absl/synchronization/mutex.cc +++ b/absl/synchronization/mutex.cc @@ -48,7 +48,6 @@ #include "absl/base/internal/spinlock.h" #include "absl/base/internal/sysinfo.h" #include "absl/base/internal/thread_identity.h" -#include "absl/base/internal/tsan_mutex_interface.h" #include "absl/base/port.h" #include "absl/debugging/stacktrace.h" #include "absl/synchronization/internal/graphcycles.h" @@ -687,10 +686,6 @@ static unsigned TsanFlags(Mutex::MuHow how) { } #endif -Mutex::Mutex() : mu_(0) { - ABSL_TSAN_MUTEX_CREATE(this, __tsan_mutex_not_static); -} - static bool DebugOnlyIsExiting() { return false; } diff --git a/absl/synchronization/mutex.h b/absl/synchronization/mutex.h index b09802b5..374cf57d 100644 --- a/absl/synchronization/mutex.h +++ b/absl/synchronization/mutex.h @@ -64,6 +64,7 @@ #include "absl/base/internal/identity.h" #include "absl/base/internal/low_level_alloc.h" #include "absl/base/internal/thread_identity.h" +#include "absl/base/internal/tsan_mutex_interface.h" #include "absl/base/port.h" #include "absl/base/thread_annotations.h" #include "absl/synchronization/internal/kernel_timeout.h" @@ -860,6 +861,9 @@ class SCOPED_LOCKABLE ReleasableMutexLock { #ifdef ABSL_INTERNAL_USE_NONPROD_MUTEX #else +inline Mutex::Mutex() : mu_(0) { + ABSL_TSAN_MUTEX_CREATE(this, __tsan_mutex_not_static); +} inline CondVar::CondVar() : cv_(0) {} #endif |