grpc 1.63.0 → 1.65.2

data/src/core/lib/iomgr/exec_ctx.h

@@ -19,27 +19,29 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_EXEC_CTX_H
 #define GRPC_SRC_CORE_LIB_IOMGR_EXEC_CTX_H
 
-#include <grpc/support/port_platform.h>
-
 #include <limits>
 
+#include <grpc/support/port_platform.h>
+
 #if __APPLE__
 // Provides TARGET_OS_IPHONE
 #include <TargetConditionals.h>
 #endif
 
+#include "absl/log/check.h"
+
 #include <grpc/impl/grpc_types.h>
 #include <grpc/support/atm.h>
 #include <grpc/support/cpu.h>
 #include <grpc/support/log.h>
 #include <grpc/support/time.h>
 
-#include "src/core/lib/gpr/time_precise.h"
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/debug_location.h"
 #include "src/core/lib/gprpp/fork.h"
 #include "src/core/lib/gprpp/time.h"
 #include "src/core/lib/iomgr/closure.h"
+#include "src/core/util/time_precise.h"
 
 #if !defined(_WIN32) || !defined(_DLL)
 #define EXEC_CTX exec_ctx_
@@ -314,8 +316,8 @@ class GRPC_DLL ApplicationCallbackExecCtx {
         Fork::DecExecCtxCount();
       }
     } else {
-      GPR_DEBUG_ASSERT(head_ == nullptr);
-      GPR_DEBUG_ASSERT(tail_ == nullptr);
+      DCHECK_EQ(head_, nullptr);
+      DCHECK_EQ(tail_, nullptr);
     }
   }
 

data/src/core/lib/iomgr/executor.cc

@@ -16,39 +16,33 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/executor.h"
 
 #include <string.h>
 
