grpc 1.51.0 → 1.52.0.pre2

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

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2017 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 2017 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>
 
@@ -23,52 +23,53 @@
 #include <grpc/support/log.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
-                         closure yet to execute
+// '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
+//                       closure yet to execute
 
-     kClosureNotReady : The fd has no I/O event of interest
+//   kClosureNotReady : The fd has no I/O event of interest
 
-     closure ptr       : The closure to be executed when the fd has an I/O
-                         event of interest
+//   closure ptr       : The closure to be executed when the fd has an I/O
+//                       event of interest
 
-     shutdown_error | kShutdownBit :
-                        'shutdown_error' field ORed with kShutdownBit.
-                         This indicates that the fd is shutdown. Since all
-                         memory allocations are word-aligned, the lower two
-                         bits of the shutdown_error pointer are always 0. So
-                         it is safe to OR these with kShutdownBit
+//   shutdown_error | kShutdownBit :
+//                      'shutdown_error' field ORed with kShutdownBit.
+//                       This indicates that the fd is shutdown. Since all
+//                       memory allocations are word-aligned, the lower two
+//                       bits of the shutdown_error pointer are always 0. So
+//                       it is safe to OR these with kShutdownBit
 
-   Valid state transitions:
+// Valid state transitions:
 
-     <closure ptr> <-----3------ kClosureNotReady -----1------->  kClosureReady
-       |  |                         ^   |    ^                         |  |
-       |  |                         |   |    |                         |  |
-       |  +--------------4----------+   6    +---------2---------------+  |
-       |                                |                                 |
-       |                                v                                 |
-       +-----5------->  [shutdown_error | kShutdownBit] <-------7---------+
+//   <closure ptr> <-----3------ kClosureNotReady -----1------->  kClosureReady
+//     |  |                         ^   |    ^                         |  |
+//     |  |                         |   |    |                         |  |
+//     |  +--------------4----------+   6    +---------2---------------+  |
+//     |                                |                                 |
+//     |                                v                                 |
+//     +-----5------->  [shutdown_error | kShutdownBit] <-------7---------+
 
