aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2017-04-28 21:26:35 +0000
committerGravatar Craig Tiller <ctiller@google.com>2017-04-28 21:26:35 +0000
commitf3e40227c39076c7ded7b2217d218f5829830723 (patch)
treec6c9f727bcbbf4f3262a41538ac333d375f8d4f0
parent8502ecbd38457ab1bc6de6f4f6c33e6e42b46239 (diff)
Fix bad assumption
-rw-r--r--src/core/lib/iomgr/ev_epoll1_linux.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/core/lib/iomgr/ev_epoll1_linux.c b/src/core/lib/iomgr/ev_epoll1_linux.c
index b1127d38cb..a25168fdb4 100644
--- a/src/core/lib/iomgr/ev_epoll1_linux.c
+++ b/src/core/lib/iomgr/ev_epoll1_linux.c
@@ -601,7 +601,6 @@ static void end_worker(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset,
if (worker->next != worker) {
assert(worker->next->initialized_cv);
gpr_atm_no_barrier_store(&g_active_poller, (gpr_atm)worker->next);
- gpr_log(GPR_DEBUG, "Picked sibling worker %p for poller", worker);
worker->next->kick_state = KICKED_FOR_POLL;
gpr_cv_signal(&worker->next->cv);
if (grpc_exec_ctx_has_work(exec_ctx)) {
@@ -629,9 +628,8 @@ static void end_worker(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset,
if (inspect_worker != NULL) {
if (gpr_atm_no_barrier_cas(&g_active_poller, 0,
(gpr_atm)inspect_worker)) {
- GPR_ASSERT(inspect_worker->initialized_cv);
inspect_worker->kick_state = KICKED_FOR_POLL;
- gpr_cv_signal(&inspect_worker->cv);
+ if (inspect_worker->initialized_cv) gpr_cv_signal(&inspect_worker->cv);
}
// even if we didn't win the cas, there's a worker, we can stop
found_worker = true;