From c5f310de3ba06b7ad24da48145a099485322d2ac Mon Sep 17 00:00:00 2001 From: Derek Mauro Date: Thu, 13 Apr 2023 10:25:13 -0700 Subject: Don't override clock_gettime in the KernelTimeout and Waiter tests under sanitizers. The overrides break the sanitizers. PiperOrigin-RevId: 524037272 Change-Id: I85b87d3870c488cb316505e94b394c6f98e9f60f --- absl/synchronization/internal/kernel_timeout_test.cc | 13 ++++++++----- absl/synchronization/internal/waiter_test.cc | 10 +++++++--- 2 files changed, 15 insertions(+), 8 deletions(-) (limited to 'absl/synchronization/internal') diff --git a/absl/synchronization/internal/kernel_timeout_test.cc b/absl/synchronization/internal/kernel_timeout_test.cc index e3286f7f..92ed2691 100644 --- a/absl/synchronization/internal/kernel_timeout_test.cc +++ b/absl/synchronization/internal/kernel_timeout_test.cc @@ -18,16 +18,19 @@ #include // NOLINT(build/c++11) #include -#include "absl/random/random.h" -#include "gtest/gtest.h" #include "absl/base/config.h" +#include "absl/random/random.h" #include "absl/time/clock.h" #include "absl/time/time.h" +#include "gtest/gtest.h" -// Test go/btm support by randomizing the value clock_gettime() for +// Test go/btm support by randomizing the value of clock_gettime() for // CLOCK_MONOTONIC. This works by overriding a weak symbol in glibc. // We should be resistant to this randomization when !SupportsSteadyClock(). -#ifdef __GOOGLE_GRTE_VERSION__ +#if defined(__GOOGLE_GRTE_VERSION__) && \ + !defined(ABSL_HAVE_ADDRESS_SANITIZER) && \ + !defined(ABSL_HAVE_MEMORY_SANITIZER) && \ + !defined(ABSL_HAVE_THREAD_SANITIZER) extern "C" int __clock_gettime(clockid_t c, struct timespec* ts); extern "C" int clock_gettime(clockid_t c, struct timespec* ts) { @@ -40,7 +43,7 @@ extern "C" int clock_gettime(clockid_t c, struct timespec* ts) { } return __clock_gettime(c, ts); } -#endif // __GOOGLE_GRTE_VERSION__ +#endif namespace { diff --git a/absl/synchronization/internal/waiter_test.cc b/absl/synchronization/internal/waiter_test.cc index 57a1a3da..9a933940 100644 --- a/absl/synchronization/internal/waiter_test.cc +++ b/absl/synchronization/internal/waiter_test.cc @@ -18,6 +18,7 @@ #include #include +#include "absl/base/config.h" #include "absl/random/random.h" #include "absl/synchronization/internal/create_thread_identity.h" #include "absl/synchronization/internal/futex_waiter.h" @@ -31,10 +32,13 @@ #include "absl/time/time.h" #include "gtest/gtest.h" -// Test go/btm support by randomizing the value clock_gettime() for +// Test go/btm support by randomizing the value of clock_gettime() for // CLOCK_MONOTONIC. This works by overriding a weak symbol in glibc. // We should be resistant to this randomization when !SupportsSteadyClock(). -#ifdef __GOOGLE_GRTE_VERSION__ +#if defined(__GOOGLE_GRTE_VERSION__) && \ + !defined(ABSL_HAVE_ADDRESS_SANITIZER) && \ + !defined(ABSL_HAVE_MEMORY_SANITIZER) && \ + !defined(ABSL_HAVE_THREAD_SANITIZER) extern "C" int __clock_gettime(clockid_t c, struct timespec* ts); extern "C" int clock_gettime(clockid_t c, struct timespec* ts) { @@ -47,7 +51,7 @@ extern "C" int clock_gettime(clockid_t c, struct timespec* ts) { } return __clock_gettime(c, ts); } -#endif // __GOOGLE_GRTE_VERSION__ +#endif namespace { -- cgit v1.2.3