diff --git a/src/core/lib/iomgr/logical_thread.cc b/src/core/lib/iomgr/logical_thread.cc index 838c47305945a6f7c85a4878146d31004b57cad6..e0e5934099886b5f5de25ea7d8d1f3ae162721d2 100644 --- a/src/core/lib/iomgr/logical_thread.cc +++ b/src/core/lib/iomgr/logical_thread.cc @@ -75,7 +75,7 @@ void LogicalThread::DrainQueue() { GPR_DEBUG_ASSERT(prev_size >= 1); if (prev_size == 1) { if (GRPC_TRACE_FLAG_ENABLED(grpc_logical_thread_trace)) { - gpr_log(GPR_INFO, " Queue Drained"); + gpr_log(GPR_INFO, " Queue Drained"); } break; } @@ -88,16 +88,14 @@ void LogicalThread::DrainQueue() { // This can happen either due to a race condition within the mpscq // implementation or because of a race with Run() if (GRPC_TRACE_FLAG_ENABLED(grpc_logical_thread_trace)) { - gpr_log(GPR_INFO, " Queue returned nullptr, trying again"); + gpr_log(GPR_INFO, " Queue returned nullptr, trying again"); } } -#ifndef NDEBUG if (GRPC_TRACE_FLAG_ENABLED(grpc_logical_thread_trace)) { - gpr_log(GPR_INFO, - " Running item %p : callback scheduled at [%s:%d]", cb_wrapper, - cb_wrapper->location.file(), cb_wrapper->location.line()); + gpr_log(GPR_INFO, " Running item %p : callback scheduled at [%s:%d]", + cb_wrapper, cb_wrapper->location.file(), + cb_wrapper->location.line()); } -#endif cb_wrapper->callback(); delete cb_wrapper; } diff --git a/test/core/iomgr/logical_thread_test.cc b/test/core/iomgr/logical_thread_test.cc index 2222a5757915c805d1bf8a2d7cbdd620c206048e..0d449e171ae26f433a6e36cde643620dbdc6d264 100644 --- a/test/core/iomgr/logical_thread_test.cc +++ b/test/core/iomgr/logical_thread_test.cc @@ -43,17 +43,6 @@ TEST(LogicalThreadTest, ExecuteOne) { nullptr); } -struct ThreadArgs { - size_t counter; - grpc_core::RefCountedPtr<grpc_core::LogicalThread> lock; - gpr_event done; -}; - -struct ExecutionArgs { - size_t* counter; - size_t value; -}; - class TestThread { public: explicit TestThread(grpc_core::RefCountedPtr<grpc_core::LogicalThread> lock) @@ -75,6 +64,10 @@ class TestThread { size_t n = 1; for (size_t i = 0; i < 10; i++) { for (size_t j = 0; j < 10000; j++) { + struct ExecutionArgs { + size_t* counter; + size_t value; + }; ExecutionArgs* c = new ExecutionArgs; c->counter = &self->counter_; c->value = n++;