Turn off TSAN for isc_log_wouldlog

(cherry picked from commit 7b3c7f52c26e0666aadc2aa71b970b2518455efc)

diff --git a/lib/isc/include/isc/util.h b/lib/isc/include/isc/util.h
index eec94c023d7b40abe6551c9b7a429d856ee70a67..a97da4e87e13ae8468ef7fe608142f719dbf016a 100644 (file)
--- 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 65833c1e6beffb275da0ac2c922ba976442d9afc..d3d1f795ffc7ff8dc605b6e200fefa8b527fc73b 100644 (file)
--- a/lib/isc/log.c
+++ b/lib/isc/log.c
@@ -1457,7 +1457,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