From c3c9bf2442664493f081460c10f98ea2c43e9496 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Mon, 24 Apr 2017 13:15:05 -0700
Subject: [PATCH] Fix tracing related TSAN race
---
src/core/lib/iomgr/ev_epollex_linux.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/core/lib/iomgr/ev_epollex_linux.c b/src/core/lib/iomgr/ev_epollex_linux.c
index ee944bcfad..64afc7b804 100644
--- a/src/core/lib/iomgr/ev_epollex_linux.c
+++ b/src/core/lib/iomgr/ev_epollex_linux.c
@@ -913,10 +913,9 @@ static grpc_error *pollset_epoll(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset,
bool write_ev = (events[i].events & EPOLLOUT) != 0;
if (grpc_polling_trace) {
gpr_log(GPR_DEBUG,
- "PS:%p poll %p got fd %p(%d/%d): is_wq=%d cancel=%d read=%d "
+ "PS:%p poll %p got fd %p: is_wq=%d cancel=%d read=%d "
"write=%d",
- pollset, p, fd, fd->fd, fd->workqueue_wakeup_fd.read_fd,
- is_workqueue, cancel, read_ev, write_ev);
+ pollset, p, fd, is_workqueue, cancel, read_ev, write_ev);
}
if (is_workqueue) {
append_error(&error,
--
GitLab