From 7b3c7f52c26e0666aadc2aa71b970b2518455efc Mon Sep 17 00:00:00 2001 From: Mark Andrews Date: Mon, 31 Aug 2020 22:41:46 +1000 Subject: [PATCH] Turn off TSAN for isc_log_wouldlog --- lib/isc/include/isc/util.h | 4 ++-- lib/isc/log.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/isc/include/isc/util.h b/lib/isc/include/isc/util.h index eec94c023d..a97da4e87e 100644 --- a/lib/isc/include/isc/util.h +++ b/lib/isc/include/isc/util.h @@ -210,9 +210,9 @@ #endif /* if __has_feature(thread_sanitizer) */ #if __SANITIZE_THREAD__ -#define ISC_NO_SANITIZE __attribute__((no_sanitize("thread"))) +#define ISC_NO_SANITIZE_THREAD __attribute__((no_sanitize("thread"))) #else /* if __SANITIZE_THREAD__ */ -#define ISC_NO_SANITIZE +#define ISC_NO_SANITIZE_THREAD #endif /* if __SANITIZE_THREAD__ */ #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR >= 6) diff --git a/lib/isc/log.c b/lib/isc/log.c index 8bbdcea19e..cac6f9c2ff 100644 --- a/lib/isc/log.c +++ b/lib/isc/log.c @@ -1460,7 +1460,7 @@ isc_log_open(isc_logchannel_t *channel) { return (result); } -bool +ISC_NO_SANITIZE_THREAD bool isc_log_wouldlog(isc_log_t *lctx, int level) { /* * Try to avoid locking the mutex for messages which can't