From 71d28950054d3137cd8bebd43c4099805546b63a Mon Sep 17 00:00:00 2001
From: Yash Tibrewal <yashkt@google.com>
Date: Mon, 2 Dec 2019 11:23:43 -0800
Subject: [PATCH] Reviewer comments
---
src/core/lib/iomgr/logical_thread.cc | 12 +++++-------
test/core/iomgr/logical_thread_test.cc | 15 ++++-----------
2 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/src/core/lib/iomgr/logical_thread.cc b/src/core/lib/iomgr/logical_thread.cc
index 838c473059..e0e5934099 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 2222a57579..0d449e171a 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++;
--
GitLab