fix: annotate static variable in VLOG_IS_ON

Avoid TSAN issues when multiple threads perform the check.
google · Oct 7, 2023 · eb65d54 · eb65d54
1 parent f6e4d96
commit eb65d54
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/glog/vlog_is_on.h.in b/src/glog/vlog_is_on.h.in
@@ -75,8 +75,10 @@
 #define VLOG_IS_ON(verboselevel)                                \
   __extension__  \
   ({ static @ac_google_namespace@::SiteFlag vlocal__ = {NULL, NULL, 0, NULL};       \
+     GLOG_IFDEF_THREAD_SANITIZER( \
+             AnnotateBenignRaceSized(__FILE__, __LINE__, &vlocal__, sizeof(@ac_google_namespace@::SiteFlag), "")); \
      @ac_google_namespace@::int32 verbose_level__ = (verboselevel);                    \
-     (vlocal__.level == NULL ? @ac_google_namespace@::InitVLOG3__(&vlocal__, &FLAGS_v, \
+     (vlocal__.level == NULL ? (@ac_google_namespace@::InitVLOG3__)(&vlocal__, &FLAGS_v, \
                         __FILE__, verbose_level__) : *vlocal__.level >= verbose_level__); \
   })
 #else