-    For 1, 4 : See SetReady() function
-    For 2, 3 : See NotifyOn() function
-    For 5,6,7: See SetShutdown() function */
+//  For 1, 4 : See SetReady() function
+//  For 2, 3 : See NotifyOn() function
+//  For 5,6,7: See SetShutdown() function
 
 namespace grpc_core {
 
 LockfreeEvent::LockfreeEvent() { InitEvent(); }
 
 void LockfreeEvent::InitEvent() {
-  /* Perform an atomic store to start the state machine.
+  // Perform an atomic store to start the state machine.
 
-     Note carefully that LockfreeEvent *MAY* be used whilst in a destroyed
-     state, while a file descriptor is on a freelist. In such a state it may
-     be SetReady'd, and so we need to perform an atomic operation here to
-     ensure no races */
+  // Note carefully that LockfreeEvent *MAY* be used whilst in a destroyed
+  // state, while a file descriptor is on a freelist. In such a state it may
+  // be SetReady'd, and so we need to perform an atomic operation here to
+  // ensure no races
   gpr_atm_no_barrier_store(&state_, kClosureNotReady);
 }
 
@@ -81,19 +82,19 @@ void LockfreeEvent::DestroyEvent() {
     } else {
       GPR_ASSERT(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
-       pattern to prevent error retention in a deleted object */
+    // 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
+    // pattern to prevent error retention in a deleted object
   } while (!gpr_atm_no_barrier_cas(&state_, curr,
                                    kShutdownBit /* shutdown, no error */));
 }
 
 void LockfreeEvent::NotifyOn(grpc_closure* closure) {
   while (true) {
-    /* This load needs to be an acquire load because this can be a shutdown
-     * error that we might need to reference. Adding acquire semantics makes
-     * sure that the shutdown error has been initialized properly before us
-     * referencing it. */
+    // This load needs to be an acquire load because this can be a shutdown
+    // error that we might need to reference. Adding acquire semantics makes
+    // 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)) {
       gpr_log(GPR_DEBUG,
@@ -102,42 +103,42 @@ void LockfreeEvent::NotifyOn(grpc_closure* closure) {
     }
     switch (curr) {
       case kClosureNotReady: {
-        /* kClosureNotReady -> <closure>.
+        // kClosureNotReady -> <closure>.
 
-           We're guaranteed by API that there's an acquire barrier before here,
-           so there's no need to double-dip and this can be a release-only.
+        // We're guaranteed by API that there's an acquire barrier before here,
+        // so there's no need to double-dip and this can be a release-only.
 
-           The release itself pairs with the acquire half of a set_ready full
-           barrier. */
+        // The release itself pairs with the acquire half of a set_ready full
+        // barrier.
         if (gpr_atm_rel_cas(&state_, kClosureNotReady,
                             reinterpret_cast<gpr_atm>(closure))) {
-          return; /* Successful. Return */
+          return;  // Successful. Return
         }
 
-        break; /* retry */
+        break;  // retry
       }
 
       case kClosureReady: {
-        /* Change the state to kClosureNotReady. Schedule the closure if
-           successful. If not, the state most likely transitioned to shutdown.
-           We should retry.
-
-           This can be a no-barrier cas since the state is being transitioned to
-           kClosureNotReady; set_ready and set_shutdown do not schedule any
-           closure when transitioning out of CLOSURE_NO_READY state (i.e there
-           is no other code that needs to 'happen-after' this) */
+        // Change the state to kClosureNotReady. Schedule the closure if
+        // successful. If not, the state most likely transitioned to shutdown.
+        // We should retry.
+
+        // This can be a no-barrier cas since the state is being transitioned to
+        // kClosureNotReady; set_ready and set_shutdown do not schedule any
+        // closure when transitioning out of CLOSURE_NO_READY state (i.e there
+        // is no other code that needs to 'happen-after' this)
         if (gpr_atm_no_barrier_cas(&state_, kClosureReady, kClosureNotReady)) {
           ExecCtx::Run(DEBUG_LOCATION, closure, absl::OkStatus());
-          return; /* Successful. Return */
+          return;  // Successful. Return
         }
 
-        break; /* retry */
+        break;  // retry
       }
 
       default: {
-        /* 'curr' is either a closure or the fd is shutdown(in which case 'curr'
-           contains a pointer to the shutdown-error). If the fd is shutdown,
-           schedule the closure with the shutdown error */
+        // 'curr' is either a closure or the fd is shutdown(in which case 'curr'
+        // contains a pointer to the shutdown-error). If the fd is shutdown,
+        // schedule the closure with the shutdown error
         if ((curr & kShutdownBit) > 0) {
           grpc_error_handle shutdown_err =
               internal::StatusGetFromHeapPtr(curr & ~kShutdownBit);
@@ -147,11 +148,10 @@ void LockfreeEvent::NotifyOn(grpc_closure* closure) {
           return;
         }
 
-        /* There is already a closure!. This indicates a bug in the code */
-        gpr_log(GPR_ERROR,
-                "LockfreeEvent::NotifyOn: notify_on called with a previous "
-                "callback still pending");
-        abort();
+        // There is already a closure!. This indicates a bug in the code
+        Crash(
+            "LockfreeEvent::NotifyOn: notify_on called with a previous "
+            "callback still pending");
       }
     }
   }
@@ -173,27 +173,27 @@ bool LockfreeEvent::SetShutdown(grpc_error_handle shutdown_error) {
     switch (curr) {
       case kClosureReady:
       case kClosureNotReady:
-        /* Need a full barrier here so that the initial load in notify_on
-           doesn't need a barrier */
+        // Need a full barrier here so that the initial load in notify_on
+        // doesn't need a barrier
         if (gpr_atm_full_cas(&state_, curr, new_state)) {
-          return true; /* early out */
+          return true;  // early out
         }
-        break; /* retry */
+        break;  // retry
 
       default: {
-        /* 'curr' is either a closure or the fd is already shutdown */
+        // 'curr' is either a closure or the fd is already shutdown
 
-        /* If fd is already shutdown, we are done */
+        // If fd is already shutdown, we are done
         if ((curr & kShutdownBit) > 0) {
           internal::StatusFreeHeapPtr(status_ptr);
           return false;
         }
 
-        /* Fd is not shutdown. Schedule the closure and move the state to
-           shutdown state.
-           Needs an acquire to pair with setting the closure (and get a
-           happens-after on that edge), and a release to pair with anything
-           loading the shutdown state. */
+        // Fd is not shutdown. Schedule the closure and move the state to
+        // shutdown state.
+        // Needs an acquire to pair with setting the closure (and get a
+        // happens-after on that edge), and a release to pair with anything
+        // loading the shutdown state.
         if (gpr_atm_full_cas(&state_, curr, new_state)) {
           ExecCtx::Run(
               DEBUG_LOCATION, reinterpret_cast<grpc_closure*>(curr),
@@ -201,8 +201,8 @@ bool LockfreeEvent::SetShutdown(grpc_error_handle shutdown_error) {
           return true;
         }
 
-        /* 'curr' was a closure but now changed to a different state. We will
-          have to retry */
+        // 'curr' was a closure but now changed to a different state. We will
+        // have to retry
         break;
       }
     }
@@ -222,36 +222,36 @@ void LockfreeEvent::SetReady() {
 
     switch (curr) {
       case kClosureReady: {
-        /* Already ready. We are done here */
+        // Already ready. We are done here
         return;
       }
 
       case kClosureNotReady: {
-        /* No barrier required as we're transitioning to a state that does not
-           involve a closure */
+        // No barrier required as we're transitioning to a state that does not
+        // involve a closure
         if (gpr_atm_no_barrier_cas(&state_, kClosureNotReady, kClosureReady)) {
-          return; /* early out */
+          return;  // early out
         }
-        break; /* retry */
+        break;  // retry
       }
 
       default: {
-        /* 'curr' is either a closure or the fd is shutdown */
+        // 'curr' is either a closure or the fd is shutdown
         if ((curr & kShutdownBit) > 0) {
-          /* The fd is shutdown. Do nothing */
+          // The fd is shutdown. Do nothing
           return;
         }
-        /* Full cas: acquire pairs with this cas' release in the event of a
-           spurious set_ready; release pairs with this or the acquire in
-           notify_on (or set_shutdown) */
+        // Full cas: acquire pairs with this cas' release in the event of a
+        // spurious set_ready; release pairs with this or the acquire in
+        // notify_on (or set_shutdown)
         else if (gpr_atm_full_cas(&state_, curr, kClosureNotReady)) {
           ExecCtx::Run(DEBUG_LOCATION, reinterpret_cast<grpc_closure*>(curr),
                        absl::OkStatus());
           return;
         }
-        /* else the state changed again (only possible by either a racing
-           set_ready or set_shutdown functions. In both these cases, the closure
-           would have been scheduled for execution. So we are done here */
+        // else the state changed again (only possible by either a racing
+        // set_ready or set_shutdown functions. In both these cases, the closure
+        // would have been scheduled for execution. So we are done here
         return;
       }
     }

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

@@ -1,25 +1,25 @@
-/*
- *
- * Copyright 2017 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 2017 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_LOCKFREE_EVENT_H
 #define GRPC_CORE_LIB_IOMGR_LOCKFREE_EVENT_H
 
-/* Lock free event notification for file descriptors */
+// Lock free event notification for file descriptors
 
 #include <grpc/support/port_platform.h>
 
@@ -69,4 +69,4 @@ class LockfreeEvent {
 
 }  // namespace grpc_core
 
-#endif /* GRPC_CORE_LIB_IOMGR_LOCKFREE_EVENT_H */
+#endif  // GRPC_CORE_LIB_IOMGR_LOCKFREE_EVENT_H

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

@@ -1,20 +1,20 @@
-/*
- *
- * Copyright 2017 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 2017 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_NAMESER_H
 #define GRPC_CORE_LIB_IOMGR_NAMESER_H
@@ -27,80 +27,80 @@
 
 #include <arpa/nameser.h>
 
-#else /* GRPC_HAVE_ARPA_NAMESER */
+#else  // GRPC_HAVE_ARPA_NAMESER
 
 typedef enum __ns_class {
-  ns_c_invalid = 0, /* Cookie. */
-  ns_c_in = 1,      /* Internet. */
-  ns_c_2 = 2,       /* unallocated/unsupported. */
-  ns_c_chaos = 3,   /* MIT Chaos-net. */
-  ns_c_hs = 4,      /* MIT Hesiod. */
-  /* Query class values which do not appear in resource records */
-  ns_c_none = 254, /* for prereq. sections in update requests */
-  ns_c_any = 255,  /* Wildcard match. */
+  ns_c_invalid = 0,  // Cookie.
+  ns_c_in = 1,       // Internet.
+  ns_c_2 = 2,        // unallocated/unsupported.
+  ns_c_chaos = 3,    // MIT Chaos-net.
+  ns_c_hs = 4,       // MIT Hesiod.
+  // Query class values which do not appear in resource records
+  ns_c_none = 254,  // for prereq. sections in update requests
+  ns_c_any = 255,   // Wildcard match.
   ns_c_max = 65536
 } ns_class;
 
 typedef enum __ns_type {
-  ns_t_invalid = 0,   /* Cookie. */
-  ns_t_a = 1,         /* Host address. */
-  ns_t_ns = 2,        /* Authoritative server. */
-  ns_t_md = 3,        /* Mail destination. */
-  ns_t_mf = 4,        /* Mail forwarder. */
-  ns_t_cname = 5,     /* Canonical name. */
-  ns_t_soa = 6,       /* Start of authority zone. */
-  ns_t_mb = 7,        /* Mailbox domain name. */
-  ns_t_mg = 8,        /* Mail group member. */
-  ns_t_mr = 9,        /* Mail rename name. */
-  ns_t_null = 10,     /* Null resource record. */
-  ns_t_wks = 11,      /* Well known service. */
-  ns_t_ptr = 12,      /* Domain name pointer. */
-  ns_t_hinfo = 13,    /* Host information. */
-  ns_t_minfo = 14,    /* Mailbox information. */
-  ns_t_mx = 15,       /* Mail routing information. */
-  ns_t_txt = 16,      /* Text strings. */
-  ns_t_rp = 17,       /* Responsible person. */
-  ns_t_afsdb = 18,    /* AFS cell database. */
-  ns_t_x25 = 19,      /* X_25 calling address. */
-  ns_t_isdn = 20,     /* ISDN calling address. */
-  ns_t_rt = 21,       /* Router. */
-  ns_t_nsap = 22,     /* NSAP address. */
-  ns_t_nsap_ptr = 23, /* Reverse NSAP lookup (deprecated). */
-  ns_t_sig = 24,      /* Security signature. */
-  ns_t_key = 25,      /* Security key. */
-  ns_t_px = 26,       /* X.400 mail mapping. */
-  ns_t_gpos = 27,     /* Geographical position (withdrawn). */
-  ns_t_aaaa = 28,     /* Ip6 Address. */
-  ns_t_loc = 29,      /* Location Information. */
-  ns_t_nxt = 30,      /* Next domain (security). */
-  ns_t_eid = 31,      /* Endpoint identifier. */
-  ns_t_nimloc = 32,   /* Nimrod Locator. */
-  ns_t_srv = 33,      /* Server Selection. */
-  ns_t_atma = 34,     /* ATM Address */
-  ns_t_naptr = 35,    /* Naming Authority PoinTeR */
-  ns_t_kx = 36,       /* Key Exchange */
-  ns_t_cert = 37,     /* Certification record */
-  ns_t_a6 = 38,       /* IPv6 address (deprecates AAAA) */
-  ns_t_dname = 39,    /* Non-terminal DNAME (for IPv6) */
-  ns_t_sink = 40,     /* Kitchen sink (experimentatl) */
-  ns_t_opt = 41,      /* EDNS0 option (meta-RR) */
-  ns_t_apl = 42,      /* Address prefix list (RFC3123) */
-  ns_t_ds = 43,       /* Delegation Signer (RFC4034) */
-  ns_t_sshfp = 44,    /* SSH Key Fingerprint (RFC4255) */
-  ns_t_rrsig = 46,    /* Resource Record Signature (RFC4034) */
-  ns_t_nsec = 47,     /* Next Secure (RFC4034) */
-  ns_t_dnskey = 48,   /* DNS Public Key (RFC4034) */
-  ns_t_tkey = 249,    /* Transaction key */
-  ns_t_tsig = 250,    /* Transaction signature. */
-  ns_t_ixfr = 251,    /* Incremental zone transfer. */
-  ns_t_axfr = 252,    /* Transfer zone of authority. */
-  ns_t_mailb = 253,   /* Transfer mailbox records. */
-  ns_t_maila = 254,   /* Transfer mail agent records. */
-  ns_t_any = 255,     /* Wildcard match. */
-  ns_t_zxfr = 256,    /* BIND-specific, nonstandard. */
+  ns_t_invalid = 0,    // Cookie.
+  ns_t_a = 1,          // Host address.
+  ns_t_ns = 2,         // Authoritative server.
+  ns_t_md = 3,         // Mail destination.
+  ns_t_mf = 4,         // Mail forwarder.
+  ns_t_cname = 5,      // Canonical name.
+  ns_t_soa = 6,        // Start of authority zone.
+  ns_t_mb = 7,         // Mailbox domain name.
+  ns_t_mg = 8,         // Mail group member.
+  ns_t_mr = 9,         // Mail rename name.
+  ns_t_null = 10,      // Null resource record.
+  ns_t_wks = 11,       // Well known service.
+  ns_t_ptr = 12,       // Domain name pointer.
+  ns_t_hinfo = 13,     // Host information.
+  ns_t_minfo = 14,     // Mailbox information.
+  ns_t_mx = 15,        // Mail routing information.
+  ns_t_txt = 16,       // Text strings.
+  ns_t_rp = 17,        // Responsible person.
+  ns_t_afsdb = 18,     // AFS cell database.
+  ns_t_x25 = 19,       // X_25 calling address.
+  ns_t_isdn = 20,      // ISDN calling address.
+  ns_t_rt = 21,        // Router.
+  ns_t_nsap = 22,      // NSAP address.
+  ns_t_nsap_ptr = 23,  // Reverse NSAP lookup (deprecated).
+  ns_t_sig = 24,       // Security signature.
+  ns_t_key = 25,       // Security key.
+  ns_t_px = 26,        // X.400 mail mapping.
+  ns_t_gpos = 27,      // Geographical position (withdrawn).
+  ns_t_aaaa = 28,      // Ip6 Address.
+  ns_t_loc = 29,       // Location Information.
+  ns_t_nxt = 30,       // Next domain (security).
+  ns_t_eid = 31,       // Endpoint identifier.
+  ns_t_nimloc = 32,    // Nimrod Locator.
+  ns_t_srv = 33,       // Server Selection.
+  ns_t_atma = 34,      // ATM Address
+  ns_t_naptr = 35,     // Naming Authority PoinTeR
+  ns_t_kx = 36,        // Key Exchange
+  ns_t_cert = 37,      // Certification record
+  ns_t_a6 = 38,        // IPv6 address (deprecates AAAA)
+  ns_t_dname = 39,     // Non-terminal DNAME (for IPv6)
+  ns_t_sink = 40,      // Kitchen sink (experimentatl)
+  ns_t_opt = 41,       // EDNS0 option (meta-RR)
+  ns_t_apl = 42,       // Address prefix list (RFC3123)
+  ns_t_ds = 43,        // Delegation Signer (RFC4034)
+  ns_t_sshfp = 44,     // SSH Key Fingerprint (RFC4255)
+  ns_t_rrsig = 46,     // Resource Record Signature (RFC4034)
+  ns_t_nsec = 47,      // Next Secure (RFC4034)
+  ns_t_dnskey = 48,    // DNS Public Key (RFC4034)
+  ns_t_tkey = 249,     // Transaction key
+  ns_t_tsig = 250,     // Transaction signature.
+  ns_t_ixfr = 251,     // Incremental zone transfer.
+  ns_t_axfr = 252,     // Transfer zone of authority.
+  ns_t_mailb = 253,    // Transfer mailbox records.
+  ns_t_maila = 254,    // Transfer mail agent records.
+  ns_t_any = 255,      // Wildcard match.
+  ns_t_zxfr = 256,     // BIND-specific, nonstandard.
   ns_t_max = 65536
 } ns_type;
 
-#endif /* GRPC_HAVE_ARPA_NAMESER */
+#endif  // GRPC_HAVE_ARPA_NAMESER
 
-#endif /* GRPC_CORE_LIB_IOMGR_NAMESER_H */
+#endif  // GRPC_CORE_LIB_IOMGR_NAMESER_H

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

@@ -1,28 +1,32 @@
-/*
- *
- * Copyright 2016 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 2016 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/polling_entity.h"
 
+#include "absl/strings/str_format.h"
+
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 
+#include "src/core/lib/gprpp/crash.h"
+
 grpc_polling_entity grpc_polling_entity_create_from_pollset_set(
     grpc_pollset_set* pollset_set) {
   grpc_polling_entity pollent;
@@ -70,8 +74,8 @@ void grpc_polling_entity_add_to_pollset_set(grpc_polling_entity* pollent,
     GPR_ASSERT(pollent->pollent.pollset_set != nullptr);
     grpc_pollset_set_add_pollset_set(pss_dst, pollent->pollent.pollset_set);
   } else {
-    gpr_log(GPR_ERROR, "Invalid grpc_polling_entity tag '%d'", pollent->tag);
-    abort();
+    grpc_core::Crash(
+        absl::StrFormat("Invalid grpc_polling_entity tag '%d'", pollent->tag));
   }
 }
 
@@ -90,7 +94,7 @@ void grpc_polling_entity_del_from_pollset_set(grpc_polling_entity* pollent,
     GPR_ASSERT(pollent->pollent.pollset_set != nullptr);
     grpc_pollset_set_del_pollset_set(pss_dst, pollent->pollent.pollset_set);
   } else {
-    gpr_log(GPR_ERROR, "Invalid grpc_polling_entity tag '%d'", pollent->tag);
-    abort();
+    grpc_core::Crash(
+        absl::StrFormat("Invalid grpc_polling_entity tag '%d'", pollent->tag));
   }
 }