From 2d2d5a3c411a2bade319a08085e55821cf2d5ed9 Mon Sep 17 00:00:00 2001 From: Tanvi Jagtap Date: Thu, 16 May 2024 05:56:57 -0700 Subject: [PATCH] [grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging - gpr_log In this CL we are migrating from gRPCs own gpr logging mechanism to absl logging mechanism. The intention is to deprecate gpr_log in the future. We have the following mapping 1. gpr_log(GPR_INFO,...) -> LOG(INFO) 2. gpr_log(GPR_ERROR,...) -> LOG(ERROR) 3. gpr_log(GPR_DEBUG,...) -> VLOG(2) Reviewers need to check : 1. If the above mapping is correct. 2. The content of the log is as before. gpr_log format strings did not use string_view or std::string . absl LOG accepts these. So there will be some elimination of string_view and std::string related conversions. This is expected. PiperOrigin-RevId: 634349131 --- src/core/lib/iomgr/buffer_list.cc | 6 ++++-- src/core/lib/iomgr/call_combiner.cc | 11 ++++++----- src/core/lib/iomgr/ev_epoll1_linux.cc | 4 ++-- src/core/lib/iomgr/ev_poll_posix.cc | 7 ++++--- src/core/lib/iomgr/ev_posix.cc | 3 ++- .../lib/iomgr/event_engine_shims/endpoint.cc | 5 +++-- src/core/lib/iomgr/fork_windows.cc | 4 +++- src/core/lib/iomgr/internal_errqueue.cc | 6 ++++-- src/core/lib/iomgr/iocp_windows.cc | 3 ++- .../lib/iomgr/socket_utils_common_posix.cc | 5 +++-- src/core/lib/iomgr/socket_windows.cc | 3 ++- src/core/lib/iomgr/tcp_client_posix.cc | 3 ++- src/core/lib/iomgr/tcp_posix.cc | 8 ++++---- .../iomgr/tcp_server_utils_posix_common.cc | 3 ++- .../iomgr/tcp_server_utils_posix_ifaddrs.cc | 3 ++- src/core/lib/iomgr/tcp_server_windows.cc | 7 ++++--- src/core/lib/iomgr/timer_manager.cc | 19 ++++++++++--------- 17 files changed, 59 insertions(+), 41 deletions(-) diff --git a/src/core/lib/iomgr/buffer_list.cc b/src/core/lib/iomgr/buffer_list.cc index 6de9d89c05b..aedb4227073 100644 --- a/src/core/lib/iomgr/buffer_list.cc +++ b/src/core/lib/iomgr/buffer_list.cc @@ -18,6 +18,8 @@ #include "src/core/lib/iomgr/buffer_list.h" +#include "absl/log/log.h" + #include #include #include @@ -42,7 +44,7 @@ void FillGprFromTimestamp(gpr_timespec* gts, const struct timespec* ts) { void DefaultTimestampsCallback(void* /*arg*/, Timestamps* /*ts*/, absl::Status /*shudown_err*/) { - gpr_log(GPR_DEBUG, "Timestamps callback has not been registered"); + VLOG(2) << "Timestamps callback has not been registered"; } // The saved callback function that will be invoked when we get all the @@ -321,7 +323,7 @@ void grpc_tcp_set_write_timestamps_callback( // Can't comment out the name because some compilers and formatters don't // like the sequence */* , which would arise from */*fn*/. (void)fn; - gpr_log(GPR_DEBUG, "Timestamps callback is not enabled for this platform"); + VLOG(2) << "Timestamps callback is not enabled for this platform"; } } // namespace grpc_core diff --git a/src/core/lib/iomgr/call_combiner.cc b/src/core/lib/iomgr/call_combiner.cc index 6c44bdb0650..c6fb49cea1a 100644 --- a/src/core/lib/iomgr/call_combiner.cc +++ b/src/core/lib/iomgr/call_combiner.cc @@ -21,6 +21,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include #include @@ -130,13 +131,13 @@ void CallCombiner::Start(grpc_closure* closure, grpc_error_handle error, } if (prev_size == 0) { if (GRPC_TRACE_FLAG_ENABLED(grpc_call_combiner_trace)) { - gpr_log(GPR_INFO, " EXECUTING IMMEDIATELY"); + LOG(INFO) << " EXECUTING IMMEDIATELY"; } // Queue was empty, so execute this closure immediately. ScheduleClosure(closure, error); } else { if (GRPC_TRACE_FLAG_ENABLED(grpc_call_combiner_trace)) { - gpr_log(GPR_INFO, " QUEUING"); + LOG(INFO) << " QUEUING"; } // Queue was not empty, so add closure to queue. closure->error_data.error = internal::StatusAllocHeapPtr(error); @@ -160,7 +161,7 @@ void CallCombiner::Stop(DEBUG_ARGS const char* reason) { if (prev_size > 1) { while (true) { if (GRPC_TRACE_FLAG_ENABLED(grpc_call_combiner_trace)) { - gpr_log(GPR_INFO, " checking queue"); + LOG(INFO) << " checking queue"; } bool empty; grpc_closure* closure = @@ -169,7 +170,7 @@ void CallCombiner::Stop(DEBUG_ARGS const char* reason) { // This can happen either due to a race condition within the mpscq // code or because of a race with Start(). if (GRPC_TRACE_FLAG_ENABLED(grpc_call_combiner_trace)) { - gpr_log(GPR_INFO, " queue returned no result; checking again"); + LOG(INFO) << " queue returned no result; checking again"; } continue; } @@ -184,7 +185,7 @@ void CallCombiner::Stop(DEBUG_ARGS const char* reason) { break; } } else if (GRPC_TRACE_FLAG_ENABLED(grpc_call_combiner_trace)) { - gpr_log(GPR_INFO, " queue empty"); + LOG(INFO) << " queue empty"; } } diff --git a/src/core/lib/iomgr/ev_epoll1_linux.cc b/src/core/lib/iomgr/ev_epoll1_linux.cc index d40b20a93b7..3dc33746701 100644 --- a/src/core/lib/iomgr/ev_epoll1_linux.cc +++ b/src/core/lib/iomgr/ev_epoll1_linux.cc @@ -122,7 +122,7 @@ static bool epoll_set_init() { return false; } - gpr_log(GPR_INFO, "grpc epoll fd: %d", g_epoll_set.epfd); + LOG(INFO) << "grpc epoll fd: " << g_epoll_set.epfd; gpr_atm_no_barrier_store(&g_epoll_set.num_events, 0); gpr_atm_no_barrier_store(&g_epoll_set.cursor, 0); return true; @@ -1073,7 +1073,7 @@ static grpc_error_handle pollset_kick(grpc_pollset* pollset, log.push_back(absl::StrFormat(" worker_kick_state=%s", kick_state_string(specific_worker->state))); } - gpr_log(GPR_DEBUG, "%s", absl::StrJoin(log, "").c_str()); + VLOG(2) << absl::StrJoin(log, ""); } if (specific_worker == nullptr) { diff --git a/src/core/lib/iomgr/ev_poll_posix.cc b/src/core/lib/iomgr/ev_poll_posix.cc index 0752fd61657..7d290d7d83e 100644 --- a/src/core/lib/iomgr/ev_poll_posix.cc +++ b/src/core/lib/iomgr/ev_poll_posix.cc @@ -34,6 +34,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" @@ -583,7 +584,7 @@ static void fd_notify_on_write(grpc_fd* fd, grpc_closure* closure) { static void fd_notify_on_error(grpc_fd* /*fd*/, grpc_closure* closure) { if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) { - gpr_log(GPR_ERROR, "Polling engine does not support tracking errors."); + LOG(ERROR) << "Polling engine does not support tracking errors."; } grpc_core::ExecCtx::Run(DEBUG_LOCATION, closure, absl::CancelledError()); } @@ -602,7 +603,7 @@ static void fd_set_writable(grpc_fd* fd) { static void fd_set_error(grpc_fd* /*fd*/) { if (GRPC_TRACE_FLAG_ENABLED(grpc_polling_trace)) { - gpr_log(GPR_ERROR, "Polling engine does not support tracking errors."); + LOG(ERROR) << "Polling engine does not support tracking errors."; } } @@ -1397,7 +1398,7 @@ const grpc_event_engine_vtable grpc_ev_poll_posix = { // check_engine_available = [](bool) { if (!grpc_has_wakeup_fd()) { - gpr_log(GPR_ERROR, "Skipping poll because of no wakeup fd."); + LOG(ERROR) << "Skipping poll because of no wakeup fd."; return false; } if (!GRPC_LOG_IF_ERROR("pollset_global_init", pollset_global_init())) { diff --git a/src/core/lib/iomgr/ev_posix.cc b/src/core/lib/iomgr/ev_posix.cc index 3456a87c482..e204b4a697b 100644 --- a/src/core/lib/iomgr/ev_posix.cc +++ b/src/core/lib/iomgr/ev_posix.cc @@ -25,6 +25,7 @@ #include +#include "absl/log/log.h" #include "absl/strings/str_format.h" #include "absl/strings/str_split.h" @@ -109,7 +110,7 @@ static void try_engine(absl::string_view engine) { if (g_vtables[i] != nullptr && is(engine, g_vtables[i]->name) && g_vtables[i]->check_engine_available(engine == g_vtables[i]->name)) { g_event_engine = g_vtables[i]; - gpr_log(GPR_DEBUG, "Using polling engine: %s", g_event_engine->name); + VLOG(2) << "Using polling engine: " << g_event_engine->name; return; } } diff --git a/src/core/lib/iomgr/event_engine_shims/endpoint.cc b/src/core/lib/iomgr/event_engine_shims/endpoint.cc index dc0019efc12..42238e47062 100644 --- a/src/core/lib/iomgr/event_engine_shims/endpoint.cc +++ b/src/core/lib/iomgr/event_engine_shims/endpoint.cc @@ -19,6 +19,7 @@ #include "absl/functional/any_invocable.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/status/status.h" #include "absl/status/statusor.h" #include "absl/strings/string_view.h" @@ -128,7 +129,7 @@ class EventEngineEndpointWrapper { for (i = 0; i < pending_read_buffer_->count; i++) { char* dump = grpc_dump_slice(pending_read_buffer_->slices[i], GPR_DUMP_HEX | GPR_DUMP_ASCII); - gpr_log(GPR_DEBUG, "READ DATA: %s", dump); + VLOG(2) << "READ DATA: " << dump; gpr_free(dump); } } @@ -159,7 +160,7 @@ class EventEngineEndpointWrapper { for (i = 0; i < slices->count; i++) { char* dump = grpc_dump_slice(slices->slices[i], GPR_DUMP_HEX | GPR_DUMP_ASCII); - gpr_log(GPR_DEBUG, "WRITE DATA: %s", dump); + VLOG(2) << "WRITE DATA: " << dump; gpr_free(dump); } } diff --git a/src/core/lib/iomgr/fork_windows.cc b/src/core/lib/iomgr/fork_windows.cc index d8e73ed87c4..0e1583173d3 100644 --- a/src/core/lib/iomgr/fork_windows.cc +++ b/src/core/lib/iomgr/fork_windows.cc @@ -22,6 +22,8 @@ #ifndef GRPC_POSIX_FORK +#include "absl/log/log.h" + #include #include @@ -30,7 +32,7 @@ // AROUND VERY SPECIFIC USE CASES. // -void grpc_prefork() { gpr_log(GPR_ERROR, "Forking not supported on Windows"); } +void grpc_prefork() { LOG(ERROR) << "Forking not supported on Windows"; } void grpc_postfork_parent() {} diff --git a/src/core/lib/iomgr/internal_errqueue.cc b/src/core/lib/iomgr/internal_errqueue.cc index 3167cb035de..5223687a439 100644 --- a/src/core/lib/iomgr/internal_errqueue.cc +++ b/src/core/lib/iomgr/internal_errqueue.cc @@ -14,6 +14,8 @@ #include "src/core/lib/iomgr/internal_errqueue.h" +#include "absl/log/log.h" + #include #include @@ -37,7 +39,7 @@ bool KernelSupportsErrqueue() { // least 4.0.0 struct utsname buffer; if (uname(&buffer) != 0) { - gpr_log(GPR_ERROR, "uname: %s", StrError(errno).c_str()); + LOG(ERROR) << "uname: " << StrError(errno); return false; } char* release = buffer.release; @@ -48,7 +50,7 @@ bool KernelSupportsErrqueue() { if (strtol(release, nullptr, 10) >= 4) { return true; } else { - gpr_log(GPR_DEBUG, "ERRQUEUE support not enabled"); + VLOG(2) << "ERRQUEUE support not enabled"; } #endif // GRPC_LINUX_ERRQUEUE return false; diff --git a/src/core/lib/iomgr/iocp_windows.cc b/src/core/lib/iomgr/iocp_windows.cc index 0353aa7614a..a19c13ab7b6 100644 --- a/src/core/lib/iomgr/iocp_windows.cc +++ b/src/core/lib/iomgr/iocp_windows.cc @@ -27,6 +27,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include #include @@ -157,7 +158,7 @@ void grpc_iocp_add_socket(grpc_winsocket* socket) { (uintptr_t)socket, 0); if (!ret) { char* utf8_message = gpr_format_message(WSAGetLastError()); - gpr_log(GPR_ERROR, "Unable to add socket to iocp: %s", utf8_message); + LOG(ERROR) << "Unable to add socket to iocp: " << utf8_message; gpr_free(utf8_message); __debugbreak(); abort(); diff --git a/src/core/lib/iomgr/socket_utils_common_posix.cc b/src/core/lib/iomgr/socket_utils_common_posix.cc index ce4d7a3566c..7ebafa6897b 100644 --- a/src/core/lib/iomgr/socket_utils_common_posix.cc +++ b/src/core/lib/iomgr/socket_utils_common_posix.cc @@ -44,6 +44,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include #include @@ -411,7 +412,7 @@ grpc_error_handle grpc_set_socket_tcp_user_timeout( } } else { if (GRPC_TRACE_FLAG_ENABLED(grpc_tcp_trace)) { - gpr_log(GPR_INFO, "TCP_USER_TIMEOUT not supported for this platform"); + LOG(INFO) << "TCP_USER_TIMEOUT not supported for this platform"; } } return absl::OkStatus(); @@ -442,7 +443,7 @@ static void probe_ipv6_once(void) { int fd = socket(AF_INET6, SOCK_STREAM, 0); g_ipv6_loopback_available = 0; if (fd < 0) { - gpr_log(GPR_INFO, "Disabling AF_INET6 sockets because socket() failed."); + LOG(INFO) << "Disabling AF_INET6 sockets because socket() failed."; } else { grpc_sockaddr_in6 addr; memset(&addr, 0, sizeof(addr)); diff --git a/src/core/lib/iomgr/socket_windows.cc b/src/core/lib/iomgr/socket_windows.cc index fc2cdc97407..44e524c6829 100644 --- a/src/core/lib/iomgr/socket_windows.cc +++ b/src/core/lib/iomgr/socket_windows.cc @@ -28,6 +28,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/str_format.h" #include @@ -217,7 +218,7 @@ static void probe_ipv6_once(void) { SOCKET s = socket(AF_INET6, SOCK_STREAM, 0); g_ipv6_loopback_available = 0; if (s == INVALID_SOCKET) { - gpr_log(GPR_INFO, "Disabling AF_INET6 sockets because socket() failed."); + LOG(INFO) << "Disabling AF_INET6 sockets because socket() failed."; } else { grpc_sockaddr_in6 addr; memset(&addr, 0, sizeof(addr)); diff --git a/src/core/lib/iomgr/tcp_client_posix.cc b/src/core/lib/iomgr/tcp_client_posix.cc index 2e5e8fd6b8e..8fb50f6754e 100644 --- a/src/core/lib/iomgr/tcp_client_posix.cc +++ b/src/core/lib/iomgr/tcp_client_posix.cc @@ -30,6 +30,7 @@ #include "absl/container/flat_hash_map.h" #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/str_cat.h" #include @@ -240,7 +241,7 @@ static void on_writable(void* acp, grpc_error_handle error) { // your program or another program on the same computer // opened too many network connections. The "easy" fix: // don't do that! - gpr_log(GPR_ERROR, "kernel out of buffers"); + LOG(ERROR) << "kernel out of buffers"; gpr_mu_unlock(&ac->mu); grpc_fd_notify_on_write(fd, &ac->write_closure); return; diff --git a/src/core/lib/iomgr/tcp_posix.cc b/src/core/lib/iomgr/tcp_posix.cc index 07906b6889c..1f9f9817e04 100644 --- a/src/core/lib/iomgr/tcp_posix.cc +++ b/src/core/lib/iomgr/tcp_posix.cc @@ -875,7 +875,7 @@ static void tcp_trace_read(grpc_tcp* tcp, grpc_error_handle error) for (i = 0; i < tcp->incoming_buffer->count; i++) { char* dump = grpc_dump_slice(tcp->incoming_buffer->slices[i], GPR_DUMP_HEX | GPR_DUMP_ASCII); - gpr_log(GPR_DEBUG, "READ DATA: %s", dump); + VLOG(2) << "READ DATA: " << dump; gpr_free(dump); } } @@ -1853,7 +1853,7 @@ static void tcp_handle_write(void* arg /* grpc_tcp */, tcp->write_cb = nullptr; tcp->current_zerocopy_send = nullptr; if (GRPC_TRACE_FLAG_ENABLED(grpc_tcp_trace)) { - gpr_log(GPR_INFO, "write: %s", grpc_core::StatusToString(error).c_str()); + LOG(INFO) << "write: " << grpc_core::StatusToString(error); } // No need to take a ref on error since tcp_flush provides a ref. grpc_core::Closure::Run(DEBUG_LOCATION, cb, error); @@ -1877,7 +1877,7 @@ static void tcp_write(grpc_endpoint* ep, grpc_slice_buffer* buf, if (gpr_should_log(GPR_LOG_SEVERITY_DEBUG)) { char* data = grpc_dump_slice(buf->slices[i], GPR_DUMP_HEX | GPR_DUMP_ASCII); - gpr_log(GPR_DEBUG, "WRITE DATA: %s", data); + VLOG(2) << "WRITE DATA: " << data; gpr_free(data); } } @@ -1921,7 +1921,7 @@ static void tcp_write(grpc_endpoint* ep, grpc_slice_buffer* buf, notify_on_write(tcp); } else { if (GRPC_TRACE_FLAG_ENABLED(grpc_tcp_trace)) { - gpr_log(GPR_INFO, "write: %s", grpc_core::StatusToString(error).c_str()); + LOG(INFO) << "write: " << grpc_core::StatusToString(error); } grpc_core::Closure::Run(DEBUG_LOCATION, cb, error); } diff --git a/src/core/lib/iomgr/tcp_server_utils_posix_common.cc b/src/core/lib/iomgr/tcp_server_utils_posix_common.cc index 181ab5b8e25..ee8f7350eb6 100644 --- a/src/core/lib/iomgr/tcp_server_utils_posix_common.cc +++ b/src/core/lib/iomgr/tcp_server_utils_posix_common.cc @@ -32,6 +32,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/str_cat.h" #include @@ -221,7 +222,7 @@ grpc_error_handle grpc_tcp_server_prepare_socket( err = grpc_set_socket_zerocopy(fd); if (!err.ok()) { // it's not fatal, so just log it. - gpr_log(GPR_DEBUG, "Node does not support SO_ZEROCOPY, continuing."); + VLOG(2) << "Node does not support SO_ZEROCOPY, continuing."; } #endif err = grpc_set_socket_nonblocking(fd, 1); diff --git a/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc b/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc index d04dddf8e46..495e800ea08 100644 --- a/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc +++ b/src/core/lib/iomgr/tcp_server_utils_posix_ifaddrs.cc @@ -31,6 +31,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/str_cat.h" #include @@ -115,7 +116,7 @@ grpc_error_handle grpc_tcp_server_add_all_local_addrs(grpc_tcp_server* s, } else if (requested_port <= 0) { return GRPC_ERROR_CREATE("Bad get_unused_port()"); } - gpr_log(GPR_DEBUG, "Picked unused port %d", requested_port); + VLOG(2) << "Picked unused port " << requested_port; } static bool v4_available = grpc_is_ipv4_availabile(); diff --git a/src/core/lib/iomgr/tcp_server_windows.cc b/src/core/lib/iomgr/tcp_server_windows.cc index 70b4a6a5920..b2a0ab25be8 100644 --- a/src/core/lib/iomgr/tcp_server_windows.cc +++ b/src/core/lib/iomgr/tcp_server_windows.cc @@ -28,6 +28,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include "absl/strings/str_cat.h" #include @@ -405,7 +406,7 @@ static void on_accept(void* arg, grpc_error_handle error) { if (!wsa_success) { if (!sp->shutting_down) { char* utf8_message = gpr_format_message(WSAGetLastError()); - gpr_log(GPR_ERROR, "on_accept error: %s", utf8_message); + LOG(ERROR) << "on_accept error: " << utf8_message; gpr_free(utf8_message); } closesocket(sock); @@ -415,7 +416,7 @@ static void on_accept(void* arg, grpc_error_handle error) { (char*)&sp->socket->socket, sizeof(sp->socket->socket)); if (err) { char* utf8_message = gpr_format_message(WSAGetLastError()); - gpr_log(GPR_ERROR, "setsockopt error: %s", utf8_message); + LOG(ERROR) << "setsockopt error: " << utf8_message; gpr_free(utf8_message); } int peer_name_len = (int)peer_name.len; @@ -432,7 +433,7 @@ static void on_accept(void* arg, grpc_error_handle error) { } } else { char* utf8_message = gpr_format_message(WSAGetLastError()); - gpr_log(GPR_ERROR, "getpeername error: %s", utf8_message); + LOG(ERROR) << "getpeername error: " << utf8_message; gpr_free(utf8_message); } std::string fd_name = absl::StrCat("tcp_server:", peer_name_string); diff --git a/src/core/lib/iomgr/timer_manager.cc b/src/core/lib/iomgr/timer_manager.cc index 6e4197a8f83..9cab02d2877 100644 --- a/src/core/lib/iomgr/timer_manager.cc +++ b/src/core/lib/iomgr/timer_manager.cc @@ -21,6 +21,7 @@ #include #include "absl/log/check.h" +#include "absl/log/log.h" #include #include @@ -89,7 +90,7 @@ static void start_timer_thread_and_unlock(void) { ++g_thread_count; gpr_mu_unlock(&g_mu); if (GRPC_TRACE_FLAG_ENABLED(grpc_timer_check_trace)) { - gpr_log(GPR_INFO, "Spawn timer thread"); + LOG(INFO) << "Spawn timer thread"; } completed_thread* ct = static_cast(gpr_malloc(sizeof(*ct))); @@ -125,7 +126,7 @@ static void run_some_timers() { // waiter so that the next deadline is not missed if (!g_has_timed_waiter) { if (GRPC_TRACE_FLAG_ENABLED(grpc_timer_check_trace)) { - gpr_log(GPR_INFO, "kick untimed waiter"); + LOG(INFO) << "kick untimed waiter"; } gpr_cv_signal(&g_cv_wait); } @@ -133,7 +134,7 @@ static void run_some_timers() { } // without our lock, flush the exec_ctx if (GRPC_TRACE_FLAG_ENABLED(grpc_timer_check_trace)) { - gpr_log(GPR_INFO, "flush exec_ctx"); + LOG(INFO) << "flush exec_ctx"; } grpc_core::ExecCtx::Get()->Flush(); gpr_mu_lock(&g_mu); @@ -199,7 +200,7 @@ static bool wait_until(grpc_core::Timestamp next) { if (GRPC_TRACE_FLAG_ENABLED(grpc_timer_check_trace) && next == grpc_core::Timestamp::InfFuture()) { - gpr_log(GPR_INFO, "sleep until kicked"); + LOG(INFO) << "sleep until kicked"; } gpr_cv_wait(&g_cv_wait, &g_mu, next.as_timespec(GPR_CLOCK_MONOTONIC)); @@ -251,7 +252,7 @@ static void timer_main_loop() { // Consequently, we can just sleep forever here and be happy at some // saved wakeup cycles. if (GRPC_TRACE_FLAG_ENABLED(grpc_timer_check_trace)) { - gpr_log(GPR_INFO, "timers not checked: expect another thread to"); + LOG(INFO) << "timers not checked: expect another thread to"; } next = grpc_core::Timestamp::InfFuture(); ABSL_FALLTHROUGH_INTENDED; @@ -277,7 +278,7 @@ static void timer_thread_cleanup(completed_thread* ct) { g_completed_threads = ct; gpr_mu_unlock(&g_mu); if (GRPC_TRACE_FLAG_ENABLED(grpc_timer_check_trace)) { - gpr_log(GPR_INFO, "End timer thread"); + LOG(INFO) << "End timer thread"; } } @@ -318,18 +319,18 @@ void grpc_timer_manager_init(void) { static void stop_threads(void) { gpr_mu_lock(&g_mu); if (GRPC_TRACE_FLAG_ENABLED(grpc_timer_check_trace)) { - gpr_log(GPR_INFO, "stop timer threads: threaded=%d", g_threaded); + LOG(INFO) << "stop timer threads: threaded=" << g_threaded; } if (g_threaded) { g_threaded = false; gpr_cv_broadcast(&g_cv_wait); if (GRPC_TRACE_FLAG_ENABLED(grpc_timer_check_trace)) { - gpr_log(GPR_INFO, "num timer threads: %d", g_thread_count); + LOG(INFO) << "num timer threads: " << g_thread_count; } while (g_thread_count > 0) { gpr_cv_wait(&g_cv_shutdown, &g_mu, gpr_inf_future(GPR_CLOCK_MONOTONIC)); if (GRPC_TRACE_FLAG_ENABLED(grpc_timer_check_trace)) { - gpr_log(GPR_INFO, "num timer threads: %d", g_thread_count); + LOG(INFO) << "num timer threads: " << g_thread_count; } gc_completed_threads(); }