grpc 1.45.0 → 1.53.0

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

@@ -1,26 +1,22 @@
-/*
- *
- * Copyright 2018 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+// Copyright 2018 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// 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 <grpc/impl/codegen/log.h>
+#include <grpc/support/log.h>
 
 #include "src/core/lib/iomgr/port.h"
 
@@ -31,38 +27,35 @@
 #include <string.h>
 #include <sys/utsname.h>
 
-namespace grpc_core {
-static bool errqueue_supported = false;
+#include "src/core/lib/gprpp/strerror.h"
 
-bool kernel_supports_errqueue() { return errqueue_supported; }
+namespace grpc_core {
 
-void grpc_errqueue_init() {
-/* Both-compile time and run-time linux kernel versions should be at least 4.0.0
- */
+bool KernelSupportsErrqueue() {
+  static const bool errqueue_supported = []() {
 #ifdef GRPC_LINUX_ERRQUEUE
-  struct utsname buffer;
-  if (uname(&buffer) != 0) {
-    gpr_log(GPR_ERROR, "uname: %s", strerror(errno));
-    return;
-  }
-  char* release = buffer.release;
-  if (release == nullptr) {
-    return;
-  }
-
-  if (strtol(release, nullptr, 10) >= 4) {
-    errqueue_supported = true;
-  } else {
-    gpr_log(GPR_DEBUG, "ERRQUEUE support not enabled");
-  }
-#endif /* GRPC_LINUX_ERRQUEUE */
+    // Both-compile time and run-time linux kernel versions should be at
+    // least 4.0.0
+    struct utsname buffer;
+    if (uname(&buffer) != 0) {
+      gpr_log(GPR_ERROR, "uname: %s", StrError(errno).c_str());
+      return false;
+    }
+    char* release = buffer.release;
+    if (release == nullptr) {
+      return false;
+    }
+
+    if (strtol(release, nullptr, 10) >= 4) {
+      return true;
+    } else {
+      gpr_log(GPR_DEBUG, "ERRQUEUE support not enabled");
+    }
+#endif  // GRPC_LINUX_ERRQUEUE
+    return false;
+  }();
+  return errqueue_supported;
 }
-} /* namespace grpc_core */
-
-#else
-
-namespace grpc_core {
-void grpc_errqueue_init() {}
-} /* namespace grpc_core */
+}  // namespace grpc_core
 
-#endif /* GRPC_POSIX_SOCKET_TCP */
+#endif  // GRPC_POSIX_SOCKET_TCP

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

@@ -1,29 +1,29 @@
-/*
- *
- * Copyright 2018 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-/* This file contains constants defined in <linux/errqueue.h> and
- * <linux/net_tstamp.h> so as to allow collecting network timestamps in the
- * kernel. This file allows tcp_posix.cc to compile on platforms that do not
- * have <linux/errqueue.h> and <linux/net_tstamp.h>.
- */
-
-#ifndef GRPC_CORE_LIB_IOMGR_INTERNAL_ERRQUEUE_H
-#define GRPC_CORE_LIB_IOMGR_INTERNAL_ERRQUEUE_H
+//
+//
+// Copyright 2018 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
+
+// This file contains constants defined in <linux/errqueue.h> and
+// <linux/net_tstamp.h> so as to allow collecting network timestamps in the
+// kernel. This file allows tcp_posix.cc to compile on platforms that do not
+// have <linux/errqueue.h> and <linux/net_tstamp.h>.
+//
+
+#ifndef GRPC_SRC_CORE_LIB_IOMGR_INTERNAL_ERRQUEUE_H
+#define GRPC_SRC_CORE_LIB_IOMGR_INTERNAL_ERRQUEUE_H
 
 #include <grpc/support/port_platform.h>
 
@@ -39,31 +39,31 @@
 #include <linux/net_tstamp.h>
 #include <linux/netlink.h>
 #include <sys/socket.h>
