diff options
| author |  Mark D. Roth <roth@google.com> | 2016-09-12 11:54:25 -0700 |
|---|---|---|
| committer | Mark D. Roth <roth@google.com> | 2016-09-12 11:54:25 -0700 |
| commit | 242dc4be0e58a974f5f5852f498b0d55e0771887 (patch) | |
| tree | 2f5e9b8be2ca79330556ff98dfc97ff155997b30 /src/core/lib/iomgr/exec_ctx.h | |
| parent | 58f52b789185d696d98be3c8ef4571499c8101dd (diff) | |
| parent | ec5c93cabfbf535be2528df55ca8bb4500e6bc9b (diff) | |
Merge remote-tracking branch 'upstream/master' into deadline_filter
Diffstat (limited to 'src/core/lib/iomgr/exec_ctx.h')
| -rw-r--r-- | src/core/lib/iomgr/exec_ctx.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/lib/iomgr/exec_ctx.h b/src/core/lib/iomgr/exec_ctx.h index 917f332f03..1895ee6245 100644 --- a/src/core/lib/iomgr/exec_ctx.h +++ b/src/core/lib/iomgr/exec_ctx.h @@ -40,8 +40,8 @@ /** A workqueue represents a list of work to be executed asynchronously. Forward declared here to avoid a circular dependency with workqueue.h. */ -struct grpc_workqueue; typedef struct grpc_workqueue grpc_workqueue; +typedef struct grpc_combiner grpc_combiner; #ifndef GRPC_EXECUTION_CONTEXT_SANITIZER /** Execution context. @@ -66,13 +66,15 @@ typedef struct grpc_workqueue grpc_workqueue; */ struct grpc_exec_ctx { grpc_closure_list closure_list; + /** currently active combiner: updated only via combiner.c */ + grpc_combiner *active_combiner; bool cached_ready_to_finish; void *check_ready_to_finish_arg; bool (*check_ready_to_finish)(grpc_exec_ctx *exec_ctx, void *arg); }; #define GRPC_EXEC_CTX_INIT_WITH_FINISH_CHECK(finish_check, finish_check_arg) \ - { GRPC_CLOSURE_LIST_INIT, false, finish_check_arg, finish_check } + { GRPC_CLOSURE_LIST_INIT, NULL, false, finish_check_arg, finish_check } #else struct grpc_exec_ctx { bool cached_ready_to_finish; |