[grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging GPR_AS…

…SERT
grpc · Apr 28, 2024 · c5a75ba · c5a75ba
1 parent 8e6a612
commit c5a75ba
Show file tree

Hide file tree

Showing 36 changed files with 65 additions and 78 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/Makefile b/Makefile
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
diff --git a/config.m4 b/config.m4
diff --git a/config.w32 b/config.w32
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
diff --git a/grpc.gemspec b/grpc.gemspec
diff --git a/package.xml b/package.xml
diff --git a/src/core/lib/gpr/alloc.cc b/src/core/lib/gpr/alloc.cc
@@ -21,9 +21,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <grpc/support/alloc.h>
-#include "absl/log/check.h"
 #include "absl/log/check.h"
+
+#include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 
 #include "src/core/lib/gprpp/crash.h"

diff --git a/src/core/lib/gpr/posix/sync.cc b/src/core/lib/gpr/posix/sync.cc
@@ -24,9 +24,9 @@
 #include <errno.h>
 #include <time.h>
 
-#include <grpc/support/alloc.h>
-#include "absl/log/check.h"
 #include "absl/log/check.h"
+
+#include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>

diff --git a/src/core/lib/gpr/posix/time.cc b/src/core/lib/gpr/posix/time.cc
@@ -28,9 +28,9 @@
 #ifdef __linux__
 #include <sys/syscall.h>
 #endif
-#include <grpc/support/atm.h>
-#include "absl/log/check.h"
 #include "absl/log/check.h"
+
+#include <grpc/support/atm.h>
 #include <grpc/support/log.h>
 #include <grpc/support/time.h>
 
@@ -40,8 +40,8 @@ static struct timespec timespec_from_gpr(gpr_timespec gts) {
   struct timespec rv;
   if (sizeof(time_t) < sizeof(int64_t)) {
     // fine to assert, as this is only used in gpr_sleep_until
-    CHECK(gts.tv_sec <= INT32_MAX );
-CHECK( gts.tv_sec >= INT32_MIN);
+    CHECK(gts.tv_sec <= INT32_MAX);
+    CHECK(gts.tv_sec >= INT32_MIN);
   }
   rv.tv_sec = static_cast<time_t>(gts.tv_sec);
   rv.tv_nsec = gts.tv_nsec;
@@ -90,13 +90,12 @@ gpr_timespec (*gpr_now_impl)(gpr_clock_type clock_type) = now_impl;
 
 gpr_timespec gpr_now(gpr_clock_type clock_type) {
   // validate clock type
-  CHECK(clock_type == GPR_CLOCK_MONOTONIC ||
-             clock_type == GPR_CLOCK_REALTIME ||
-             clock_type == GPR_CLOCK_PRECISE);
+  CHECK(clock_type == GPR_CLOCK_MONOTONIC || clock_type == GPR_CLOCK_REALTIME ||
+        clock_type == GPR_CLOCK_PRECISE);
   gpr_timespec ts = gpr_now_impl(clock_type);
   // tv_nsecs must be in the range [0, 1e9).
-  CHECK(ts.tv_nsec >= 0 );
-CHECK( ts.tv_nsec < 1e9);
+  CHECK(ts.tv_nsec >= 0);
+  CHECK(ts.tv_nsec < 1e9);
   return ts;
 }
 

diff --git a/src/core/lib/gpr/posix/tmpfile.cc b/src/core/lib/gpr/posix/tmpfile.cc
@@ -25,9 +25,9 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <grpc/support/alloc.h>
-#include "absl/log/check.h"
 #include "absl/log/check.h"
+
+#include <grpc/support/alloc.h>
 #include <grpc/support/log.h>
 #include <grpc/support/string_util.h>
 

diff --git a/src/core/lib/gpr/subprocess_posix.cc b/src/core/lib/gpr/subprocess_posix.cc
@@ -28,11 +28,10 @@
 
 #include <iostream>
 
+#include "absl/log/check.h"
 #include "absl/strings/substitute.h"
 
 #include <grpc/support/alloc.h>
-#include "absl/log/check.h"
-#include "absl/log/check.h"
 #include <grpc/support/log.h>
 
 #include "src/core/lib/gpr/subprocess.h"

diff --git a/src/core/lib/gpr/sync.cc b/src/core/lib/gpr/sync.cc
@@ -22,9 +22,9 @@
 
 #include <assert.h>
 
-#include <grpc/support/atm.h>
-#include "absl/log/check.h"
 #include "absl/log/check.h"
+
+#include <grpc/support/atm.h>
 #include <grpc/support/log.h>
 #include <grpc/support/sync.h>
 

diff --git a/src/core/lib/gpr/time.cc b/src/core/lib/gpr/time.cc
@@ -25,7 +25,7 @@
 #include <string.h>
 
 #include "absl/log/check.h"
-#include "absl/log/check.h"
+
 #include <grpc/support/log.h>
 #include <grpc/support/time.h>
 

diff --git a/src/core/lib/gpr/windows/sync.cc b/src/core/lib/gpr/windows/sync.cc
@@ -24,7 +24,7 @@
     !defined(GPR_CUSTOM_SYNC)
 
 #include "absl/log/check.h"
-#include "absl/log/check.h"
+
 #include <grpc/support/log.h>
 #include <grpc/support/sync.h>
 #include <grpc/support/time.h>

diff --git a/src/core/lib/gpr/windows/time.cc b/src/core/lib/gpr/windows/time.cc
@@ -27,7 +27,7 @@
 #include <sys/timeb.h>
 
 #include "absl/log/check.h"
-#include "absl/log/check.h"
+
 #include <grpc/support/log.h>
 #include <grpc/support/time.h>
 
@@ -99,8 +99,8 @@ void gpr_sleep_until(gpr_timespec until) {
     delta = gpr_time_sub(until, now);
     sleep_millis =
         delta.tv_sec * GPR_MS_PER_SEC + delta.tv_nsec / GPR_NS_PER_MS;
-    CHECK((sleep_millis >= 0) );
-CHECK( (sleep_millis <= INT_MAX));
+    CHECK((sleep_millis >= 0));
+    CHECK((sleep_millis <= INT_MAX));
     Sleep((DWORD)sleep_millis);
   }
 }

diff --git a/src/core/lib/gprpp/chunked_vector.h b/src/core/lib/gprpp/chunked_vector.h
@@ -20,7 +20,7 @@
 #include <utility>
 
 #include "absl/log/check.h"
-#include "absl/log/check.h"
+
 #include <grpc/support/log.h>
 #include <grpc/support/port_platform.h>