From 7b8a6b68510d38c64c4e13b40a668608a627ff7b Mon Sep 17 00:00:00 2001 From: Sree Kuchibhotla Date: Wed, 11 Jul 2018 11:51:46 -0700 Subject: [PATCH] More PR comments; useful tracing --- src/core/lib/iomgr/executor.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/core/lib/iomgr/executor.cc b/src/core/lib/iomgr/executor.cc index c81882069e2..fc1e044c2e9 100644 --- a/src/core/lib/iomgr/executor.cc +++ b/src/core/lib/iomgr/executor.cc @@ -81,7 +81,7 @@ bool GrpcExecutor::IsThreaded() const { } void GrpcExecutor::SetThreading(bool threading) { - const gpr_atm curr_num_threads = gpr_atm_no_barrier_load(&num_threads_); + gpr_atm curr_num_threads = gpr_atm_no_barrier_load(&num_threads_); if (threading) { if (curr_num_threads > 0) return; @@ -118,9 +118,11 @@ void GrpcExecutor::SetThreading(bool threading) { gpr_spinlock_lock(&adding_thread_lock_); gpr_spinlock_unlock(&adding_thread_lock_); - for (gpr_atm i = 0; i < num_threads_; i++) { + curr_num_threads = gpr_atm_no_barrier_load(&num_threads_); + for (gpr_atm i = 0; i < curr_num_threads; i++) { thd_state_[i].thd.Join(); - EXECUTOR_TRACE(" Thread %" PRIdPTR " joined", i); + EXECUTOR_TRACE(" Thread %" PRIdPTR " of %" PRIdPTR " joined", i, + curr_num_threads); } gpr_atm_no_barrier_store(&num_threads_, 0);