Remove illegal GRPC_CLOSURE_RUNs

pull/15200/head
Yash Tibrewal 7 years ago
parent 730b7de158
commit 2629f466dd
  1. 2
      src/core/ext/filters/client_channel/client_channel.cc
  2. 4
      src/core/lib/iomgr/combiner.cc
  3. 2
      src/core/lib/iomgr/resource_quota.cc
  4. 4
      src/core/lib/surface/call.cc

@ -3242,7 +3242,7 @@ static void on_external_watch_complete_locked(void* arg, grpc_error* error) {
"external_connectivity_watcher");
external_connectivity_watcher_list_remove(w->chand, w);
gpr_free(w);
GRPC_CLOSURE_RUN(follow_up, GRPC_ERROR_REF(error));
GRPC_CLOSURE_SCHED(follow_up, GRPC_ERROR_REF(error));
}
static void watch_connectivity_state_locked(void* arg,

@ -345,17 +345,17 @@ static void combiner_finally_exec(grpc_closure* closure, grpc_error* error) {
}
static void combiner_run(grpc_closure* closure, grpc_error* error) {
#ifndef NDEBUG
grpc_combiner* lock = COMBINER_FROM_CLOSURE_SCHEDULER(closure, scheduler);
#ifndef NDEBUG
closure->scheduled = false;
GRPC_COMBINER_TRACE(gpr_log(
GPR_DEBUG,
"Combiner:%p grpc_combiner_run closure:%p created [%s:%d] run [%s:%d]",
lock, closure, closure->file_created, closure->line_created,
closure->file_initiated, closure->line_initiated));
#endif
GPR_ASSERT(grpc_core::ExecCtx::Get()->combiner_data()->active_combiner ==
lock);
#endif
closure->cb(closure->cb_arg, error);
GRPC_ERROR_UNREF(error);
}

@ -386,7 +386,7 @@ static bool rq_reclaim(grpc_resource_quota* resource_quota, bool destructive) {
resource_quota->debug_only_last_reclaimer_resource_user = resource_user;
resource_quota->debug_only_last_initiated_reclaimer = c;
resource_user->reclaimers[destructive] = nullptr;
GRPC_CLOSURE_RUN(c, GRPC_ERROR_NONE);
GRPC_CLOSURE_SCHED(c, GRPC_ERROR_NONE);
return true;
}

@ -1259,8 +1259,8 @@ static void post_batch_completion(batch_control* bctl) {
if (bctl->completion_data.notify_tag.is_closure) {
/* unrefs bctl->error */
bctl->call = nullptr;
GRPC_CLOSURE_RUN((grpc_closure*)bctl->completion_data.notify_tag.tag,
error);
GRPC_CLOSURE_SCHED((grpc_closure*)bctl->completion_data.notify_tag.tag,
error);
GRPC_CALL_INTERNAL_UNREF(call, "completion");
} else {
/* unrefs bctl->error */

Loading…
Cancel
Save