From ad2c4778fc560f10f38550428189c97c9e2bc5a1 Mon Sep 17 00:00:00 2001
From: Sree Kuchibhotla <sreek@google.com>
Date: Mon, 13 Jun 2016 19:06:54 -0700
Subject: [PATCH] Rename _GRPC_TSAN to GRPC_TSAN
---
Makefile | 2 +-
build.yaml | 2 +-
src/core/lib/iomgr/ev_epoll_linux.c | 12 ++++++------
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index 040ebd4102..e35e360785 100644
--- a/Makefile
+++ b/Makefile
@@ -200,7 +200,7 @@ LD_tsan = clang
LDXX_tsan = clang++
CPPFLAGS_tsan = -O0 -fsanitize=thread -fno-omit-frame-pointer -Wno-unused-command-line-argument -DGPR_NO_DIRECT_SYSCALLS
LDFLAGS_tsan = -fsanitize=thread
-DEFINES_tsan = _GRPC_TSAN
+DEFINES_tsan = GRPC_TSAN
DEFINES_tsan += GRPC_TEST_SLOWDOWN_BUILD_FACTOR=5
VALID_CONFIG_stapprof = 1
diff --git a/build.yaml b/build.yaml
index 0847232b50..3d327f8bff 100644
--- a/build.yaml
+++ b/build.yaml
@@ -3266,7 +3266,7 @@ configs:
CPPFLAGS: -O0 -fsanitize=thread -fno-omit-frame-pointer -Wno-unused-command-line-argument
-DGPR_NO_DIRECT_SYSCALLS
CXX: clang++
- DEFINES: _GRPC_TSAN
+ DEFINES: GRPC_TSAN
LD: clang
LDFLAGS: -fsanitize=thread
LDXX: clang++
diff --git a/src/core/lib/iomgr/ev_epoll_linux.c b/src/core/lib/iomgr/ev_epoll_linux.c
index 35a15e00c9..006c2a8ee7 100644
--- a/src/core/lib/iomgr/ev_epoll_linux.c
+++ b/src/core/lib/iomgr/ev_epoll_linux.c
@@ -236,7 +236,7 @@ static grpc_wakeup_fd polling_island_wakeup_fd;
static gpr_mu g_pi_freelist_mu;
static polling_island *g_pi_freelist = NULL;
-#ifdef _GRPC_TSAN
+#ifdef GRPC_TSAN
/* Currently TSAN may incorrectly flag data races between epoll_ctl and
epoll_wait for any grpc_fd structs that are added to the epoll set via
epoll_ctl and are returned (within a very short window) via epoll_wait().
@@ -245,7 +245,7 @@ static polling_island *g_pi_freelist = NULL;
the code just-before epoll_ctl() and the code after epoll_wait() by using
this atomic */
gpr_atm g_epoll_sync;
-#endif
+#endif /* defined(GRPC_TSAN) */
/* The caller is expected to hold pi->mu lock before calling this function */
static void polling_island_add_fds_locked(polling_island *pi, grpc_fd **fds,
@@ -254,10 +254,10 @@ static void polling_island_add_fds_locked(polling_island *pi, grpc_fd **fds,
size_t i;
struct epoll_event ev;
-#ifdef _GRPC_TSAN
+#ifdef GRPC_TSAN
/* See the definition of g_epoll_sync for more context */
gpr_atm_rel_store(&g_epoll_sync, 0);
-#endif
+#endif /* defined(GRPC_TSAN) */
for (i = 0; i < fd_count; i++) {
ev.events = (uint32_t)(EPOLLIN | EPOLLOUT | EPOLLET);
@@ -1161,10 +1161,10 @@ static void pollset_work_and_unlock(grpc_exec_ctx *exec_ctx,
}
}
-#ifdef _GRPC_TSAN
+#ifdef GRPC_TSAN
/* See the definition of g_poll_sync for more details */
gpr_atm_acq_load(&g_epoll_sync);
-#endif
+#endif /* defined(GRPC_TSAN) */
for (int i = 0; i < ep_rv; ++i) {
void *data_ptr = ep_ev[i].data.ptr;
--
GitLab