diff options
| author |  Yash Tibrewal <yashkt@google.com> | 2018-04-30 13:02:08 -0700 |
|---|---|---|
| committer | Yash Tibrewal <yashkt@google.com> | 2018-05-01 16:59:45 -0700 |
| commit | 730b7de15874732d8c7c0eb081b29d43c805f81a (patch) | |
| tree | e2fd65d32f69409aabc22f3577cd50ed0f05c4c4 | |
| parent | eaddd597d75cbf05835318b8d047654eb8b37e72 (diff) | |
Revert combiner_finally_run and restrict changes to combiner_run
| -rw-r--r-- | src/core/lib/iomgr/combiner.cc | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/src/core/lib/iomgr/combiner.cc b/src/core/lib/iomgr/combiner.cc index c11dd65f5a..60785b6b43 100644 --- a/src/core/lib/iomgr/combiner.cc +++ b/src/core/lib/iomgr/combiner.cc @@ -65,13 +65,12 @@ struct grpc_combiner { static void combiner_run(grpc_closure* closure, grpc_error* error); static void combiner_exec(grpc_closure* closure, grpc_error* error); -static void combiner_finally_run(grpc_closure* closure, grpc_error* error); static void combiner_finally_exec(grpc_closure* closure, grpc_error* error); static const grpc_closure_scheduler_vtable scheduler = { combiner_run, combiner_exec, "combiner:immediately"}; static const grpc_closure_scheduler_vtable finally_scheduler = { - combiner_finally_run, combiner_finally_exec, "combiner:finally"}; + combiner_finally_exec, combiner_finally_exec, "combiner:finally"}; static void offload(void* arg, grpc_error* error); @@ -347,25 +346,8 @@ static void combiner_finally_exec(grpc_closure* closure, grpc_error* error) { static void combiner_run(grpc_closure* closure, grpc_error* error) { #ifndef NDEBUG - closure->scheduled = false; grpc_combiner* lock = COMBINER_FROM_CLOSURE_SCHEDULER(closure, scheduler); - 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)); - GPR_ASSERT(grpc_core::ExecCtx::Get()->combiner_data()->active_combiner == - lock); -#endif - closure->cb(closure->cb_arg, error); - GRPC_ERROR_UNREF(error); -} - -static void combiner_finally_run(grpc_closure* closure, grpc_error* error) { -#ifndef NDEBUG closure->scheduled = false; - grpc_combiner* lock = - COMBINER_FROM_CLOSURE_SCHEDULER(closure, finally_scheduler); GRPC_COMBINER_TRACE(gpr_log( GPR_DEBUG, "Combiner:%p grpc_combiner_run closure:%p created [%s:%d] run [%s:%d]", |