From 0b544ae222aab1c5d9122a8dfe2800451b31d979 Mon Sep 17 00:00:00 2001 From: mtklein Date: Tue, 8 Jul 2014 19:37:47 -0700 Subject: Add SkRacy SkRacy is a zero-overhead wrapper for a T, except it also silences race warnings when TSAN is running. Here we apply in several classes. In SkMatrix and SkPathRef, we use it to opportunistically cache some idempotent work. In SkPixelRef, we wrap the genIDs. We think the worst that can happen here is we'll increment the global next-genID a few times instead of once when we go to get another ID. BUG=skia: Committed: https://skia.googlesource.com/skia/+/d5e3e6ae1b3434ad1158f441902ff65f1eeaa3a7 CQ_EXTRA_TRYBOTS=tryserver.skia:Canary-Chrome-Ubuntu13.10-Ninja-x86_64-ToT-Trybot,Canary-Chrome-Win7-Ninja-x86-SharedLib_ToT-Trybot,Test-Ubuntu13.10-GCE-NoGPU-x86_64-Release-TSAN-Trybot R=reed@google.com, mtklein@google.com Author: mtklein@chromium.org Review URL: https://codereview.chromium.org/371363004 --- gyp/common_conditions.gypi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gyp/common_conditions.gypi') diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index f7c463347d..cc3aae4f91 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -447,7 +447,7 @@ ], 'conditions' : [ [ 'skia_sanitizer == "thread"', { - 'defines': [ 'DYNAMIC_ANNOTATIONS_ENABLED=1' ], + 'defines': [ 'SK_DYNAMIC_ANNOTATIONS_ENABLED=1' ], 'cflags': [ '-fPIC' ], 'target_conditions': [ [ '_type == "executable"', { -- cgit v1.2.3