-#endif /* GRPC_LINUX_ERRQUEUE */
+#endif  // GRPC_LINUX_ERRQUEUE
 
 namespace grpc_core {
 
 #ifdef GRPC_LINUX_ERRQUEUE
 
-/* Redefining scm_timestamping in the same way that <linux/errqueue.h> defines
- * it, so that code compiles on systems that don't have it. */
+// Redefining scm_timestamping in the same way that <linux/errqueue.h> defines
+// it, so that code compiles on systems that don't have it.
 struct scm_timestamping {
   struct timespec ts[3];
 };
-/* Also redefine timestamp types */
-/* The timestamp type for when the driver passed skb to NIC, or HW. */
+// Also redefine timestamp types
+// The timestamp type for when the driver passed skb to NIC, or HW.
 constexpr int SCM_TSTAMP_SND = 0;
-/* The timestamp type for when data entered the packet scheduler. */
+// The timestamp type for when data entered the packet scheduler.
 constexpr int SCM_TSTAMP_SCHED = 1;
-/* The timestamp type for when data acknowledged by peer. */
+// The timestamp type for when data acknowledged by peer.
 constexpr int SCM_TSTAMP_ACK = 2;
 
-/* Control message type containing OPT_STATS */
+// Control message type containing OPT_STATS
 #ifndef SCM_TIMESTAMPING_OPT_STATS
 #define SCM_TIMESTAMPING_OPT_STATS 54
 #endif
 
-/* Redefine required constants from <linux/net_tstamp.h> */
+// Redefine required constants from <linux/net_tstamp.h>
 constexpr uint32_t SOF_TIMESTAMPING_TX_SOFTWARE = 1u << 1;
 constexpr uint32_t SOF_TIMESTAMPING_SOFTWARE = 1u << 4;
 constexpr uint32_t SOF_TIMESTAMPING_OPT_ID = 1u << 7;
@@ -79,34 +79,34 @@ constexpr uint32_t kTimestampingRecordingOptions =
     SOF_TIMESTAMPING_TX_SCHED | SOF_TIMESTAMPING_TX_SOFTWARE |
     SOF_TIMESTAMPING_TX_ACK;
 
-/* Netlink attribute types used for TCP opt stats. */
+// Netlink attribute types used for TCP opt stats.
 enum TCPOptStats {
   TCP_NLA_PAD,
-  TCP_NLA_BUSY,           /* Time (usec) busy sending data. */
-  TCP_NLA_RWND_LIMITED,   /* Time (usec) limited by receive window. */
-  TCP_NLA_SNDBUF_LIMITED, /* Time (usec) limited by send buffer. */
-  TCP_NLA_DATA_SEGS_OUT,  /* Data pkts sent including retransmission. */
-  TCP_NLA_TOTAL_RETRANS,  /* Data pkts retransmitted. */
-  TCP_NLA_PACING_RATE,    /* Pacing rate in Bps. */
-  TCP_NLA_DELIVERY_RATE,  /* Delivery rate in Bps. */
-  TCP_NLA_SND_CWND,       /* Sending congestion window. */
-  TCP_NLA_REORDERING,     /* Reordering metric. */
-  TCP_NLA_MIN_RTT,        /* minimum RTT. */
-  TCP_NLA_RECUR_RETRANS,  /* Recurring retransmits for the current pkt. */
-  TCP_NLA_DELIVERY_RATE_APP_LMT, /* Delivery rate application limited? */
-  TCP_NLA_SNDQ_SIZE,             /* Data (bytes) pending in send queue */
-  TCP_NLA_CA_STATE,              /* ca_state of socket */
-  TCP_NLA_SND_SSTHRESH,          /* Slow start size threshold */
-  TCP_NLA_DELIVERED,             /* Data pkts delivered incl. out-of-order */
-  TCP_NLA_DELIVERED_CE,          /* Like above but only ones w/ CE marks */
-  TCP_NLA_BYTES_SENT,            /* Data bytes sent including retransmission */
-  TCP_NLA_BYTES_RETRANS,         /* Data bytes retransmitted */
-  TCP_NLA_DSACK_DUPS,            /* DSACK blocks received */
-  TCP_NLA_REORD_SEEN,            /* reordering events seen */
-  TCP_NLA_SRTT,                  /* smoothed RTT in usecs */
+  TCP_NLA_BUSY,                   // Time (usec) busy sending data.
+  TCP_NLA_RWND_LIMITED,           // Time (usec) limited by receive window.
+  TCP_NLA_SNDBUF_LIMITED,         // Time (usec) limited by send buffer.
+  TCP_NLA_DATA_SEGS_OUT,          // Data pkts sent including retransmission.
+  TCP_NLA_TOTAL_RETRANS,          // Data pkts retransmitted.
+  TCP_NLA_PACING_RATE,            // Pacing rate in Bps.
+  TCP_NLA_DELIVERY_RATE,          // Delivery rate in Bps.
+  TCP_NLA_SND_CWND,               // Sending congestion window.
+  TCP_NLA_REORDERING,             // Reordering metric.
+  TCP_NLA_MIN_RTT,                // minimum RTT.
+  TCP_NLA_RECUR_RETRANS,          // Recurring retransmits for the current pkt.
+  TCP_NLA_DELIVERY_RATE_APP_LMT,  // Delivery rate application limited?
+  TCP_NLA_SNDQ_SIZE,              // Data (bytes) pending in send queue
+  TCP_NLA_CA_STATE,               // ca_state of socket
+  TCP_NLA_SND_SSTHRESH,           // Slow start size threshold
+  TCP_NLA_DELIVERED,              // Data pkts delivered incl. out-of-order
+  TCP_NLA_DELIVERED_CE,           // Like above but only ones w/ CE marks
+  TCP_NLA_BYTES_SENT,             // Data bytes sent including retransmission
+  TCP_NLA_BYTES_RETRANS,          // Data bytes retransmitted
+  TCP_NLA_DSACK_DUPS,             // DSACK blocks received
+  TCP_NLA_REORD_SEEN,             // reordering events seen
+  TCP_NLA_SRTT,                   // smoothed RTT in usecs
 };
 
-/* tcp_info from from linux/tcp.h */
+// tcp_info from from linux/tcp.h
 struct tcp_info {
   uint8_t tcpi_state;
   uint8_t tcpi_ca_state;
@@ -125,12 +125,12 @@ struct tcp_info {
   uint32_t tcpi_lost;
   uint32_t tcpi_retrans;
   uint32_t tcpi_fackets;
-  /* Times. */
+  // Times.
   uint32_t tcpi_last_data_sent;
-  uint32_t tcpi_last_ack_sent; /* Not remembered, sorry. */
+  uint32_t tcpi_last_ack_sent;  // Not remembered, sorry.
   uint32_t tcpi_last_data_recv;
   uint32_t tcpi_last_ack_recv;
-  /* Metrics. */
+  // Metrics.
   uint32_t tcpi_pmtu;
   uint32_t tcpi_rcv_ssthresh;
   uint32_t tcpi_rtt;
@@ -144,48 +144,43 @@ struct tcp_info {
   uint32_t tcpi_total_retrans;
   uint64_t tcpi_pacing_rate;
   uint64_t tcpi_max_pacing_rate;
-  uint64_t tcpi_bytes_acked;    /* RFC4898 tcpEStatsAppHCThruOctetsAcked */
-  uint64_t tcpi_bytes_received; /* RFC4898 tcpEStatsAppHCThruOctetsReceived */
+  uint64_t tcpi_bytes_acked;     // RFC4898 tcpEStatsAppHCThruOctetsAcked
+  uint64_t tcpi_bytes_received;  // RFC4898 tcpEStatsAppHCThruOctetsReceived
 
-  uint32_t tcpi_segs_out; /* RFC4898 tcpEStatsPerfSegsOut */
-  uint32_t tcpi_segs_in;  /* RFC4898 tcpEStatsPerfSegsIn */
+  uint32_t tcpi_segs_out;  // RFC4898 tcpEStatsPerfSegsOut
+  uint32_t tcpi_segs_in;   // RFC4898 tcpEStatsPerfSegsIn
   uint32_t tcpi_notsent_bytes;
   uint32_t tcpi_min_rtt;
 
-  uint32_t tcpi_data_segs_in;  /* RFC4898 tcpEStatsDataSegsIn */
-  uint32_t tcpi_data_segs_out; /* RFC4898 tcpEStatsDataSegsOut */
+  uint32_t tcpi_data_segs_in;   // RFC4898 tcpEStatsDataSegsIn
+  uint32_t tcpi_data_segs_out;  // RFC4898 tcpEStatsDataSegsOut
 
   uint64_t tcpi_delivery_rate;
-  uint64_t tcpi_busy_time;      /* Time (usec) busy sending data */
-  uint64_t tcpi_rwnd_limited;   /* Time (usec) limited by receive window */
-  uint64_t tcpi_sndbuf_limited; /* Time (usec) limited by send buffer */
+  uint64_t tcpi_busy_time;       // Time (usec) busy sending data
+  uint64_t tcpi_rwnd_limited;    // Time (usec) limited by receive window
+  uint64_t tcpi_sndbuf_limited;  // Time (usec) limited by send buffer
 
   uint32_t tcpi_delivered;
   uint32_t tcpi_delivered_ce;
-  uint64_t tcpi_bytes_sent;    /* RFC4898 tcpEStatsPerfHCDataOctetsOut */
-  uint64_t tcpi_bytes_retrans; /* RFC4898 tcpEStatsPerfOctetsRetrans */
-  uint32_t tcpi_dsack_dups;    /* RFC4898 tcpEStatsStackDSACKDups */
-  uint32_t tcpi_reord_seen;    /* reordering events seen */
-  socklen_t length;            /* Length of struct returned by kernel */
+  uint64_t tcpi_bytes_sent;     // RFC4898 tcpEStatsPerfHCDataOctetsOut
+  uint64_t tcpi_bytes_retrans;  // RFC4898 tcpEStatsPerfOctetsRetrans
+  uint32_t tcpi_dsack_dups;     // RFC4898 tcpEStatsStackDSACKDups
+  uint32_t tcpi_reord_seen;     // reordering events seen
+  socklen_t length;             // Length of struct returned by kernel
 };
 
 #ifndef TCP_INFO
 #define TCP_INFO 11
 #endif
-#endif /* GRPC_LINUX_ERRQUEUE */
+#endif  // GRPC_LINUX_ERRQUEUE
 
-/* Returns true if kernel is capable of supporting errqueue and timestamping.
- * Currently allowing only linux kernels above 4.0.0
- */
-bool kernel_supports_errqueue();
+// Returns true if kernel is capable of supporting errqueue and timestamping.
+// Currently allowing only linux kernels above 4.0.0
+//
+bool KernelSupportsErrqueue();
 
-} /* namespace grpc_core */
+}  // namespace grpc_core
 
-#endif /* GRPC_POSIX_SOCKET_TCP */
+#endif  // GRPC_POSIX_SOCKET_TCP
 
-namespace grpc_core {
-/* Initializes errqueue support */
-void grpc_errqueue_init();
-} /* namespace grpc_core */
-
-#endif /* GRPC_CORE_LIB_IOMGR_INTERNAL_ERRQUEUE_H */
+#endif  // GRPC_SRC_CORE_LIB_IOMGR_INTERNAL_ERRQUEUE_H

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

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2015 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+//
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
 
 #include <grpc/support/port_platform.h>
 
@@ -31,6 +31,8 @@
 #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"
@@ -48,7 +50,7 @@ static DWORD deadline_to_millis_timeout(grpc_core::Timestamp deadline) {
   if (deadline == grpc_core::Timestamp::InfFuture()) {
     return INFINITE;
   }
-  grpc_core::Timestamp now = grpc_core::ExecCtx::Get()->Now();
+  grpc_core::Timestamp now = grpc_core::Timestamp::Now();
   if (deadline < now) return 0;
   grpc_core::Duration timeout = deadline - now;
   if (timeout.millis() > std::numeric_limits<DWORD>::max()) return INFINITE;
@@ -63,7 +65,6 @@ grpc_iocp_work_status grpc_iocp_work(grpc_core::Timestamp deadline) {
   LPOVERLAPPED overlapped;
   grpc_winsocket* socket;
   grpc_winsocket_callback_info* info;
-  GRPC_STATS_INC_SYSCALL_POLL();
   success =
       GetQueuedCompletionStatus(g_iocp, &bytes, &completion_key, &overlapped,
                                 deadline_to_millis_timeout(deadline));
@@ -75,11 +76,10 @@ grpc_iocp_work_status grpc_iocp_work(grpc_core::Timestamp deadline) {
   if (overlapped == &g_iocp_custom_overlap) {
     gpr_atm_full_fetch_add(&g_custom_events, -1);
     if (completion_key == (ULONG_PTR)&g_iocp_kick_token) {
-      /* We were awoken from a kick. */
+      // We were awoken from a kick.
       return GRPC_IOCP_WORK_KICK;
     }
-    gpr_log(GPR_ERROR, "Unknown custom completion key.");
-    abort();
+    grpc_core::Crash("Unknown custom completion key.");
   }
 
   socket = (grpc_winsocket*)completion_key;
@@ -155,4 +155,4 @@ void grpc_iocp_add_socket(grpc_winsocket* socket) {
   GPR_ASSERT(ret == g_iocp);
 }
 
-#endif /* GRPC_WINSOCK_SOCKET */
+#endif  // GRPC_WINSOCK_SOCKET

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

@@ -1,23 +1,23 @@
-/*
- *
- * Copyright 2015 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#ifndef GRPC_CORE_LIB_IOMGR_IOCP_WINDOWS_H
-#define GRPC_CORE_LIB_IOMGR_IOCP_WINDOWS_H
+//
+//
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
+
+#ifndef GRPC_SRC_CORE_LIB_IOMGR_IOCP_WINDOWS_H
+#define GRPC_SRC_CORE_LIB_IOMGR_IOCP_WINDOWS_H
 
 #include <grpc/support/port_platform.h>
 
@@ -45,4 +45,4 @@ void grpc_iocp_add_socket(grpc_winsocket*);
 
 #endif
 
-#endif /* GRPC_CORE_LIB_IOMGR_IOCP_WINDOWS_H */
+#endif  // GRPC_SRC_CORE_LIB_IOMGR_IOCP_WINDOWS_H

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

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2015 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+//
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
 
 #include <grpc/support/port_platform.h>
 
@@ -31,6 +31,7 @@
 
 #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/global_config.h"
 #include "src/core/lib/gprpp/thd.h"
 #include "src/core/lib/iomgr/buffer_list.h"
@@ -64,7 +65,6 @@ void grpc_iomgr_init() {
   g_root_object.name = const_cast<char*>("root");
   grpc_iomgr_platform_init();
   grpc_timer_list_init();
-  grpc_core::grpc_errqueue_init();
   g_grpc_abort_on_leaks = GPR_GLOBAL_CONFIG_GET(grpc_abort_on_leaks);
 }
 
@@ -79,7 +79,12 @@ static size_t count_objects(void) {
   return n;
 }
 
-size_t grpc_iomgr_count_objects_for_testing(void) { return count_objects(); }
+size_t grpc_iomgr_count_objects_for_testing(void) {
+  gpr_mu_lock(&g_mu);
+  size_t ret = count_objects();
+  gpr_mu_unlock(&g_mu);
+  return ret;
+}
 
 static void dump_objects(const char* kind) {
   grpc_iomgr_object* obj;
@@ -153,7 +158,7 @@ void grpc_iomgr_shutdown() {
     grpc_core::Executor::ShutdownAll();
   }
 
-  /* ensure all threads have left g_mu */
+  // ensure all threads have left g_mu
   gpr_mu_lock(&g_mu);
   gpr_mu_unlock(&g_mu);
 

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

@@ -1,23 +1,23 @@
-/*
- *
- * Copyright 2015 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#ifndef GRPC_CORE_LIB_IOMGR_IOMGR_H
-#define GRPC_CORE_LIB_IOMGR_IOMGR_H
+//
+//
+// Copyright 2015 gRPC authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+//
+
+#ifndef GRPC_SRC_CORE_LIB_IOMGR_IOMGR_H
+#define GRPC_SRC_CORE_LIB_IOMGR_IOMGR_H
 
 #include <grpc/support/port_platform.h>
 
@@ -26,35 +26,35 @@
 #include "src/core/lib/iomgr/closure.h"
 #include "src/core/lib/iomgr/port.h"
 
-/** Initializes the iomgr. */
+/// Initializes the iomgr.
 void grpc_iomgr_init();
 
-/** Starts any background threads for iomgr. */
+/// Starts any background threads for iomgr.
 void grpc_iomgr_start();
 
-/** Signals the intention to shutdown the iomgr. Expects to be able to flush
- * exec_ctx. */
+/// Signals the intention to shutdown the iomgr. Expects to be able to flush
+/// exec_ctx.
 void grpc_iomgr_shutdown();
 
-/** Signals the intention to shutdown all the closures registered in the
- * background poller. */
+/// Signals the intention to shutdown all the closures registered in the
+/// background poller.
 void grpc_iomgr_shutdown_background_closure();
 
-/* Returns true if polling engine runs in the background, false otherwise.
- * Currently only 'epollbg' runs in the background.
- */
+// Returns true if polling engine runs in the background, false otherwise.
+// Currently only 'epollbg' runs in the background.
+//
 bool grpc_iomgr_run_in_background();
 
-/** Returns true if the caller is a worker thread for any background poller. */
+/// Returns true if the caller is a worker thread for any background poller.
 bool grpc_iomgr_is_any_background_poller_thread();
 
-/** Returns true if the closure is registered into the background poller. Note
- * that the closure may or may not run yet when this function returns, and the
- * closure should not be blocking or long-running. */
+/// Returns true if the closure is registered into the background poller. Note
+/// that the closure may or may not run yet when this function returns, and the
+/// closure should not be blocking or long-running.
 bool grpc_iomgr_add_closure_to_background_poller(grpc_closure* closure,
                                                  grpc_error_handle error);
 
-/* Exposed only for testing */
+// Exposed only for testing
 size_t grpc_iomgr_count_objects_for_testing();
 
-#endif /* GRPC_CORE_LIB_IOMGR_IOMGR_H */
+#endif  // GRPC_SRC_CORE_LIB_IOMGR_IOMGR_H