diff options
| author |  Mike Klein <mtklein@chromium.org> | 2017-09-19 12:56:37 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-19 18:05:50 +0000 |
| commit | e395bf2d189e22822ddf2b46541c510d6d8fbcc0 (patch) | |
| tree | dd3780a0b5b891e6b25b8b3237364ebba9f8d273 /include/private/SkMutex.h | |
| parent | 7028443d1d70a2497f315443dfd45a157f300854 (diff) | |
Mac TSAN support: annotate Sk[Base]Mutex as a mutex.
TSAN does not intercept Mach semaphore_t calls used to implement
SkBaseMutex's fSemaphore (its OSSemaphore field). We can teach
it that Sk[Base]Mutex is a mutex anyway with the same annotations
we use for SkSharedMutex.
Change-Id: Ib91928bb9fcfa94f5cea985b46dea31ff2b56963
Reviewed-on: https://skia-review.googlesource.com/48580
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Herb Derby <herb@google.com>
Diffstat (limited to 'include/private/SkMutex.h')
| -rw-r--r-- | include/private/SkMutex.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/include/private/SkMutex.h b/include/private/SkMutex.h index 7cfdb1132c..da9a80b00e 100644 --- a/include/private/SkMutex.h +++ b/include/private/SkMutex.h @@ -10,10 +10,15 @@ #include "../private/SkSemaphore.h" #include "../private/SkThreadID.h" +#include "SkTSAN.h" #include "SkTypes.h" #define SK_DECLARE_STATIC_MUTEX(name) static SkBaseMutex name; +// We use ANNOTE_RWLOCK_foo() macros in here because TSAN does +// not intercept Mach semaphore_t calls, and so on Mac can't +// see that SkMutex is indeed a mutex. + class SkBaseMutex { public: constexpr SkBaseMutex() = default; @@ -21,10 +26,12 @@ public: void acquire() { fSemaphore.wait(); SkDEBUGCODE(fOwner = SkGetThreadID();) + ANNOTATE_RWLOCK_ACQUIRED(&fSemaphore, true); } void release() { this->assertHeld(); + ANNOTATE_RWLOCK_RELEASED(&fSemaphore, true); SkDEBUGCODE(fOwner = kIllegalThreadID;) fSemaphore.signal(); } @@ -40,8 +47,11 @@ protected: class SkMutex : public SkBaseMutex { public: - using SkBaseMutex::SkBaseMutex; - ~SkMutex() { fSemaphore.cleanup(); } + SkMutex() { ANNOTATE_RWLOCK_CREATE(&fSemaphore); } + ~SkMutex() { + ANNOTATE_RWLOCK_DESTROY(&fSemaphore); + fSemaphore.cleanup(); + } }; class SkAutoMutexAcquire { |