Removing few more instances of exec_ctx

reviewable/pr13058/r2
Yash Tibrewal 7 years ago
parent b1ee138ce6
commit cf9b084211
  1. 2
      src/core/lib/iomgr/closure.h
  2. 10
      src/core/lib/iomgr/tcp_server_uv.cc
  3. 3
      src/core/lib/iomgr/tcp_uv.cc

@ -162,7 +162,7 @@ bool grpc_closure_list_empty(grpc_closure_list list);
void grpc_closure_run(const char* file, int line, grpc_closure* closure,
grpc_error* error);
#define GRPC_CLOSURE_RUN(closure, error) \
grpc_closure_run(__FILE__, __LINE__, exec_ctx, closure, error)
grpc_closure_run(__FILE__, __LINE__, closure, error)
#else
void grpc_closure_run(grpc_closure* closure, grpc_error* error);
#define GRPC_CLOSURE_RUN(closure, error) grpc_closure_run(closure, error)

@ -176,13 +176,13 @@ void grpc_tcp_server_unref(grpc_tcp_server* s) {
if (gpr_unref(&s->refs)) {
/* Complete shutdown_starting work before destroying. */
grpc_exec_ctx local_ExecCtx _local_exec_ctx;
GRPC_CLOSURE_LIST_SCHED(&local_exec_ctx, &s->shutdown_starting);
GRPC_CLOSURE_LIST_SCHED(&s->shutdown_starting);
if (exec_ctx == NULL) {
grpc_exec_ctx_flush(&local_exec_ctx);
tcp_server_destroy(&local_exec_ctx, s);
grpc_exec_ctx_finish(&local_exec_ctx);
grpc_exec_ctx_flush();
tcp_server_destroy(s);
grpc_exec_ctx_finish();
} else {
grpc_exec_ctx_finish(&local_exec_ctx);
grpc_exec_ctx_finish();
tcp_server_destroy(s);
}
}

@ -301,8 +301,7 @@ static void uv_add_to_pollset_set(grpc_endpoint* ep,
(void)pollset;
}
static void uv_delete_from_pollset_set(grpc_exec_ctx* exec_ctx,
grpc_endpoint* ep,
static void uv_delete_from_pollset_set(grpc_endpoint* ep,
grpc_pollset_set* pollset) {
// No-op. We're ignoring pollsets currently
(void)exec_ctx;

Loading…
Cancel
Save