Merge pull request #12868 from ctiller/merge-fixup

Import fixes
7 years ago · 6d14242af6
parent 3640b4084a 56f8da0f96
commit 6d14242af6
1 changed files with 8 additions and 3 deletions
--- a/src/core/lib/iomgr/block_annotate.h
+++ b/src/core/lib/iomgr/block_annotate.h
@ -39,9 +39,14 @@ void gpr_thd_end_blocking_region();
  do {                                        \
    gpr_thd_start_blocking_region();          \
  } while (0)
-#define GRPC_SCHEDULING_END_BLOCKING_REGION \
-  do {                                      \
-    gpr_thd_end_blocking_region();          \
+#define GRPC_SCHEDULING_END_BLOCKING_REGION_NO_EXEC_CTX \
+  do {                                                  \
+    gpr_thd_end_blocking_region();                      \
+  } while (0)
+#define GRPC_SCHEDULING_END_BLOCKING_REGION_WITH_EXEC_CTX(ec) \
+  do {                                                        \
+    gpr_thd_end_blocking_region();                            \
+    grpc_exec_ctx_invalidate_now((ec));                       \
  } while (0)
 #else
 #define GRPC_SCHEDULING_START_BLOCKING_REGION \