grpc 1.63.0 → 1.64.0.pre1

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

@@ -11,8 +11,6 @@
 // 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/event_engine_shims/tcp_client.h"
 
 #include "absl/status/status.h"
@@ -21,6 +19,7 @@
 #include "absl/strings/string_view.h"
 
 #include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/time.h>
 
 #include "src/core/lib/address_utils/sockaddr_utils.h"

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

@@ -13,9 +13,8 @@
 // limitations under the License.
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_EVENT_ENGINE_SHIMS_TCP_CLIENT_H
 #define GRPC_SRC_CORE_LIB_IOMGR_EVENT_ENGINE_SHIMS_TCP_CLIENT_H
-#include <grpc/support/port_platform.h>
-
 #include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/iomgr/endpoint.h"
 #include "src/core/lib/iomgr/resolved_address.h"

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

@@ -16,13 +16,13 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/exec_ctx.h"
 
+#include "absl/log/check.h"
 #include "absl/strings/str_format.h"
 
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/sync.h>
 
 #include "src/core/lib/gprpp/crash.h"
@@ -88,7 +88,7 @@ bool ExecCtx::Flush() {
       break;
     }
   }
-  GPR_ASSERT(combiner_data_.active_combiner == nullptr);
+  CHECK_EQ(combiner_data_.active_combiner, nullptr);
   return did_something;
 }
 
@@ -111,7 +111,7 @@ void ExecCtx::Run(const DebugLocation& location, grpc_closure* closure,
   closure->file_initiated = location.file();
   closure->line_initiated = location.line();
   closure->run = false;
-  GPR_ASSERT(closure->cb != nullptr);
+  CHECK_NE(closure->cb, nullptr);
 #endif
   closure->error_data.error = internal::StatusAllocHeapPtr(error);
   exec_ctx_sched(closure);
@@ -134,7 +134,7 @@ void ExecCtx::RunList(const DebugLocation& location, grpc_closure_list* list) {
     c->file_initiated = location.file();
     c->line_initiated = location.line();
     c->run = false;
-    GPR_ASSERT(c->cb != nullptr);
+    CHECK_NE(c->cb, nullptr);
 #endif
     exec_ctx_sched(c);
     c = next;

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

@@ -19,15 +19,17 @@
 #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>
@@ -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,15 +16,16 @@
 //
 //
 
-#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"
@@ -147,7 +148,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_));
@@ -371,8 +372,7 @@ void Executor::InitAll() {
 
   // 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;
   }
 
@@ -398,8 +398,7 @@ void Executor::ShutdownAll() {
 
   // 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;
   }
 
@@ -427,7 +426,7 @@ void Executor::ShutdownAll() {
 }
 
 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/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/internal_errqueue.cc

@@ -12,11 +12,10 @@
 // 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/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/iomgr/port.h"
 

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

@@ -26,6 +26,8 @@
 
 #include <limits>
 
