diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-05-16 15:02:50 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-05-16 15:02:50 -0700 |
| commit | 5e56f00d3a82da4d28f66791fa58faf4644a9d09 (patch) | |
| tree | ca5bc8e4fb5b323d7b32ad4ab31fd8e715d9e2f2 /src/core/lib/iomgr/combiner.c | |
| parent | 321b7d8fb0dbe40f27685f733a3098bd4fd9c77b (diff) | |
Fixes to new executor
Diffstat (limited to 'src/core/lib/iomgr/combiner.c')
| -rw-r--r-- | src/core/lib/iomgr/combiner.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/lib/iomgr/combiner.c b/src/core/lib/iomgr/combiner.c index aa7a8c1c70..38eace12c7 100644 --- a/src/core/lib/iomgr/combiner.c +++ b/src/core/lib/iomgr/combiner.c @@ -214,7 +214,7 @@ bool grpc_combiner_continue_exec_ctx(grpc_exec_ctx *exec_ctx) { lock, grpc_exec_ctx_ready_to_finish(exec_ctx), lock->time_to_execute_final_list)); - if (grpc_exec_ctx_ready_to_finish(exec_ctx)) { + if (grpc_exec_ctx_ready_to_finish(exec_ctx) && grpc_executor_is_threaded()) { GPR_TIMER_MARK("offload_from_finished_exec_ctx", 0); // this execution context wants to move on, and we have a workqueue (and // so can help the execution context out): schedule remaining work to be |