clang-format

pull/12789/head
Craig Tiller 7 years ago
parent 6b9a99c58d
commit bfec10fdcf
  1. 13
      src/core/lib/iomgr/ev_epollex_linux.cc
  2. 3
      src/core/lib/iomgr/ev_posix.cc

@ -927,10 +927,10 @@ static grpc_error *pollset_work(grpc_exec_ctx *exec_ctx, grpc_pollset *pollset,
#define WORKER_PTR (&worker) #define WORKER_PTR (&worker)
#endif #endif
if (GRPC_TRACER_ON(grpc_polling_trace)) { 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", gpr_log(GPR_DEBUG, "PS:%p work hdl=%p worker=%p now=%" PRIdPTR
pollset, worker_hdl, WORKER_PTR,grpc_exec_ctx_now(exec_ctx), " deadline=%" PRIdPTR " kwp=%d pollable=%p",
deadline, pollset->kicked_without_poller, pollset, worker_hdl, WORKER_PTR, grpc_exec_ctx_now(exec_ctx),
pollset->active_pollable); deadline, pollset->kicked_without_poller, pollset->active_pollable);
} }
static const char *err_desc = "pollset_work"; static const char *err_desc = "pollset_work";
grpc_error *error = GRPC_ERROR_NONE; 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_ASSERT(!pollset->shutdown_closure);
gpr_mu_unlock(&pollset->mu); gpr_mu_unlock(&pollset->mu);
if (pollset->event_cursor == pollset->event_count) { if (pollset->event_cursor == pollset->event_count) {
append_error(&error, append_error(&error, pollset_epoll(exec_ctx, pollset,
pollset_epoll(exec_ctx, pollset, WORKER_PTR->pollable_obj, WORKER_PTR->pollable_obj, deadline),
deadline),
err_desc); err_desc);
} }
append_error(&error, pollset_process_events(exec_ctx, pollset, false), append_error(&error, pollset_process_events(exec_ctx, pollset, false),

@ -81,8 +81,7 @@ const grpc_event_engine_vtable *init_non_polling(bool explicit_request) {
static const event_engine_factory g_factories[] = { static const event_engine_factory g_factories[] = {
{"epollex", grpc_init_epollex_linux}, {"epoll1", grpc_init_epoll1_linux}, {"epollex", grpc_init_epollex_linux}, {"epoll1", grpc_init_epoll1_linux},
{"epollsig", grpc_init_epollsig_linux}, {"poll", grpc_init_poll_posix}, {"epollsig", grpc_init_epollsig_linux}, {"poll", grpc_init_poll_posix},
{"poll-cv", grpc_init_poll_cv_posix}, {"poll-cv", grpc_init_poll_cv_posix}, {"none", init_non_polling},
{"none", init_non_polling},
}; };
static void add(const char *beg, const char *end, char ***ss, size_t *ns) { static void add(const char *beg, const char *end, char ***ss, size_t *ns) {

Loading…
Cancel
Save