From bfec10fdcf00a6fdb196b29b3b759a3e113fc66b Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Wed, 11 Oct 2017 17:31:06 -0700 Subject: [PATCH] clang-format --- src/core/lib/iomgr/ev_epollex_linux.cc | 13 ++++++------- src/core/lib/iomgr/ev_posix.cc | 3 +-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/core/lib/iomgr/ev_epollex_linux.cc b/src/core/lib/iomgr/ev_epollex_linux.cc index a44cdb85977..53e214db376 100644 --- a/src/core/lib/iomgr/ev_epollex_linux.cc +++ b/src/core/lib/iomgr/ev_epollex_linux.cc @@ -927,10 +927,10 @@ static grpc_error *pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, #define WORKER_PTR (&worker) #endif if (GRPC_TRACER_ON(grpc_polling_trace)) { - gpr_log(GPR_DEBUG, "PS:%p work hdl=%p worker=%p now=%" PRIdPTR " deadline=%" PRIdPTR " kwp=%d pollable=%p", - pollset, worker_hdl, WORKER_PTR,grpc_exec_ctx_now(exec_ctx), - deadline, pollset->kicked_without_poller, - pollset->active_pollable); + gpr_log(GPR_DEBUG, "PS:%p work hdl=%p worker=%p now=%" PRIdPTR + " deadline=%" PRIdPTR " kwp=%d pollable=%p", + pollset, worker_hdl, WORKER_PTR, grpc_exec_ctx_now(exec_ctx), + deadline, pollset->kicked_without_poller, pollset->active_pollable); } static const char *err_desc = "pollset_work"; grpc_error *error = GRPC_ERROR_NONE; @@ -943,9 +943,8 @@ static grpc_error *pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset, GPR_ASSERT(!pollset->shutdown_closure); gpr_mu_unlock(&pollset->mu); if (pollset->event_cursor == pollset->event_count) { - append_error(&error, - pollset_epoll(exec_ctx, pollset, WORKER_PTR->pollable_obj, - deadline), + append_error(&error, pollset_epoll(exec_ctx, pollset, + WORKER_PTR->pollable_obj, deadline), err_desc); } append_error(&error, pollset_process_events(exec_ctx, pollset, false), diff --git a/src/core/lib/iomgr/ev_posix.cc b/src/core/lib/iomgr/ev_posix.cc index 5656ebb3401..86eae5f95bc 100644 --- a/src/core/lib/iomgr/ev_posix.cc +++ b/src/core/lib/iomgr/ev_posix.cc @@ -81,8 +81,7 @@ const grpc_event_engine_vtable *init_non_polling(bool explicit_request) { static const event_engine_factory g_factories[] = { {"epollex", grpc_init_epollex_linux}, {"epoll1", grpc_init_epoll1_linux}, {"epollsig", grpc_init_epollsig_linux}, {"poll", grpc_init_poll_posix}, - {"poll-cv", grpc_init_poll_cv_posix}, - {"none", init_non_polling}, + {"poll-cv", grpc_init_poll_cv_posix}, {"none", init_non_polling}, }; static void add(const char *beg, const char *end, char ***ss, size_t *ns) {