diff options
| author |  Yash Tibrewal <yashkt@google.com> | 2018-04-30 14:52:31 -0700 |
|---|---|---|
| committer | Yash Tibrewal <yashkt@google.com> | 2018-05-01 17:01:34 -0700 |
| commit | 2629f466dd074f14041fe8e65707f18836ae0546 (patch) | |
| tree | f542a742edca5bf5f4163ef32c5da99dfedb1d96 | |
| parent | 730b7de15874732d8c7c0eb081b29d43c805f81a (diff) | |
Remove illegal GRPC_CLOSURE_RUNs
| -rw-r--r-- | src/core/ext/filters/client_channel/client_channel.cc | 2 | ||||
| -rw-r--r-- | src/core/lib/iomgr/combiner.cc | 4 | ||||
| -rw-r--r-- | src/core/lib/iomgr/resource_quota.cc | 2 | ||||
| -rw-r--r-- | src/core/lib/surface/call.cc | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/core/ext/filters/client_channel/client_channel.cc b/src/core/ext/filters/client_channel/client_channel.cc index 80a647fa94..532ff11ff0 100644 --- a/src/core/ext/filters/client_channel/client_channel.cc +++ b/src/core/ext/filters/client_channel/client_channel.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, diff --git a/src/core/lib/iomgr/combiner.cc b/src/core/lib/iomgr/combiner.cc index 60785b6b43..6789e4d12d 100644 --- a/src/core/lib/iomgr/combiner.cc +++ b/src/core/lib/iomgr/combiner.cc @@ -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); } diff --git a/src/core/lib/iomgr/resource_quota.cc b/src/core/lib/iomgr/resource_quota.cc index 8cf4fe9928..539bc120ce 100644 --- a/src/core/lib/iomgr/resource_quota.cc +++ b/src/core/lib/iomgr/resource_quota.cc @@ -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; } diff --git a/src/core/lib/surface/call.cc b/src/core/lib/surface/call.cc index da488034ca..0a4282188c 100644 --- a/src/core/lib/surface/call.cc +++ b/src/core/lib/surface/call.cc @@ -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 */ |