+#include "absl/log/check.h"
+
 #include <grpc/support/alloc.h>
 #include <grpc/support/cpu.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/sync.h>
 
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/memory.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/iomgr_internal.h"
+#include "src/core/util/useful.h"
 
 #define MAX_DEPTH 2
 
 #define EXECUTOR_TRACE(format, ...)                       \
   do {                                                    \
-    if (GRPC_TRACE_FLAG_ENABLED(executor_trace)) {        \
+    if (GRPC_TRACE_FLAG_ENABLED(executor)) {              \
       gpr_log(GPR_INFO, "EXECUTOR " format, __VA_ARGS__); \
     }                                                     \
   } while (0)
 
-#define EXECUTOR_TRACE0(str)                       \
-  do {                                             \
-    if (GRPC_TRACE_FLAG_ENABLED(executor_trace)) { \
-      gpr_log(GPR_INFO, "EXECUTOR " str);          \
-    }                                              \
-  } while (0)
-
 namespace grpc_core {
 namespace {
 
@@ -86,8 +80,6 @@ const EnqueueFunc
 
 }  // namespace
 
-TraceFlag executor_trace(false, "executor");
-
 Executor::Executor(const char* name) : name_(name) {
   adding_thread_lock_ = GPR_SPINLOCK_STATIC_INITIALIZER;
   gpr_atm_rel_store(&num_threads_, 0);
@@ -147,7 +139,7 @@ void Executor::SetThreading(bool threading) {
       return;
     }
 
-    GPR_ASSERT(num_threads_ == 0);
+    CHECK_EQ(num_threads_, 0);
     gpr_atm_rel_store(&num_threads_, 1);
     thd_state_ = static_cast<ThreadState*>(
         gpr_zalloc(sizeof(ThreadState) * max_threads_));
@@ -367,12 +359,11 @@ void Executor::Enqueue(grpc_closure* closure, grpc_error_handle error,
 // the grpc_init() and grpc_shutdown() code paths which are protected by a
 // global mutex. So it is okay to assume that these functions are thread-safe
 void Executor::InitAll() {
-  EXECUTOR_TRACE0("Executor::InitAll() enter");
+  GRPC_TRACE_LOG(executor, INFO) << "Executor::InitAll() enter";
 
   // Return if Executor::InitAll() is already called earlier
   if (executors[static_cast<size_t>(ExecutorType::DEFAULT)] != nullptr) {
-    GPR_ASSERT(executors[static_cast<size_t>(ExecutorType::RESOLVER)] !=
-               nullptr);
+    CHECK(executors[static_cast<size_t>(ExecutorType::RESOLVER)] != nullptr);
     return;
   }
 
@@ -384,7 +375,7 @@ void Executor::InitAll() {
   executors[static_cast<size_t>(ExecutorType::DEFAULT)]->Init();
   executors[static_cast<size_t>(ExecutorType::RESOLVER)]->Init();
 
-  EXECUTOR_TRACE0("Executor::InitAll() done");
+  GRPC_TRACE_LOG(executor, INFO) << "Executor::InitAll() done";
 }
 
 void Executor::Run(grpc_closure* closure, grpc_error_handle error,
@@ -394,12 +385,11 @@ void Executor::Run(grpc_closure* closure, grpc_error_handle error,
 }
 
 void Executor::ShutdownAll() {
-  EXECUTOR_TRACE0("Executor::ShutdownAll() enter");
+  GRPC_TRACE_LOG(executor, INFO) << "Executor::ShutdownAll() enter";
 
   // Return if Executor:SshutdownAll() is already called earlier
   if (executors[static_cast<size_t>(ExecutorType::DEFAULT)] == nullptr) {
-    GPR_ASSERT(executors[static_cast<size_t>(ExecutorType::RESOLVER)] ==
-               nullptr);
+    CHECK(executors[static_cast<size_t>(ExecutorType::RESOLVER)] == nullptr);
     return;
   }
 
@@ -423,11 +413,11 @@ void Executor::ShutdownAll() {
   executors[static_cast<size_t>(ExecutorType::DEFAULT)] = nullptr;
   executors[static_cast<size_t>(ExecutorType::RESOLVER)] = nullptr;
 
-  EXECUTOR_TRACE0("Executor::ShutdownAll() done");
+  GRPC_TRACE_LOG(executor, INFO) << "Executor::ShutdownAll() done";
 }
 
 bool Executor::IsThreaded(ExecutorType executor_type) {
-  GPR_ASSERT(executor_type < ExecutorType::NUM_EXECUTORS);
+  CHECK(executor_type < ExecutorType::NUM_EXECUTORS);
   return executors[static_cast<size_t>(executor_type)]->IsThreaded();
 }
 

data/src/core/lib/iomgr/executor.h

@@ -21,9 +21,9 @@
 
 #include <grpc/support/port_platform.h>
 
-#include "src/core/lib/gpr/spinlock.h"
 #include "src/core/lib/gprpp/thd.h"
 #include "src/core/lib/iomgr/closure.h"
+#include "src/core/util/spinlock.h"
 
 namespace grpc_core {
 

data/src/core/lib/iomgr/fork_posix.cc

@@ -28,9 +28,10 @@
 
 #include <string.h>
 
+#include "absl/log/log.h"
+
 #include <grpc/fork.h>
 #include <grpc/grpc.h>
-#include <grpc/support/log.h>
 
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/fork.h"
@@ -60,24 +61,21 @@ void grpc_prefork() {
   }
   grpc_core::ExecCtx exec_ctx;
   if (!grpc_core::Fork::Enabled()) {
-    gpr_log(GPR_ERROR,
-            "Fork support not enabled; try running with the "
-            "environment variable GRPC_ENABLE_FORK_SUPPORT=1");
+    LOG(ERROR) << "Fork support not enabled; try running with the "
+                  "environment variable GRPC_ENABLE_FORK_SUPPORT=1";
     return;
   }
   const char* poll_strategy_name = grpc_get_poll_strategy_name();
   if (poll_strategy_name == nullptr ||
       (strcmp(poll_strategy_name, "epoll1") != 0 &&
        strcmp(poll_strategy_name, "poll") != 0)) {
-    gpr_log(GPR_INFO,
-            "Fork support is only compatible with the epoll1 and poll polling "
-            "strategies");
+    LOG(INFO) << "Fork support is only compatible with the epoll1 and poll "
+                 "polling strategies";
     return;
   }
   if (!grpc_core::Fork::BlockExecCtx()) {
-    gpr_log(GPR_INFO,
-            "Other threads are currently calling into gRPC, skipping fork() "
-            "handlers");
+    LOG(INFO) << "Other threads are currently calling into gRPC, skipping "
+                 "fork() handlers";
     return;
   }
   grpc_timer_manager_set_threading(false);

data/src/core/lib/iomgr/fork_windows.cc

@@ -22,6 +22,8 @@
 
 #ifndef GRPC_POSIX_FORK
 
+#include "absl/log/log.h"
+
 #include <grpc/fork.h>
 #include <grpc/support/log.h>
 
@@ -30,7 +32,7 @@
 //       AROUND VERY SPECIFIC USE CASES.
 //
 
-void grpc_prefork() { gpr_log(GPR_ERROR, "Forking not supported on Windows"); }
+void grpc_prefork() { LOG(ERROR) << "Forking not supported on Windows"; }
 
 void grpc_postfork_parent() {}
 

data/src/core/lib/iomgr/grpc_if_nametoindex.h

@@ -19,10 +19,10 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_GRPC_IF_NAMETOINDEX_H
 #define GRPC_SRC_CORE_LIB_IOMGR_GRPC_IF_NAMETOINDEX_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
+#include <grpc/support/port_platform.h>
+
 // Returns the interface index corresponding to the interface "name" provided.
 // Returns non-zero upon success, and zero upon failure.
 uint32_t grpc_if_nametoindex(char* name);

data/src/core/lib/iomgr/grpc_if_nametoindex_posix.cc

@@ -25,7 +25,7 @@
 #include <errno.h>
 #include <net/if.h>
 
-#include <grpc/support/log.h>
+#include "absl/log/log.h"
 
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/iomgr/grpc_if_nametoindex.h"
@@ -33,8 +33,7 @@
 uint32_t grpc_if_nametoindex(char* name) {
   uint32_t out = if_nametoindex(name);
   if (out == 0) {
-    gpr_log(GPR_DEBUG, "if_nametoindex failed for name %s. errno %d", name,
-            errno);
+    VLOG(2) << "if_nametoindex failed for name " << name << ". errno " << errno;
   }
   return out;
 }

data/src/core/lib/iomgr/grpc_if_nametoindex_unsupported.cc

@@ -22,16 +22,14 @@
 
 #if GRPC_IF_NAMETOINDEX == 0 || !defined(GRPC_POSIX_SOCKET_IF_NAMETOINDEX)
 
-#include <grpc/support/log.h>
+#include "absl/log/log.h"
 
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/iomgr/grpc_if_nametoindex.h"
 
 uint32_t grpc_if_nametoindex(char* name) {
-  gpr_log(GPR_DEBUG,
-          "Not attempting to convert interface name %s to index for current "
-          "platform.",
-          name);
+  VLOG(2) << "Not attempting to convert interface name " << name
+          << " to index for current platform.";
   return 0;
 }
 

data/src/core/lib/iomgr/internal_errqueue.cc

@@ -12,11 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/internal_errqueue.h"
 
+#include "absl/log/log.h"
+
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/iomgr/port.h"
 
@@ -38,7 +39,7 @@ bool KernelSupportsErrqueue() {
     // least 4.0.0
     struct utsname buffer;
     if (uname(&buffer) != 0) {
-      gpr_log(GPR_ERROR, "uname: %s", StrError(errno).c_str());
+      LOG(ERROR) << "uname: " << StrError(errno);
       return false;
     }
     char* release = buffer.release;
@@ -49,7 +50,7 @@ bool KernelSupportsErrqueue() {
     if (strtol(release, nullptr, 10) >= 4) {
       return true;
     } else {
-      gpr_log(GPR_DEBUG, "ERRQUEUE support not enabled");
+      VLOG(2) << "ERRQUEUE support not enabled";
     }
 #endif  // GRPC_LINUX_ERRQUEUE
     return false;

data/src/core/lib/iomgr/iocp_windows.cc

@@ -26,18 +26,21 @@
 
 #include <limits>
 
+#include "absl/log/check.h"
+#include "absl/log/log.h"
+
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 #include <grpc/support/log_windows.h>
 
-#include "src/core/lib/debug/stats.h"
-#include "src/core/lib/debug/stats_data.h"
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/thd.h"
 #include "src/core/lib/iomgr/iocp_windows.h"
 #include "src/core/lib/iomgr/iomgr_internal.h"
 #include "src/core/lib/iomgr/socket_windows.h"
 #include "src/core/lib/iomgr/timer.h"
+#include "src/core/telemetry/stats.h"
+#include "src/core/telemetry/stats_data.h"
 
 static ULONG g_iocp_kick_token;
 static OVERLAPPED g_iocp_custom_overlap;
@@ -73,7 +76,8 @@ grpc_iocp_work_status grpc_iocp_work(grpc_core::Timestamp deadline) {
   if (success == 0 && overlapped == NULL) {
     return GRPC_IOCP_WORK_TIMEOUT;
   }
-  GPR_ASSERT(completion_key && overlapped);
+  CHECK(completion_key);
+  CHECK(overlapped);
   if (overlapped == &g_iocp_custom_overlap) {
     gpr_atm_full_fetch_add(&g_custom_events, -1);
     if (completion_key == (ULONG_PTR)&g_iocp_kick_token) {
@@ -101,7 +105,7 @@ grpc_iocp_work_status grpc_iocp_work(grpc_core::Timestamp deadline) {
     info->bytes_transferred = bytes;
     info->wsa_error = success ? 0 : WSAGetLastError();
   }
-  GPR_ASSERT(overlapped == &info->overlapped);
+  CHECK(overlapped == &info->overlapped);
   bool should_destroy = grpc_socket_become_ready(socket, info);
   gpr_mu_unlock(&socket->state_mu);
   if (should_destroy) {
@@ -113,7 +117,7 @@ grpc_iocp_work_status grpc_iocp_work(grpc_core::Timestamp deadline) {
 void grpc_iocp_init(void) {
   g_iocp =
       CreateIoCompletionPort(INVALID_HANDLE_VALUE, NULL, (ULONG_PTR)NULL, 0);
-  GPR_ASSERT(g_iocp);
+  CHECK(g_iocp);
 }
 
 void grpc_iocp_kick(void) {
@@ -122,7 +126,7 @@ void grpc_iocp_kick(void) {
   gpr_atm_full_fetch_add(&g_custom_events, 1);
   success = PostQueuedCompletionStatus(g_iocp, 0, (ULONG_PTR)&g_iocp_kick_token,
                                        &g_iocp_custom_overlap);
-  GPR_ASSERT(success);
+  CHECK(success);
 }
 
 void grpc_iocp_flush(void) {
@@ -144,7 +148,7 @@ void grpc_iocp_shutdown(void) {
     grpc_core::ExecCtx::Get()->Flush();
   }
 
-  GPR_ASSERT(CloseHandle(g_iocp));
+  CHECK(CloseHandle(g_iocp));
 }
 
 void grpc_iocp_add_socket(grpc_winsocket* socket) {
@@ -154,13 +158,13 @@ void grpc_iocp_add_socket(grpc_winsocket* socket) {
                                (uintptr_t)socket, 0);
   if (!ret) {
     char* utf8_message = gpr_format_message(WSAGetLastError());
-    gpr_log(GPR_ERROR, "Unable to add socket to iocp: %s", utf8_message);
+    LOG(ERROR) << "Unable to add socket to iocp: " << utf8_message;
     gpr_free(utf8_message);
     __debugbreak();
     abort();
   }
   socket->added_to_iocp = 1;
-  GPR_ASSERT(ret == g_iocp);
+  CHECK(ret == g_iocp);
 }
 
 void grpc_iocp_register_socket_shutdown_socket_locked(grpc_winsocket* socket) {

data/src/core/lib/iomgr/iocp_windows.h

@@ -20,7 +20,6 @@
 #define GRPC_SRC_CORE_LIB_IOMGR_IOCP_WINDOWS_H
 
 #include <grpc/support/port_platform.h>
-
 #include <grpc/support/sync.h>
 
 #include "src/core/lib/iomgr/port.h"

data/src/core/lib/iomgr/iomgr.cc

@@ -16,22 +16,20 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/iomgr.h"
 
 #include <inttypes.h>
 #include <stdlib.h>
 #include <string.h>
 
+#include "absl/log/log.h"
+
 #include <grpc/support/alloc.h>
-#include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/string_util.h>
 #include <grpc/support/sync.h>
 
 #include "src/core/lib/config/config_vars.h"
-#include "src/core/lib/gpr/string.h"
-#include "src/core/lib/gpr/useful.h"
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/thd.h"
 #include "src/core/lib/iomgr/buffer_list.h"
@@ -41,6 +39,8 @@
 #include "src/core/lib/iomgr/iomgr_internal.h"
 #include "src/core/lib/iomgr/timer.h"
 #include "src/core/lib/iomgr/timer_manager.h"
+#include "src/core/util/string.h"
+#include "src/core/util/useful.h"
 
 static gpr_mu g_mu;
 static gpr_cv g_rcv;
@@ -83,7 +83,7 @@ size_t grpc_iomgr_count_objects_for_testing(void) {
 static void dump_objects(const char* kind) {
   grpc_iomgr_object* obj;
   for (obj = g_root_object.next; obj != &g_root_object; obj = obj->next) {
-    gpr_log(GPR_DEBUG, "%s OBJECT: %s %p", kind, obj->name, obj);
+    VLOG(2) << kind << " OBJECT: " << obj->name << " " << obj;
   }
 }
 
@@ -103,9 +103,8 @@ void grpc_iomgr_shutdown() {
               gpr_time_sub(gpr_now(GPR_CLOCK_REALTIME), last_warning_time),
               gpr_time_from_seconds(1, GPR_TIMESPAN)) >= 0) {
         if (g_root_object.next != &g_root_object) {
-          gpr_log(GPR_DEBUG,
-                  "Waiting for %" PRIuPTR " iomgr objects to be destroyed",
-                  count_objects());
+          VLOG(2) << "Waiting for " << count_objects()
+                  << " iomgr objects to be destroyed";
         }
         last_warning_time = gpr_now(GPR_CLOCK_REALTIME);
       }
@@ -119,11 +118,9 @@ void grpc_iomgr_shutdown() {
       }
       if (g_root_object.next != &g_root_object) {
         if (grpc_iomgr_abort_on_leaks()) {
-          gpr_log(GPR_DEBUG,
-                  "Failed to free %" PRIuPTR
-                  " iomgr objects before shutdown deadline: "
-                  "memory leaks are likely",
-                  count_objects());
+          VLOG(2) << "Failed to free " << count_objects()
+                  << " iomgr objects before shutdown deadline: "
+                  << "memory leaks are likely";
           dump_objects("LEAKED");
           abort();
         }
@@ -134,11 +131,9 @@ void grpc_iomgr_shutdown() {
           if (gpr_time_cmp(gpr_now(GPR_CLOCK_REALTIME), shutdown_deadline) >
               0) {
             if (g_root_object.next != &g_root_object) {
-              gpr_log(GPR_DEBUG,
-                      "Failed to free %" PRIuPTR
-                      " iomgr objects before shutdown deadline: "
-                      "memory leaks are likely",
-                      count_objects());
+              VLOG(2) << "Failed to free " << count_objects()
+                      << " iomgr objects before shutdown deadline: "
+                      << "memory leaks are likely";
               dump_objects("LEAKED");
             }
             break;

data/src/core/lib/iomgr/iomgr.h

@@ -19,10 +19,10 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_IOMGR_H
 #define GRPC_SRC_CORE_LIB_IOMGR_IOMGR_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stdlib.h>
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/port.h"
 

data/src/core/lib/iomgr/iomgr_internal.cc

@@ -16,12 +16,12 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/iomgr_internal.h"
 
 #include <stddef.h>
 
+#include <grpc/support/port_platform.h>
+
 static grpc_iomgr_platform_vtable* iomgr_platform_vtable = nullptr;
 
 bool grpc_have_determined_iomgr_platform() {

data/src/core/lib/iomgr/iomgr_internal.h

@@ -19,10 +19,10 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_IOMGR_INTERNAL_H
 #define GRPC_SRC_CORE_LIB_IOMGR_IOMGR_INTERNAL_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stdbool.h>
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/error.h"
 

data/src/core/lib/iomgr/iomgr_windows.cc

@@ -22,6 +22,8 @@
 
 #ifdef GRPC_WINSOCK_SOCKET
 
+#include "absl/log/check.h"
+
 #include <grpc/support/log.h>
 
 #include "src/core/lib/experiments/experiments.h"
@@ -51,12 +53,12 @@ extern grpc_pollset_set_vtable grpc_windows_pollset_set_vtable;
 static void winsock_init(void) {
   WSADATA wsaData;
   int status = WSAStartup(MAKEWORD(2, 0), &wsaData);
-  GPR_ASSERT(status == 0);
+  CHECK_EQ(status, 0);
 }
 
 static void winsock_shutdown(void) {
   int status = WSACleanup();
-  GPR_ASSERT(status == 0);
+  CHECK_EQ(status, 0);
 }
 
 static void iomgr_platform_init(void) {

data/src/core/lib/iomgr/lockfree_event.cc

@@ -16,18 +16,17 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/lockfree_event.h"
 
+#include "absl/log/check.h"
+
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/debug/trace.h"
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/iomgr/exec_ctx.h"
 
-extern grpc_core::DebugOnlyTraceFlag grpc_polling_trace;
-
 // 'state' holds the to call when the fd is readable or writable respectively.
 // It can contain one of the following values:
 //   kClosureReady     : The fd has an I/O event of interest but there is no
@@ -80,7 +79,7 @@ void LockfreeEvent::DestroyEvent() {
     if (curr & kShutdownBit) {
       internal::StatusFreeHeapPtr(curr & ~kShutdownBit);
     } else {
-      GPR_ASSERT(curr == kClosureNotReady || curr == kClosureReady);
+      CHECK(curr == kClosureNotReady || curr == kClosureReady);
     }
     // we CAS in a shutdown, no error value here. If this event is interacted
     // with post-deletion (see the note in the constructor) we want the bit
@@ -96,7 +95,7 @@ void LockfreeEvent::NotifyOn(grpc_closure* closure) {
     // sure that the shutdown error has been initialized properly before us
     // referencing it.
     gpr_atm curr = gpr_atm_acq_load(&state_);
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(polling)) {
       gpr_log(GPR_DEBUG,
               "LockfreeEvent::NotifyOn: %p curr=%" PRIxPTR " closure=%p", this,
               curr, closure);
@@ -165,7 +164,7 @@ bool LockfreeEvent::SetShutdown(grpc_error_handle shutdown_error) {
 
   while (true) {
     gpr_atm curr = gpr_atm_no_barrier_load(&state_);
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(polling)) {
       gpr_log(GPR_DEBUG,
               "LockfreeEvent::SetShutdown: %p curr=%" PRIxPTR " err=%s",
               &state_, curr, StatusToString(shutdown_error).c_str());
@@ -215,7 +214,7 @@ void LockfreeEvent::SetReady() {
   while (true) {
     gpr_atm curr = gpr_atm_no_barrier_load(&state_);
 
-    if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) {
+    if (GRPC_TRACE_FLAG_ENABLED(polling)) {
       gpr_log(GPR_DEBUG, "LockfreeEvent::SetReady: %p curr=%" PRIxPTR, &state_,
               curr);
     }

data/src/core/lib/iomgr/lockfree_event.h

@@ -21,9 +21,8 @@
 
 // Lock free event notification for file descriptors
 
-#include <grpc/support/port_platform.h>
-
 #include <grpc/support/atm.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/iomgr/closure.h"