| Index: include/core/SkDynamicAnnotations.h
|
| diff --git a/include/core/SkDynamicAnnotations.h b/include/core/SkDynamicAnnotations.h
|
| index f9a80a31efddb8db47bf8709b81658b8bf3c7a10..6d21cddb940b363d16a614d3b9f54f59af3e7dcf 100644
|
| --- a/include/core/SkDynamicAnnotations.h
|
| +++ b/include/core/SkDynamicAnnotations.h
|
| @@ -19,8 +19,6 @@
|
| // TSAN provides these hooks.
|
| void AnnotateIgnoreReadsBegin(const char* file, int line);
|
| void AnnotateIgnoreReadsEnd(const char* file, int line);
|
| -void AnnotateBenignRaceSized(const char* file, int line,
|
| - const void* addr, long size, const char* desc);
|
| } // extern "C"
|
|
|
| // SK_ANNOTATE_UNPROTECTED_READ can wrap any variable read to tell TSAN to ignore that it appears to
|
| @@ -39,46 +37,10 @@
|
| return read;
|
| }
|
|
|
| -// Ignore racy reads and racy writes to this pointer, indefinitely.
|
| -// If at all possible, use the more precise SK_ANNOTATE_UNPROTECTED_READ.
|
| -template <typename T>
|
| -void SK_ANNOTATE_BENIGN_RACE(T* ptr) {
|
| - AnnotateBenignRaceSized(__FILE__, __LINE__, ptr, sizeof(*ptr), "SK_ANNOTATE_BENIGN_RACE");
|
| -}
|
| -
|
| #else // !DYNAMIC_ANNOTATIONS_ENABLED
|
|
|
| #define SK_ANNOTATE_UNPROTECTED_READ(x) (x)
|
| -#define SK_ANNOTATE_BENIGN_RACE(ptr)
|
|
|
| #endif
|
|
|
| -// Can be used to wrap values that are intentionally racy, usually small mutable cached values, e.g.
|
| -// - SkMatrix type mask
|
| -// - SkPathRef bounds
|
| -// - SkPixelRef genIDs
|
| -template <typename T>
|
| -class SkTRacy {
|
| -public:
|
| - SkTRacy() { SK_ANNOTATE_BENIGN_RACE(&fVal); }
|
| -
|
| - operator const T&() const {
|
| - return fVal;
|
| - }
|
| -
|
| - SkTRacy& operator=(const T& val) {
|
| - fVal = val;
|
| - return *this;
|
| - }
|
| -
|
| - const T* get() const { return &fVal; }
|
| - T* get() { return &fVal; }
|
| -
|
| - const T* operator->() const { return &fVal; }
|
| - T* operator->() { return &fVal; }
|
| -
|
| -private:
|
| - T fVal;
|
| -};
|
| -
|
| #endif//SkDynamicAnnotations_DEFINED
|
|
|