+#include "absl/log/check.h"
+
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 #include <grpc/support/log_windows.h>
@@ -73,7 +75,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 +104,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 +116,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 +125,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 +147,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) {
@@ -160,7 +163,7 @@ void grpc_iocp_add_socket(grpc_winsocket* socket) {
     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,8 +16,6 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/iomgr.h"
 
 #include <inttypes.h>
@@ -26,6 +24,7 @@
 
 #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>
 

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,11 +16,12 @@
 //
 //
 
-#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"
@@ -80,7 +81,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

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"
 

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

@@ -16,14 +16,14 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/polling_entity.h"
 
+#include "absl/log/check.h"
 #include "absl/strings/str_format.h"
 
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/gprpp/crash.h"
 
@@ -71,7 +71,7 @@ void grpc_polling_entity_add_to_pollset_set(grpc_polling_entity* pollent,
       grpc_pollset_set_add_pollset(pss_dst, pollent->pollent.pollset);
     }
   } else if (pollent->tag == GRPC_POLLS_POLLSET_SET) {
-    GPR_ASSERT(pollent->pollent.pollset_set != nullptr);
+    CHECK_NE(pollent->pollent.pollset_set, nullptr);
     grpc_pollset_set_add_pollset_set(pss_dst, pollent->pollent.pollset_set);
   } else {
     grpc_core::Crash(
@@ -87,11 +87,11 @@ void grpc_polling_entity_del_from_pollset_set(grpc_polling_entity* pollent,
       grpc_pollset_set_del_pollset(pss_dst, pollent->pollent.pollset);
     }
 #else
-    GPR_ASSERT(pollent->pollent.pollset != nullptr);
+    CHECK_NE(pollent->pollent.pollset, nullptr);
     grpc_pollset_set_del_pollset(pss_dst, pollent->pollent.pollset);
 #endif
   } else if (pollent->tag == GRPC_POLLS_POLLSET_SET) {
-    GPR_ASSERT(pollent->pollent.pollset_set != nullptr);
+    CHECK_NE(pollent->pollent.pollset_set, nullptr);
     grpc_pollset_set_del_pollset_set(pss_dst, pollent->pollent.pollset_set);
   } else {
     grpc_core::Crash(

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

@@ -16,10 +16,10 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/pollset.h"
 
+#include <grpc/support/port_platform.h>
+
 grpc_pollset_vtable* grpc_pollset_impl;
 
 void grpc_set_pollset_vtable(grpc_pollset_vtable* vtable) {

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

@@ -20,7 +20,6 @@
 #define GRPC_SRC_CORE_LIB_IOMGR_POLLSET_H
 
 #include <grpc/support/port_platform.h>
-
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>
 

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

@@ -16,10 +16,10 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/pollset_set.h"
 
+#include <grpc/support/port_platform.h>
+
 grpc_pollset_set_vtable* grpc_pollset_set_impl;
 
 void grpc_set_pollset_set_vtable(grpc_pollset_set_vtable* vtable) {

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

@@ -16,10 +16,10 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include <stdint.h>
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/iomgr/port.h"
 
 #ifdef GRPC_WINSOCK_SOCKET

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

@@ -20,7 +20,6 @@
 #define GRPC_SRC_CORE_LIB_IOMGR_POLLSET_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/python_util.h

@@ -19,10 +19,9 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_PYTHON_UTIL_H
 #define GRPC_SRC_CORE_LIB_IOMGR_PYTHON_UTIL_H
 
-#include <grpc/support/port_platform.h>
-
 #include <grpc/slice.h>
 #include <grpc/status.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/iomgr/error.h"
 

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

@@ -15,8 +15,6 @@
 // limitations under the License.
 //
 //
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/resolve_address.h"
 
 #include "absl/strings/str_cat.h"
@@ -24,6 +22,7 @@
 #include <grpc/event_engine/event_engine.h>
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/gprpp/crash.h"
 #include "src/core/lib/gprpp/no_destruct.h"

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

@@ -19,14 +19,13 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_H
 #define GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
 #include "absl/container/flat_hash_set.h"
 #include "absl/status/statusor.h"
 
 #include <grpc/event_engine/event_engine.h>
+#include <grpc/support/port_platform.h>
 
 #include "src/core/lib/event_engine/handle_containers.h"
 #include "src/core/lib/gprpp/orphanable.h"

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

@@ -17,10 +17,10 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_IMPL_H
 #define GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_IMPL_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/iomgr/exec_ctx.h"
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/iomgr/resolve_address.h"

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

@@ -17,10 +17,10 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_POSIX_H
 #define GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_POSIX_H
 
-#include <grpc/support/port_platform.h>
-
 #include <functional>
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/iomgr/resolve_address.h"
 

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

@@ -17,10 +17,10 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_WINDOWS_H
 #define GRPC_SRC_CORE_LIB_IOMGR_RESOLVE_ADDRESS_WINDOWS_H
 
-#include <grpc/support/port_platform.h>
-
 #include <functional>
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/iomgr/port.h"
 #include "src/core/lib/iomgr/resolve_address.h"
 

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

@@ -15,10 +15,10 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_RESOLVED_ADDRESS_H
 #define GRPC_SRC_CORE_LIB_IOMGR_RESOLVED_ADDRESS_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
+#include <grpc/support/port_platform.h>
+
 #include "src/core/lib/iomgr/port.h"
 
 #ifdef GRPC_WINSOCK_SOCKET

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

@@ -37,6 +37,8 @@
 
 #include <string>
 
+#include "absl/log/check.h"
+
 #include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 #include <grpc/support/sync.h>
@@ -57,7 +59,7 @@ int grpc_inet_pton(int af, const char* src, void* dst) {
 }
 
 const char* grpc_inet_ntop(int af, const void* src, char* dst, size_t size) {
-  GPR_ASSERT(size <= (socklen_t)-1);
+  CHECK(size <= (socklen_t)-1);
   return inet_ntop(af, src, dst, static_cast<socklen_t>(size));
 }
 

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

@@ -19,9 +19,8 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_SOCKET_FACTORY_POSIX_H
 #define GRPC_SRC_CORE_LIB_IOMGR_SOCKET_FACTORY_POSIX_H
 
-#include <grpc/support/port_platform.h>
-
 #include <grpc/impl/grpc_types.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/sync.h>
 
 #include "src/core/lib/iomgr/resolve_address.h"

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

@@ -16,12 +16,11 @@
 //
 //
 
-#include <grpc/support/port_platform.h>
-
 #include "src/core/lib/iomgr/socket_mutator.h"
 
 #include <grpc/impl/grpc_types.h>
 #include <grpc/support/log.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/sync.h>
 
 #include "src/core/lib/channel/channel_args.h"

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

@@ -19,11 +19,10 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_SOCKET_MUTATOR_H
 #define GRPC_SRC_CORE_LIB_IOMGR_SOCKET_MUTATOR_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stdbool.h>
 
 #include <grpc/impl/grpc_types.h>
+#include <grpc/support/port_platform.h>
 #include <grpc/support/sync.h>
 
 /// How is an fd to be used?

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

@@ -19,10 +19,10 @@
 #ifndef GRPC_SRC_CORE_LIB_IOMGR_SOCKET_UTILS_H
 #define GRPC_SRC_CORE_LIB_IOMGR_SOCKET_UTILS_H
 
-#include <grpc/support/port_platform.h>
-
 #include <stddef.h>
 
+#include <grpc/support/port_platform.h>
+
 // TODO(juanlishen): The following functions might be simple enough to implement
 // ourselves, so that they don't cause any portability hassle.