From a20f020fb8779c73ac48b1d1757866d7c0a94f1c Mon Sep 17 00:00:00 2001 From: Tanvi Jagtap <139093547+tanvi-jagtap@users.noreply.github.com> Date: Mon, 6 May 2024 02:36:54 -0700 Subject: [PATCH] [grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging GPR_ASSERT (#36468) [grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging GPR_ASSERT Replacing GPR_ASSERT with absl CHECK. These changes have been made using string replacement and regex. Will not be replacing all instances of CHECK with CHECK_EQ , CHECK_NE etc because there are too many callsites. Only ones which are doable using very simple regex with least chance of failure will be replaced. Given that we have 5000+ instances of GPR_ASSERT to edit, Doing it manually is too much work for both the author and reviewer. Closes #36468 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36468 from tanvi-jagtap:tjagtap_src_core_lib_gprpp f7ed931db16acd609e851d75f546377661b2705f PiperOrigin-RevId: 630978821 --- BUILD | 4 +++ CMakeLists.txt | 11 +++--- build_autogenerated.yaml | 1 + gRPC-C++.podspec | 1 + gRPC-Core.podspec | 1 + src/core/BUILD | 8 +++++ src/core/lib/gpr/alloc.cc | 4 ++- src/core/lib/gpr/posix/sync.cc | 48 ++++++++++++++------------- src/core/lib/gpr/posix/time.cc | 15 +++++---- src/core/lib/gpr/posix/tmpfile.cc | 4 ++- src/core/lib/gpr/subprocess_posix.cc | 9 ++--- src/core/lib/gpr/sync.cc | 8 +++-- src/core/lib/gpr/time.cc | 18 +++++----- src/core/lib/gpr/windows/sync.cc | 4 ++- src/core/lib/gpr/windows/time.cc | 5 ++- src/core/lib/gprpp/chunked_vector.h | 8 +++-- src/core/lib/gprpp/down_cast.h | 3 +- src/core/lib/gprpp/dual_ref_counted.h | 14 ++++---- src/core/lib/gprpp/host_port.cc | 7 ++-- src/core/lib/gprpp/mpscq.h | 6 ++-- src/core/lib/gprpp/posix/stat.cc | 6 ++-- src/core/lib/gprpp/posix/thd.cc | 16 ++++----- src/core/lib/gprpp/ref_counted.h | 6 ++-- src/core/lib/gprpp/single_set_ptr.h | 4 ++- src/core/lib/gprpp/status_helper.cc | 3 +- src/core/lib/gprpp/sync.h | 7 ++-- src/core/lib/gprpp/thd.h | 11 +++--- src/core/lib/gprpp/time.cc | 9 ++--- src/core/lib/gprpp/time_util.cc | 6 ++-- src/core/lib/gprpp/windows/stat.cc | 6 ++-- src/core/lib/gprpp/windows/thd.cc | 6 ++-- src/core/lib/gprpp/work_serializer.cc | 7 ++-- 32 files changed, 164 insertions(+), 102 deletions(-) diff --git a/BUILD b/BUILD index 1678426118f..e26d4e2ba02 100644 --- a/BUILD +++ b/BUILD @@ -786,6 +786,8 @@ grpc_cc_library( "absl/base:log_severity", "absl/functional:any_invocable", "absl/log", + "absl/log:check", + "absl/log:globals", "absl/memory", "absl/random", "absl/status", @@ -2962,6 +2964,7 @@ grpc_cc_library( external_deps = [ "absl/base:core_headers", "absl/container:inlined_vector", + "absl/log:check", ], language = "c++", visibility = ["@grpc:client_channel"], @@ -4836,6 +4839,7 @@ grpc_cc_library( "//src/core:lib/gpr/subprocess.h", ], external_deps = [ + "absl/log:check", "absl/strings", "absl/types:span", ], diff --git a/CMakeLists.txt b/CMakeLists.txt index bc07d003268..f24293cc3be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1749,6 +1749,7 @@ target_link_libraries(gpr absl::flags_marshalling absl::any_invocable absl::check + absl::log_globals absl::log absl::memory absl::random_random @@ -36919,7 +36920,7 @@ generate_pkgconfig( "gpr" "gRPC platform support library" "${gRPC_CORE_VERSION}" - "absl_any_invocable absl_base absl_check absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_log absl_log_severity absl_memory absl_optional absl_random_random absl_status absl_str_format absl_strings absl_synchronization absl_time absl_variant" + "absl_any_invocable absl_base absl_check absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_log absl_log_globals absl_log_severity absl_memory absl_optional absl_random_random absl_status absl_str_format absl_strings absl_synchronization absl_time absl_variant" "" "-lgpr" "" @@ -36930,7 +36931,7 @@ generate_pkgconfig( "gRPC" "high performance general RPC framework" "${gRPC_CORE_VERSION}" - "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr" + "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr" "libcares openssl re2 zlib" "-lgrpc" "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_message_lib -lupb_mem_lib -lupb_base_lib -lutf8_range_lib" @@ -36941,7 +36942,7 @@ generate_pkgconfig( "gRPC unsecure" "high performance general RPC framework without SSL" "${gRPC_CORE_VERSION}" - "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr" + "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr" "libcares zlib" "-lgrpc_unsecure" "-laddress_sorting -lupb_message_lib -lupb_mem_lib -lupb_base_lib -lutf8_range_lib" @@ -36952,7 +36953,7 @@ generate_pkgconfig( "gRPC++" "C++ wrapper for gRPC" "${gRPC_CPP_VERSION}" - "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr grpc" + "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr grpc" "libcares openssl re2 zlib" "-lgrpc++" "-laddress_sorting -lupb_textformat_lib -lupb_json_lib -lupb_message_lib -lupb_mem_lib -lupb_base_lib -lutf8_range_lib" @@ -36963,7 +36964,7 @@ generate_pkgconfig( "gRPC++ unsecure" "C++ wrapper for gRPC without SSL" "${gRPC_CPP_VERSION}" - "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr grpc_unsecure" + "absl_algorithm_container absl_any_invocable absl_base absl_bind_front absl_check absl_cleanup absl_config absl_cord absl_core_headers absl_flags absl_flags_marshalling absl_flat_hash_map absl_flat_hash_set absl_function_ref absl_hash absl_inlined_vector absl_log absl_log_globals absl_log_severity absl_memory absl_no_destructor absl_optional absl_random_bit_gen_ref absl_random_distributions absl_random_random absl_span absl_status absl_statusor absl_str_format absl_strings absl_synchronization absl_time absl_type_traits absl_utility absl_variant gpr grpc_unsecure" "libcares zlib" "-lgrpc++_unsecure" "-laddress_sorting -lupb_message_lib -lupb_mem_lib -lupb_base_lib -lutf8_range_lib" diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index 23c54fb841f..64ff8ce6d14 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -130,6 +130,7 @@ libs: - absl/flags:marshalling - absl/functional:any_invocable - absl/log:check + - absl/log:globals - absl/log:log - absl/memory:memory - absl/random:random diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec index 9fd6d1f6d06..d075e053e37 100644 --- a/gRPC-C++.podspec +++ b/gRPC-C++.podspec @@ -244,6 +244,7 @@ Pod::Spec.new do |s| ss.dependency 'abseil/functional/function_ref', abseil_version ss.dependency 'abseil/hash/hash', abseil_version ss.dependency 'abseil/log/check', abseil_version + ss.dependency 'abseil/log/globals', abseil_version ss.dependency 'abseil/log/log', abseil_version ss.dependency 'abseil/memory/memory', abseil_version ss.dependency 'abseil/meta/type_traits', abseil_version diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec index f15894c41d5..173742c4f21 100644 --- a/gRPC-Core.podspec +++ b/gRPC-Core.podspec @@ -216,6 +216,7 @@ Pod::Spec.new do |s| ss.dependency 'abseil/functional/function_ref', abseil_version ss.dependency 'abseil/hash/hash', abseil_version ss.dependency 'abseil/log/check', abseil_version + ss.dependency 'abseil/log/globals', abseil_version ss.dependency 'abseil/log/log', abseil_version ss.dependency 'abseil/memory/memory', abseil_version ss.dependency 'abseil/meta/type_traits', abseil_version diff --git a/src/core/BUILD b/src/core/BUILD index 2476fab4002..fb16f2b8eea 100644 --- a/src/core/BUILD +++ b/src/core/BUILD @@ -329,6 +329,9 @@ grpc_cc_library( grpc_cc_library( name = "chunked_vector", hdrs = ["lib/gprpp/chunked_vector.h"], + external_deps = [ + "absl/log:check", + ], deps = [ "arena", "gpr_manual_constructor", @@ -352,6 +355,7 @@ grpc_cc_library( "lib/gprpp/status_helper.h", ], external_deps = [ + "absl/log:check", "absl/status", "absl/strings", "absl/strings:cord", @@ -1648,6 +1652,7 @@ grpc_cc_library( "lib/gprpp/time.h", ], external_deps = [ + "absl/log:check", "absl/strings:str_format", "absl/types:optional", ], @@ -3085,6 +3090,9 @@ grpc_cc_library( hdrs = [ "lib/gprpp/single_set_ptr.h", ], + external_deps = [ + "absl/log:check", + ], language = "c++", deps = ["//:gpr"], ) diff --git a/src/core/lib/gpr/alloc.cc b/src/core/lib/gpr/alloc.cc index 67e07f81f09..a8b92260a92 100644 --- a/src/core/lib/gpr/alloc.cc +++ b/src/core/lib/gpr/alloc.cc @@ -21,6 +21,8 @@ #include #include +#include "absl/log/check.h" + #include #include @@ -59,7 +61,7 @@ void* gpr_realloc(void* p, size_t size) { } void* gpr_malloc_aligned(size_t size, size_t alignment) { - GPR_ASSERT(((alignment - 1) & alignment) == 0); // Must be power of 2. + CHECK_EQ(((alignment - 1) & alignment), 0u); // Must be power of 2. size_t extra = alignment - 1 + sizeof(void*); void* p = gpr_malloc(size + extra); void** ret = reinterpret_cast( diff --git a/src/core/lib/gpr/posix/sync.cc b/src/core/lib/gpr/posix/sync.cc index 4e57b2c6181..912a1a6b48e 100644 --- a/src/core/lib/gpr/posix/sync.cc +++ b/src/core/lib/gpr/posix/sync.cc @@ -24,6 +24,8 @@ #include #include +#include "absl/log/check.h" + #include #include #include @@ -33,36 +35,36 @@ void gpr_mu_init(gpr_mu* mu) { #ifdef GRPC_ASAN_ENABLED - GPR_ASSERT(pthread_mutex_init(&mu->mutex, nullptr) == 0); + CHECK_EQ(pthread_mutex_init(&mu->mutex, nullptr), 0); mu->leak_checker = static_cast(malloc(sizeof(*mu->leak_checker))); - GPR_ASSERT(mu->leak_checker != nullptr); + CHECK_NE(mu->leak_checker, nullptr); #else - GPR_ASSERT(pthread_mutex_init(mu, nullptr) == 0); + CHECK_EQ(pthread_mutex_init(mu, nullptr), 0); #endif } void gpr_mu_destroy(gpr_mu* mu) { #ifdef GRPC_ASAN_ENABLED - GPR_ASSERT(pthread_mutex_destroy(&mu->mutex) == 0); + CHECK_EQ(pthread_mutex_destroy(&mu->mutex), 0); free(mu->leak_checker); #else - GPR_ASSERT(pthread_mutex_destroy(mu) == 0); + CHECK_EQ(pthread_mutex_destroy(mu), 0); #endif } void gpr_mu_lock(gpr_mu* mu) { #ifdef GRPC_ASAN_ENABLED - GPR_ASSERT(pthread_mutex_lock(&mu->mutex) == 0); + CHECK_EQ(pthread_mutex_lock(&mu->mutex), 0); #else - GPR_ASSERT(pthread_mutex_lock(mu) == 0); + CHECK_EQ(pthread_mutex_lock(mu), 0); #endif } void gpr_mu_unlock(gpr_mu* mu) { #ifdef GRPC_ASAN_ENABLED - GPR_ASSERT(pthread_mutex_unlock(&mu->mutex) == 0); + CHECK_EQ(pthread_mutex_unlock(&mu->mutex), 0); #else - GPR_ASSERT(pthread_mutex_unlock(mu) == 0); + CHECK_EQ(pthread_mutex_unlock(mu), 0); #endif } @@ -73,7 +75,7 @@ int gpr_mu_trylock(gpr_mu* mu) { #else err = pthread_mutex_trylock(mu); #endif - GPR_ASSERT(err == 0 || err == EBUSY); + CHECK(err == 0 || err == EBUSY); return err == 0; } @@ -81,26 +83,26 @@ int gpr_mu_trylock(gpr_mu* mu) { void gpr_cv_init(gpr_cv* cv) { pthread_condattr_t attr; - GPR_ASSERT(pthread_condattr_init(&attr) == 0); + CHECK_EQ(pthread_condattr_init(&attr), 0); #if GPR_LINUX - GPR_ASSERT(pthread_condattr_setclock(&attr, CLOCK_MONOTONIC) == 0); + CHECK_EQ(pthread_condattr_setclock(&attr, CLOCK_MONOTONIC), 0); #endif // GPR_LINUX #ifdef GRPC_ASAN_ENABLED - GPR_ASSERT(pthread_cond_init(&cv->cond_var, &attr) == 0); + CHECK_EQ(pthread_cond_init(&cv->cond_var, &attr), 0); cv->leak_checker = static_cast(malloc(sizeof(*cv->leak_checker))); - GPR_ASSERT(cv->leak_checker != nullptr); + CHECK_NE(cv->leak_checker, nullptr); #else - GPR_ASSERT(pthread_cond_init(cv, &attr) == 0); + CHECK_EQ(pthread_cond_init(cv, &attr), 0); #endif } void gpr_cv_destroy(gpr_cv* cv) { #ifdef GRPC_ASAN_ENABLED - GPR_ASSERT(pthread_cond_destroy(&cv->cond_var) == 0); + CHECK_EQ(pthread_cond_destroy(&cv->cond_var), 0); free(cv->leak_checker); #else - GPR_ASSERT(pthread_cond_destroy(cv) == 0); + CHECK_EQ(pthread_cond_destroy(cv), 0); #endif } @@ -129,30 +131,30 @@ int gpr_cv_wait(gpr_cv* cv, gpr_mu* mu, gpr_timespec abs_deadline) { err = pthread_cond_timedwait(cv, mu, &abs_deadline_ts); #endif } - GPR_ASSERT(err == 0 || err == ETIMEDOUT || err == EAGAIN); + CHECK(err == 0 || err == ETIMEDOUT || err == EAGAIN); return err == ETIMEDOUT; } void gpr_cv_signal(gpr_cv* cv) { #ifdef GRPC_ASAN_ENABLED - GPR_ASSERT(pthread_cond_signal(&cv->cond_var) == 0); + CHECK_EQ(pthread_cond_signal(&cv->cond_var), 0); #else - GPR_ASSERT(pthread_cond_signal(cv) == 0); + CHECK_EQ(pthread_cond_signal(cv), 0); #endif } void gpr_cv_broadcast(gpr_cv* cv) { #ifdef GRPC_ASAN_ENABLED - GPR_ASSERT(pthread_cond_broadcast(&cv->cond_var) == 0); + CHECK_EQ(pthread_cond_broadcast(&cv->cond_var), 0); #else - GPR_ASSERT(pthread_cond_broadcast(cv) == 0); + CHECK_EQ(pthread_cond_broadcast(cv), 0); #endif } //---------------------------------------- void gpr_once_init(gpr_once* once, void (*init_function)(void)) { - GPR_ASSERT(pthread_once(once, init_function) == 0); + CHECK_EQ(pthread_once(once, init_function), 0); } #endif // defined(GPR_POSIX_SYNC) && !defined(GPR_ABSEIL_SYNC) && diff --git a/src/core/lib/gpr/posix/time.cc b/src/core/lib/gpr/posix/time.cc index 050cbf87dbc..f292198fede 100644 --- a/src/core/lib/gpr/posix/time.cc +++ b/src/core/lib/gpr/posix/time.cc @@ -28,6 +28,8 @@ #ifdef __linux__ #include #endif +#include "absl/log/check.h" + #include #include #include @@ -38,7 +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 - GPR_ASSERT(gts.tv_sec <= INT32_MAX && gts.tv_sec >= INT32_MIN); + CHECK(gts.tv_sec <= INT32_MAX); + CHECK(gts.tv_sec >= INT32_MIN); } rv.tv_sec = static_cast(gts.tv_sec); rv.tv_nsec = gts.tv_nsec; @@ -67,7 +70,7 @@ void gpr_time_init(void) { gpr_precise_clock_init(); } static gpr_timespec now_impl(gpr_clock_type clock_type) { struct timespec now; - GPR_ASSERT(clock_type != GPR_TIMESPAN); + CHECK(clock_type != GPR_TIMESPAN); if (clock_type == GPR_CLOCK_PRECISE) { gpr_timespec ret; gpr_precise_clock_now(&ret); @@ -87,12 +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 - GPR_ASSERT(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). - GPR_ASSERT(ts.tv_nsec >= 0 && 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 index 4d838af72bc..cbc2b4cf3d8 100644 --- a/src/core/lib/gpr/posix/tmpfile.cc +++ b/src/core/lib/gpr/posix/tmpfile.cc @@ -25,6 +25,8 @@ #include #include +#include "absl/log/check.h" + #include #include #include @@ -42,7 +44,7 @@ FILE* gpr_tmpfile(const char* prefix, char** tmp_filename) { if (tmp_filename != nullptr) *tmp_filename = nullptr; gpr_asprintf(&filename_template, "/tmp/%s_XXXXXX", prefix); - GPR_ASSERT(filename_template != nullptr); + CHECK_NE(filename_template, nullptr); fd = mkstemp(filename_template); if (fd == -1) { diff --git a/src/core/lib/gpr/subprocess_posix.cc b/src/core/lib/gpr/subprocess_posix.cc index 5444bd82201..5dc73a3fac5 100644 --- a/src/core/lib/gpr/subprocess_posix.cc +++ b/src/core/lib/gpr/subprocess_posix.cc @@ -28,6 +28,7 @@ #include +#include "absl/log/check.h" #include "absl/strings/substitute.h" #include @@ -81,8 +82,8 @@ gpr_subprocess* gpr_subprocess_create_with_envp(int argc, const char** argv, int stdout_pipe[2]; int p0 = pipe(stdin_pipe); int p1 = pipe(stdout_pipe); - GPR_ASSERT(p0 != -1); - GPR_ASSERT(p1 != -1); + CHECK_NE(p0, -1); + CHECK_NE(p1, -1); pid = fork(); if (pid == -1) { return nullptr; @@ -145,7 +146,7 @@ bool gpr_subprocess_communicate(gpr_subprocess* p, std::string& input_data, continue; } else { std::cerr << "select: " << strerror(errno) << std::endl; - GPR_ASSERT(0); + CHECK(0); } } @@ -192,7 +193,7 @@ bool gpr_subprocess_communicate(gpr_subprocess* p, std::string& input_data, while (waitpid(p->pid, &status, 0) == -1) { if (errno != EINTR) { std::cerr << "waitpid: " << strerror(errno) << std::endl; - GPR_ASSERT(0); + CHECK(0); } } diff --git a/src/core/lib/gpr/sync.cc b/src/core/lib/gpr/sync.cc index 446fe523751..b70435a992b 100644 --- a/src/core/lib/gpr/sync.cc +++ b/src/core/lib/gpr/sync.cc @@ -22,6 +22,8 @@ #include +#include "absl/log/check.h" + #include #include #include @@ -59,11 +61,11 @@ void gpr_event_init(gpr_event* ev) { void gpr_event_set(gpr_event* ev, void* value) { struct sync_array_s* s = hash(ev); gpr_mu_lock(&s->mu); - GPR_ASSERT(gpr_atm_acq_load(&ev->state) == 0); + CHECK_EQ(gpr_atm_acq_load(&ev->state), 0); gpr_atm_rel_store(&ev->state, (gpr_atm)value); gpr_cv_broadcast(&s->cv); gpr_mu_unlock(&s->mu); - GPR_ASSERT(value != nullptr); + CHECK_NE(value, nullptr); } void* gpr_event_get(gpr_event* ev) { @@ -102,7 +104,7 @@ void gpr_refn(gpr_refcount* r, int n) { int gpr_unref(gpr_refcount* r) { gpr_atm prior = gpr_atm_full_fetch_add(&r->count, -1); - GPR_ASSERT(prior > 0); + CHECK_GT(prior, 0); return prior == 1; } diff --git a/src/core/lib/gpr/time.cc b/src/core/lib/gpr/time.cc index 472cd204e11..a46e95ef352 100644 --- a/src/core/lib/gpr/time.cc +++ b/src/core/lib/gpr/time.cc @@ -24,6 +24,8 @@ #include #include +#include "absl/log/check.h" + #include #include @@ -31,7 +33,7 @@ int gpr_time_cmp(gpr_timespec a, gpr_timespec b) { int cmp = (a.tv_sec > b.tv_sec) - (a.tv_sec < b.tv_sec); - GPR_ASSERT(a.clock_type == b.clock_type); + CHECK(a.clock_type == b.clock_type); if (cmp == 0 && a.tv_sec != INT64_MAX && a.tv_sec != INT64_MIN) { cmp = (a.tv_nsec > b.tv_nsec) - (a.tv_nsec < b.tv_nsec); } @@ -79,7 +81,7 @@ static gpr_timespec to_seconds_from_sub_second_time(int64_t time_in_units, } else if (time_in_units == INT64_MIN) { out = gpr_inf_past(type); } else { - GPR_DEBUG_ASSERT(GPR_NS_PER_SEC % units_per_sec == 0); + DCHECK_EQ(GPR_NS_PER_SEC % units_per_sec, 0); out.tv_sec = time_in_units / units_per_sec; out.tv_nsec = @@ -139,11 +141,11 @@ gpr_timespec gpr_time_from_hours(int64_t h, gpr_clock_type clock_type) { gpr_timespec gpr_time_add(gpr_timespec a, gpr_timespec b) { gpr_timespec sum; int64_t inc = 0; - GPR_ASSERT(b.clock_type == GPR_TIMESPAN); + CHECK(b.clock_type == GPR_TIMESPAN); // tv_nsec in a timespan is always +ve. -ve timespan is represented as (-ve // tv_sec, +ve tv_nsec). For example, timespan = -2.5 seconds is represented // as {-3, 5e8, GPR_TIMESPAN} - GPR_ASSERT(b.tv_nsec >= 0); + CHECK_GE(b.tv_nsec, 0); sum.clock_type = a.clock_type; sum.tv_nsec = a.tv_nsec + b.tv_nsec; if (sum.tv_nsec >= GPR_NS_PER_SEC) { @@ -177,9 +179,9 @@ gpr_timespec gpr_time_sub(gpr_timespec a, gpr_timespec b) { // tv_nsec in a timespan is always +ve. -ve timespan is represented as (-ve // tv_sec, +ve tv_nsec). For example, timespan = -2.5 seconds is represented // as {-3, 5e8, GPR_TIMESPAN} - GPR_ASSERT(b.tv_nsec >= 0); + CHECK_GE(b.tv_nsec, 0); } else { - GPR_ASSERT(a.clock_type == b.clock_type); + CHECK(a.clock_type == b.clock_type); diff.clock_type = GPR_TIMESPAN; } diff.tv_nsec = a.tv_nsec - b.tv_nsec; @@ -210,8 +212,8 @@ gpr_timespec gpr_time_sub(gpr_timespec a, gpr_timespec b) { int gpr_time_similar(gpr_timespec a, gpr_timespec b, gpr_timespec threshold) { int cmp_ab; - GPR_ASSERT(a.clock_type == b.clock_type); - GPR_ASSERT(threshold.clock_type == GPR_TIMESPAN); + CHECK(a.clock_type == b.clock_type); + CHECK(threshold.clock_type == GPR_TIMESPAN); cmp_ab = gpr_time_cmp(a, b); if (cmp_ab == 0) return 1; diff --git a/src/core/lib/gpr/windows/sync.cc b/src/core/lib/gpr/windows/sync.cc index 2fb6748f89b..800188bf29d 100644 --- a/src/core/lib/gpr/windows/sync.cc +++ b/src/core/lib/gpr/windows/sync.cc @@ -23,6 +23,8 @@ #if defined(GPR_WINDOWS) && !defined(GPR_ABSEIL_SYNC) && \ !defined(GPR_CUSTOM_SYNC) +#include "absl/log/check.h" + #include #include #include @@ -38,7 +40,7 @@ void gpr_mu_destroy(gpr_mu* mu) { DeleteCriticalSection(&mu->cs); } void gpr_mu_lock(gpr_mu* mu) { EnterCriticalSection(&mu->cs); - GPR_ASSERT(!mu->locked); + CHECK(!mu->locked); mu->locked = 1; } diff --git a/src/core/lib/gpr/windows/time.cc b/src/core/lib/gpr/windows/time.cc index 52b23c421d8..0aafa4a5959 100644 --- a/src/core/lib/gpr/windows/time.cc +++ b/src/core/lib/gpr/windows/time.cc @@ -26,6 +26,8 @@ #include #include +#include "absl/log/check.h" + #include #include @@ -97,7 +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; - GPR_ASSERT((sleep_millis >= 0) && (sleep_millis <= INT_MAX)); + CHECK_GE(sleep_millis, 0); + CHECK_LE(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 index 9eecf13fd29..b60bdac65ad 100644 --- a/src/core/lib/gprpp/chunked_vector.h +++ b/src/core/lib/gprpp/chunked_vector.h @@ -19,6 +19,8 @@ #include #include +#include "absl/log/check.h" + #include #include @@ -86,9 +88,9 @@ class ChunkedVector { // Remove the last element and return it. T PopBack() { - GPR_ASSERT(append_ != nullptr); + CHECK_NE(append_, nullptr); if (append_->count == 0) { - GPR_ASSERT(first_ != append_); + CHECK(first_ != append_); Chunk* chunk = first_; while (chunk->next != append_) { chunk = chunk->next; @@ -234,7 +236,7 @@ class ChunkedVector { private: ManualConstructor* AppendSlot() { if (append_ == nullptr) { - GPR_ASSERT(first_ == nullptr); + CHECK_EQ(first_, nullptr); first_ = arena_->New(); append_ = first_; } else if (append_->count == kChunkSize) { diff --git a/src/core/lib/gprpp/down_cast.h b/src/core/lib/gprpp/down_cast.h index 56e31f387b7..ca1b2d78029 100644 --- a/src/core/lib/gprpp/down_cast.h +++ b/src/core/lib/gprpp/down_cast.h @@ -18,6 +18,7 @@ #include #include "absl/base/config.h" +#include "absl/log/check.h" #include #include @@ -32,7 +33,7 @@ inline To DownCast(From* f) { // If we have RTTI & we're in debug, assert that the cast is legal. #if ABSL_INTERNAL_HAS_RTTI #ifndef NDEBUG - if (f != nullptr) GPR_ASSERT(dynamic_cast(f) != nullptr); + if (f != nullptr) CHECK_NE(dynamic_cast(f), nullptr); #endif #endif return static_cast(f); diff --git a/src/core/lib/gprpp/dual_ref_counted.h b/src/core/lib/gprpp/dual_ref_counted.h index f9016269e2a..5641b0970d4 100644 --- a/src/core/lib/gprpp/dual_ref_counted.h +++ b/src/core/lib/gprpp/dual_ref_counted.h @@ -20,6 +20,8 @@ #include #include +#include "absl/log/check.h" + #include #include @@ -92,7 +94,7 @@ class DualRefCounted { gpr_log(GPR_INFO, "%s:%p unref %d -> %d, weak_ref %d -> %d", trace_, this, strong_refs, strong_refs - 1, weak_refs, weak_refs + 1); } - GPR_ASSERT(strong_refs > 0); + CHECK_GT(strong_refs, 0u); #endif if (GPR_UNLIKELY(strong_refs == 1)) { Orphaned(); @@ -111,7 +113,7 @@ class DualRefCounted { trace_, this, location.file(), location.line(), strong_refs, strong_refs - 1, weak_refs, weak_refs + 1, reason); } - GPR_ASSERT(strong_refs > 0); + CHECK_GT(strong_refs, 0u); #else // Avoid unused-parameter warnings for debug-only parameters (void)location; @@ -210,7 +212,7 @@ class DualRefCounted { gpr_log(GPR_INFO, "%s:%p weak_unref %d -> %d (refs=%d)", trace, this, weak_refs, weak_refs - 1, strong_refs); } - GPR_ASSERT(weak_refs > 0); + CHECK_GT(weak_refs, 0u); #endif if (GPR_UNLIKELY(prev_ref_pair == MakeRefPair(0, 1))) { delete static_cast(this); @@ -233,7 +235,7 @@ class DualRefCounted { this, location.file(), location.line(), weak_refs, weak_refs - 1, strong_refs, reason); } - GPR_ASSERT(weak_refs > 0); + CHECK_GT(weak_refs, 0u); #else // Avoid unused-parameter warnings for debug-only parameters (void)location; @@ -289,7 +291,7 @@ class DualRefCounted { refs_.fetch_add(MakeRefPair(1, 0), std::memory_order_relaxed); const uint32_t strong_refs = GetStrongRefs(prev_ref_pair); const uint32_t weak_refs = GetWeakRefs(prev_ref_pair); - GPR_ASSERT(strong_refs != 0); + CHECK_NE(strong_refs, 0u); if (trace_ != nullptr) { gpr_log(GPR_INFO, "%s:%p ref %d -> %d; (weak_refs=%d)", trace_, this, strong_refs, strong_refs + 1, weak_refs); @@ -304,7 +306,7 @@ class DualRefCounted { refs_.fetch_add(MakeRefPair(1, 0), std::memory_order_relaxed); const uint32_t strong_refs = GetStrongRefs(prev_ref_pair); const uint32_t weak_refs = GetWeakRefs(prev_ref_pair); - GPR_ASSERT(strong_refs != 0); + CHECK_NE(strong_refs, 0u); if (trace_ != nullptr) { gpr_log(GPR_INFO, "%s:%p %s:%d ref %d -> %d (weak_refs=%d) %s", trace_, this, location.file(), location.line(), strong_refs, diff --git a/src/core/lib/gprpp/host_port.cc b/src/core/lib/gprpp/host_port.cc index 0805a25aeb5..7e5ae646ca7 100644 --- a/src/core/lib/gprpp/host_port.cc +++ b/src/core/lib/gprpp/host_port.cc @@ -20,6 +20,7 @@ #include +#include "absl/log/check.h" #include "absl/strings/str_format.h" #include "absl/strings/string_view.h" @@ -92,8 +93,10 @@ bool SplitHostPort(absl::string_view name, absl::string_view* host, bool SplitHostPort(absl::string_view name, std::string* host, std::string* port) { - GPR_DEBUG_ASSERT(host != nullptr && host->empty()); - GPR_DEBUG_ASSERT(port != nullptr && port->empty()); + DCHECK(host != nullptr); + DCHECK(host->empty()); + DCHECK(port != nullptr); + DCHECK(port->empty()); absl::string_view host_view; absl::string_view port_view; bool has_port; diff --git a/src/core/lib/gprpp/mpscq.h b/src/core/lib/gprpp/mpscq.h index bb19073c98f..c33d34ffa13 100644 --- a/src/core/lib/gprpp/mpscq.h +++ b/src/core/lib/gprpp/mpscq.h @@ -21,6 +21,8 @@ #include +#include "absl/log/check.h" + #include #include @@ -40,8 +42,8 @@ class MultiProducerSingleConsumerQueue { MultiProducerSingleConsumerQueue() : head_{&stub_}, tail_(&stub_) {} ~MultiProducerSingleConsumerQueue() { - GPR_ASSERT(head_.load(std::memory_order_relaxed) == &stub_); - GPR_ASSERT(tail_ == &stub_); + CHECK(head_.load(std::memory_order_relaxed) == &stub_); + CHECK(tail_ == &stub_); } // Push a node diff --git a/src/core/lib/gprpp/posix/stat.cc b/src/core/lib/gprpp/posix/stat.cc index 58f9f2e8ad4..f46741af5c9 100644 --- a/src/core/lib/gprpp/posix/stat.cc +++ b/src/core/lib/gprpp/posix/stat.cc @@ -27,6 +27,8 @@ #include #include +#include "absl/log/check.h" + #include #include "src/core/lib/gprpp/stat.h" @@ -35,8 +37,8 @@ namespace grpc_core { absl::Status GetFileModificationTime(const char* filename, time_t* timestamp) { - GPR_ASSERT(filename != nullptr); - GPR_ASSERT(timestamp != nullptr); + CHECK_NE(filename, nullptr); + CHECK_NE(timestamp, nullptr); struct stat buf; if (stat(filename, &buf) != 0) { std::string error_msg = StrError(errno); diff --git a/src/core/lib/gprpp/posix/thd.cc b/src/core/lib/gprpp/posix/thd.cc index b599ca20f7f..be3f8224ea0 100644 --- a/src/core/lib/gprpp/posix/thd.cc +++ b/src/core/lib/gprpp/posix/thd.cc @@ -32,6 +32,8 @@ #include #include +#include "absl/log/check.h" + #include #include #include @@ -88,7 +90,7 @@ class ThreadInternalsPosix : public internal::ThreadInternalsInterface { // don't use gpr_malloc as we may cause an infinite recursion with // the profiling code thd_arg* info = static_cast(malloc(sizeof(*info))); - GPR_ASSERT(info != nullptr); + CHECK_NE(info, nullptr); info->thread = this; info->body = thd_body; info->arg = arg; @@ -99,18 +101,16 @@ class ThreadInternalsPosix : public internal::ThreadInternalsInterface { Fork::IncThreadCount(); } - GPR_ASSERT(pthread_attr_init(&attr) == 0); + CHECK_EQ(pthread_attr_init(&attr), 0); if (options.joinable()) { - GPR_ASSERT(pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE) == - 0); + CHECK(pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE) == 0); } else { - GPR_ASSERT(pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED) == - 0); + CHECK(pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED) == 0); } if (options.stack_size() != 0) { size_t stack_size = MinValidStackSize(options.stack_size()); - GPR_ASSERT(pthread_attr_setstacksize(&attr, stack_size) == 0); + CHECK_EQ(pthread_attr_setstacksize(&attr, stack_size), 0); } int pthread_create_err = pthread_create( @@ -154,7 +154,7 @@ class ThreadInternalsPosix : public internal::ThreadInternalsInterface { info); *success = (pthread_create_err == 0); - GPR_ASSERT(pthread_attr_destroy(&attr) == 0); + CHECK_EQ(pthread_attr_destroy(&attr), 0); if (!(*success)) { gpr_log(GPR_ERROR, "pthread_create failed: %s", diff --git a/src/core/lib/gprpp/ref_counted.h b/src/core/lib/gprpp/ref_counted.h index 8076690dcec..7d9f8c4d11d 100644 --- a/src/core/lib/gprpp/ref_counted.h +++ b/src/core/lib/gprpp/ref_counted.h @@ -23,6 +23,8 @@ #include #include +#include "absl/log/check.h" + #include #include @@ -164,7 +166,7 @@ class RefCount { gpr_log(GPR_INFO, "%s:%p unref %" PRIdPTR " -> %" PRIdPTR, trace, this, prior, prior - 1); } - GPR_DEBUG_ASSERT(prior > 0); + DCHECK_GT(prior, 0); #endif return prior == 1; } @@ -182,7 +184,7 @@ class RefCount { trace, this, location.file(), location.line(), prior, prior - 1, reason); } - GPR_DEBUG_ASSERT(prior > 0); + DCHECK_GT(prior, 0); #else // Avoid unused-parameter warnings for debug-only parameters (void)location; diff --git a/src/core/lib/gprpp/single_set_ptr.h b/src/core/lib/gprpp/single_set_ptr.h index b4839df8096..369e777bd23 100644 --- a/src/core/lib/gprpp/single_set_ptr.h +++ b/src/core/lib/gprpp/single_set_ptr.h @@ -18,6 +18,8 @@ #include #include +#include "absl/log/check.h" + #include #include @@ -67,7 +69,7 @@ class SingleSetPtr { T* operator->() const { T* p = p_.load(std::memory_order_acquire); - GPR_DEBUG_ASSERT(p != nullptr); + DCHECK_NE(p, nullptr); return p; } diff --git a/src/core/lib/gprpp/status_helper.cc b/src/core/lib/gprpp/status_helper.cc index 44f373dbf26..fe76efb87a3 100644 --- a/src/core/lib/gprpp/status_helper.cc +++ b/src/core/lib/gprpp/status_helper.cc @@ -22,6 +22,7 @@ #include +#include "absl/log/check.h" #include "absl/strings/cord.h" #include "absl/strings/escaping.h" #include "absl/strings/match.h" @@ -153,7 +154,7 @@ std::vector ParseChildren(absl::Cord children) { while (buf.size() - cur >= sizeof(uint32_t)) { size_t msg_size = DecodeUInt32FromBytes(buf.data() + cur); cur += sizeof(uint32_t); - GPR_ASSERT(buf.size() - cur >= msg_size); + CHECK(buf.size() - cur >= msg_size); google_rpc_Status* msg = google_rpc_Status_parse(buf.data() + cur, msg_size, arena.ptr()); cur += msg_size; diff --git a/src/core/lib/gprpp/sync.h b/src/core/lib/gprpp/sync.h index 76198091731..16efe619cd5 100644 --- a/src/core/lib/gprpp/sync.h +++ b/src/core/lib/gprpp/sync.h @@ -20,6 +20,7 @@ #define GRPC_SRC_CORE_LIB_GPRPP_SYNC_H #include "absl/base/thread_annotations.h" +#include "absl/log/check.h" #include "absl/synchronization/mutex.h" #include @@ -112,7 +113,7 @@ class ABSL_SCOPED_LOCKABLE ReleasableMutexLock { ReleasableMutexLock& operator=(const ReleasableMutexLock&) = delete; void Release() ABSL_UNLOCK_FUNCTION() { - GPR_DEBUG_ASSERT(!released_); + DCHECK(!released_); released_ = true; mu_->Unlock(); } @@ -178,13 +179,13 @@ class ABSL_SCOPED_LOCKABLE LockableAndReleasableMutexLock { const LockableAndReleasableMutexLock&) = delete; void Lock() ABSL_EXCLUSIVE_LOCK_FUNCTION() { - GPR_DEBUG_ASSERT(released_); + DCHECK(released_); mu_->Lock(); released_ = false; } void Release() ABSL_UNLOCK_FUNCTION() { - GPR_DEBUG_ASSERT(!released_); + DCHECK(!released_); released_ = true; mu_->Unlock(); } diff --git a/src/core/lib/gprpp/thd.h b/src/core/lib/gprpp/thd.h index 827db3891b9..44ff3b22e3c 100644 --- a/src/core/lib/gprpp/thd.h +++ b/src/core/lib/gprpp/thd.h @@ -27,6 +27,7 @@ #include #include "absl/functional/any_invocable.h" +#include "absl/log/check.h" #include #include @@ -124,7 +125,7 @@ class Thread { Thread& operator=(Thread&& other) noexcept { if (this != &other) { // TODO(vjpai): if we can be sure that all Thread's are actually - // constructed, then we should assert GPR_ASSERT(impl_ == nullptr) here. + // constructed, then we should assert CHECK(impl_ == nullptr) here. // However, as long as threads come in structures that are // allocated via gpr_malloc, this will not be the case, so we cannot // assert it for the time being. @@ -143,11 +144,11 @@ class Thread { /// the Join function kills it, or it was detached (non-joinable) and it has /// run to completion and is now killing itself. The destructor shouldn't have /// to do anything. - ~Thread() { GPR_ASSERT(!options_.joinable() || impl_ == nullptr); } + ~Thread() { CHECK(!options_.joinable() || impl_ == nullptr); } void Start() { if (impl_ != nullptr) { - GPR_ASSERT(state_ == ALIVE); + CHECK(state_ == ALIVE); state_ = STARTED; impl_->Start(); // If the Thread is not joinable, then the impl_ will cause the deletion @@ -156,7 +157,7 @@ class Thread { // no need to change the value of the impl_ or state_ . The next operation // on this object will be the deletion, which will trigger the destructor. } else { - GPR_ASSERT(state_ == FAILED); + CHECK(state_ == FAILED); } } @@ -168,7 +169,7 @@ class Thread { state_ = DONE; impl_ = nullptr; } else { - GPR_ASSERT(state_ == FAILED); + CHECK(state_ == FAILED); } } diff --git a/src/core/lib/gprpp/time.cc b/src/core/lib/gprpp/time.cc index 58e0a56d1e3..02240710a54 100644 --- a/src/core/lib/gprpp/time.cc +++ b/src/core/lib/gprpp/time.cc @@ -20,6 +20,7 @@ #include #include +#include "absl/log/check.h" #include "absl/strings/str_format.h" #include @@ -66,13 +67,13 @@ GPR_ATTRIBUTE_NOINLINE std::pair InitTime() { } // Check time has increased past 1 second. - GPR_ASSERT(process_epoch_seconds > 1); + CHECK_GT(process_epoch_seconds, 1); // Fake the epoch to always return >=1 second from our monotonic clock (to // avoid bugs elsewhere) process_epoch_seconds -= 1; int64_t expected = 0; gpr_cycle_counter process_epoch_cycles = (cycles_start + cycles_end) / 2; - GPR_ASSERT(process_epoch_cycles != 0); + CHECK_NE(process_epoch_cycles, 0); if (!g_process_epoch_seconds.compare_exchange_strong( expected, process_epoch_seconds, std::memory_order_relaxed, std::memory_order_relaxed)) { @@ -119,7 +120,7 @@ gpr_timespec MillisecondsAsTimespec(int64_t millis, gpr_clock_type clock_type) { } int64_t TimespanToMillisRoundUp(gpr_timespec ts) { - GPR_ASSERT(ts.clock_type == GPR_TIMESPAN); + CHECK(ts.clock_type == GPR_TIMESPAN); double x = GPR_MS_PER_SEC * static_cast(ts.tv_sec) + static_cast(ts.tv_nsec) / GPR_NS_PER_MS + static_cast(GPR_NS_PER_SEC - 1) / @@ -134,7 +135,7 @@ int64_t TimespanToMillisRoundUp(gpr_timespec ts) { } int64_t TimespanToMillisRoundDown(gpr_timespec ts) { - GPR_ASSERT(ts.clock_type == GPR_TIMESPAN); + CHECK(ts.clock_type == GPR_TIMESPAN); double x = GPR_MS_PER_SEC * static_cast(ts.tv_sec) + static_cast(ts.tv_nsec) / GPR_NS_PER_MS; if (x <= static_cast(std::numeric_limits::min())) { diff --git a/src/core/lib/gprpp/time_util.cc b/src/core/lib/gprpp/time_util.cc index 6c44608945c..3a1cd376370 100644 --- a/src/core/lib/gprpp/time_util.cc +++ b/src/core/lib/gprpp/time_util.cc @@ -19,6 +19,8 @@ #include #include +#include "absl/log/check.h" + #include #include #include @@ -54,7 +56,7 @@ gpr_timespec ToGprTimeSpec(absl::Time time) { } absl::Duration ToAbslDuration(gpr_timespec ts) { - GPR_ASSERT(ts.clock_type == GPR_TIMESPAN); + CHECK(ts.clock_type == GPR_TIMESPAN); if (gpr_time_cmp(ts, gpr_inf_future(GPR_TIMESPAN)) == 0) { return absl::InfiniteDuration(); } else if (gpr_time_cmp(ts, gpr_inf_past(GPR_TIMESPAN)) == 0) { @@ -65,7 +67,7 @@ absl::Duration ToAbslDuration(gpr_timespec ts) { } absl::Time ToAbslTime(gpr_timespec ts) { - GPR_ASSERT(ts.clock_type != GPR_TIMESPAN); + CHECK(ts.clock_type != GPR_TIMESPAN); gpr_timespec rts = gpr_convert_clock_type(ts, GPR_CLOCK_REALTIME); if (gpr_time_cmp(rts, gpr_inf_future(GPR_CLOCK_REALTIME)) == 0) { return absl::InfiniteFuture(); diff --git a/src/core/lib/gprpp/windows/stat.cc b/src/core/lib/gprpp/windows/stat.cc index 20fc4335566..3d2d42f814b 100644 --- a/src/core/lib/gprpp/windows/stat.cc +++ b/src/core/lib/gprpp/windows/stat.cc @@ -22,6 +22,8 @@ #include #include +#include "absl/log/check.h" + #include #include "src/core/lib/gprpp/crash.h" @@ -31,8 +33,8 @@ namespace grpc_core { absl::Status GetFileModificationTime(const char* filename, time_t* timestamp) { - GPR_ASSERT(filename != nullptr); - GPR_ASSERT(timestamp != nullptr); + CHECK_NE(filename, nullptr); + CHECK_NE(timestamp, nullptr); struct _stat buf; if (_stat(filename, &buf) != 0) { std::string error_msg = StrError(errno); diff --git a/src/core/lib/gprpp/windows/thd.cc b/src/core/lib/gprpp/windows/thd.cc index ffabe3545fe..20a060f2b33 100644 --- a/src/core/lib/gprpp/windows/thd.cc +++ b/src/core/lib/gprpp/windows/thd.cc @@ -23,6 +23,8 @@ #include +#include "absl/log/check.h" + #include #include #include @@ -101,7 +103,7 @@ class ThreadInternalsWindows void Join() override { DWORD ret = WaitForSingleObject(info_->join_event, INFINITE); - GPR_ASSERT(ret == WAIT_OBJECT_0); + CHECK(ret == WAIT_OBJECT_0); destroy_thread(); } @@ -121,7 +123,7 @@ class ThreadInternalsWindows g_thd_info->body(g_thd_info->arg); if (g_thd_info->joinable) { BOOL ret = SetEvent(g_thd_info->join_event); - GPR_ASSERT(ret); + CHECK(ret); } else { gpr_free(g_thd_info); } diff --git a/src/core/lib/gprpp/work_serializer.cc b/src/core/lib/gprpp/work_serializer.cc index 27a2f84f13f..605877fddcd 100644 --- a/src/core/lib/gprpp/work_serializer.cc +++ b/src/core/lib/gprpp/work_serializer.cc @@ -27,6 +27,7 @@ #include #include "absl/container/inlined_vector.h" +#include "absl/log/check.h" #include #include @@ -107,7 +108,7 @@ class WorkSerializer::LegacyWorkSerializer final : public WorkSerializerImpl { // First 16 bits indicate ownership of the WorkSerializer, next 48 bits are // queue size (i.e., refs). static uint64_t MakeRefPair(uint16_t owners, uint64_t size) { - GPR_ASSERT(size >> 48 == 0); + CHECK_EQ(size >> 48, 0u); return (static_cast(owners) << 48) + static_cast(size); } static uint32_t GetOwners(uint64_t ref_pair) { @@ -145,7 +146,7 @@ void WorkSerializer::LegacyWorkSerializer::Run(std::function callback, const uint64_t prev_ref_pair = refs_.fetch_add(MakeRefPair(1, 1), std::memory_order_acq_rel); // The work serializer should not have been orphaned. - GPR_DEBUG_ASSERT(GetSize(prev_ref_pair) > 0); + DCHECK_GT(GetSize(prev_ref_pair), 0u); if (GetOwners(prev_ref_pair) == 0) { // We took ownership of the WorkSerializer. Invoke callback and drain queue. SetCurrentThread(); @@ -424,7 +425,7 @@ void WorkSerializer::DispatchingWorkSerializer::Run( running_start_time_ = std::chrono::steady_clock::now(); items_processed_during_run_ = 0; time_running_items_ = std::chrono::steady_clock::duration(); - GPR_ASSERT(processing_.empty()); + CHECK(processing_.empty()); processing_.emplace_back(std::move(callback), location); event_engine_->Run(this); } else {