From e17f932eecb7b8cf842128a6815dc0159d8a5da8 Mon Sep 17 00:00:00 2001 From: Deev Patel Date: Sat, 7 Oct 2023 06:35:52 -0700 Subject: [PATCH] fix: annotate static variable in VLOG_IS_ON (#890) Avoid TSAN issues when multiple threads perform the check. --- src/glog/vlog_is_on.h.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/glog/vlog_is_on.h.in b/src/glog/vlog_is_on.h.in index 15dee61..eacc6de 100644 --- a/src/glog/vlog_is_on.h.in +++ b/src/glog/vlog_is_on.h.in @@ -75,6 +75,8 @@ #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, \ __FILE__, verbose_level__) : *vlocal__.level >= verbose_level__); \