Address some PR comments

17 files changed, 127 insertions, 212 deletions

diff --git a/test/core/iomgr/combiner_test.cc b/test/core/iomgr/combiner_test.cc
index 9fc1890c97..df8d55f1f6 100644
--- a/test/core/iomgr/combiner_test.cc
+++ b/test/core/iomgr/combiner_test.cc
@@ -30,7 +30,6 @@ static void test_no_op(void) {
   gpr_log(GPR_DEBUG, "test_no_op");
   ExecCtx _local_exec_ctx;
   GRPC_COMBINER_UNREF(grpc_combiner_create(), "test_no_op");
-  grpc_exec_ctx_finish();
 }
 
 static void set_event_to_true(void* value, grpc_error* error) {
@@ -47,11 +46,10 @@ static void test_execute_one(void) {
   GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(set_event_to_true, &done,
                                          grpc_combiner_scheduler(lock)),
                      GRPC_ERROR_NONE);
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
   GPR_ASSERT(gpr_event_wait(&done, grpc_timeout_seconds_to_deadline(5)) !=
              NULL);
   GRPC_COMBINER_UNREF(lock, "test_execute_one");
-  grpc_exec_ctx_finish();
 }
 
 typedef struct {
@@ -84,7 +82,7 @@ static void execute_many_loop(void* a) {
       GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(
                              check_one, c, grpc_combiner_scheduler(args->lock)),
                          GRPC_ERROR_NONE);
-      grpc_exec_ctx_flush();
+      ExecCtx::Get()->Flush();
     }
     // sleep for a little bit, to test a combiner draining and another thread
     // picking it up
@@ -93,7 +91,6 @@ static void execute_many_loop(void* a) {
   GRPC_CLOSURE_SCHED(GRPC_CLOSURE_CREATE(set_event_to_true, &args->done,
                                          grpc_combiner_scheduler(args->lock)),
                      GRPC_ERROR_NONE);
-  grpc_exec_ctx_finish();
 }
 
 static void test_execute_many(void) {
@@ -117,7 +114,6 @@ static void test_execute_many(void) {
   }
   ExecCtx _local_exec_ctx;
   GRPC_COMBINER_UNREF(lock, "test_execute_many");
-  grpc_exec_ctx_finish();
 }
 
 static gpr_event got_in_finally;
@@ -142,11 +138,10 @@ static void test_execute_finally(void) {
   GRPC_CLOSURE_SCHED(
       GRPC_CLOSURE_CREATE(add_finally, lock, grpc_combiner_scheduler(lock)),
       GRPC_ERROR_NONE);
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
   GPR_ASSERT(gpr_event_wait(&got_in_finally,
                             grpc_timeout_seconds_to_deadline(5)) != NULL);
   GRPC_COMBINER_UNREF(lock, "test_execute_finally");
-  grpc_exec_ctx_finish();
 }
 
 int main(int argc, char** argv) {
diff --git a/test/core/iomgr/endpoint_pair_test.cc b/test/core/iomgr/endpoint_pair_test.cc
index bddeadd329..72833a8dbe 100644
--- a/test/core/iomgr/endpoint_pair_test.cc
+++ b/test/core/iomgr/endpoint_pair_test.cc
@@ -45,7 +45,6 @@ static grpc_endpoint_test_fixture create_fixture_endpoint_pair(
   f.server_ep = p.server;
   grpc_endpoint_add_to_pollset(f.client_ep, g_pollset);
   grpc_endpoint_add_to_pollset(f.server_ep, g_pollset);
-  grpc_exec_ctx_finish();
 
   return f;
 }
@@ -69,7 +68,7 @@ int main(int argc, char** argv) {
   GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset,
                     grpc_schedule_on_exec_ctx);
   grpc_pollset_shutdown(g_pollset, &destroyed);
-  grpc_exec_ctx_finish();
+
   grpc_shutdown();
   gpr_free(g_pollset);
 
diff --git a/test/core/iomgr/endpoint_tests.cc b/test/core/iomgr/endpoint_tests.cc
index 10e80fc71b..5c156ef524 100644
--- a/test/core/iomgr/endpoint_tests.cc
+++ b/test/core/iomgr/endpoint_tests.cc
@@ -213,7 +213,7 @@ static void read_and_write_test(grpc_endpoint_test_config config,
      even when bytes_written is unsigned. */
   state.bytes_written -= state.current_write_size;
   read_and_write_test_write_handler(&state, GRPC_ERROR_NONE);
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
 
   grpc_endpoint_read(state.read_ep, &state.incoming, &state.done_read);
 
@@ -225,24 +225,23 @@ static void read_and_write_test(grpc_endpoint_test_config config,
     grpc_endpoint_shutdown(
         state.write_ep, GRPC_ERROR_CREATE_FROM_STATIC_STRING("Test Shutdown"));
   }
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
 
   gpr_mu_lock(g_mu);
   while (!state.read_done || !state.write_done) {
     grpc_pollset_worker* worker = NULL;
-    GPR_ASSERT(grpc_exec_ctx_now() < deadline);
+    GPR_ASSERT(ExecCtx::Get()->Now() < deadline);
     GPR_ASSERT(GRPC_LOG_IF_ERROR(
         "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline)));
   }
   gpr_mu_unlock(g_mu);
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
 
   end_test(config);
   grpc_slice_buffer_destroy_internal(&state.outgoing);
   grpc_slice_buffer_destroy_internal(&state.incoming);
   grpc_endpoint_destroy(state.read_ep);
   grpc_endpoint_destroy(state.write_ep);
-  grpc_exec_ctx_finish();
 }
 
 static void inc_on_failure(void* arg, grpc_error* error) {
@@ -253,16 +252,16 @@ static void inc_on_failure(void* arg, grpc_error* error) {
 }
 
 static void wait_for_fail_count(int* fail_count, int want_fail_count) {
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
   gpr_mu_lock(g_mu);
   grpc_millis deadline =
       grpc_timespec_to_millis_round_up(grpc_timeout_seconds_to_deadline(10));
-  while (grpc_exec_ctx_now() < deadline && *fail_count < want_fail_count) {
+  while (ExecCtx::Get()->Now() < deadline && *fail_count < want_fail_count) {
     grpc_pollset_worker* worker = NULL;
     GPR_ASSERT(GRPC_LOG_IF_ERROR(
         "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline)));
     gpr_mu_unlock(g_mu);
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
     gpr_mu_lock(g_mu);
   }
   GPR_ASSERT(*fail_count == want_fail_count);
@@ -303,7 +302,6 @@ static void multiple_shutdown_test(grpc_endpoint_test_config config) {
 
   grpc_endpoint_destroy(f.client_ep);
   grpc_endpoint_destroy(f.server_ep);
-  grpc_exec_ctx_finish();
 }
 
 void grpc_endpoint_tests(grpc_endpoint_test_config config,
diff --git a/test/core/iomgr/ev_epollsig_linux_test.cc b/test/core/iomgr/ev_epollsig_linux_test.cc
index 5dd28eac9c..5c71bc6152 100644
--- a/test/core/iomgr/ev_epollsig_linux_test.cc
+++ b/test/core/iomgr/ev_epollsig_linux_test.cc
@@ -77,11 +77,11 @@ static void test_fd_cleanup(test_fd* tfds, int num_fds) {
   for (i = 0; i < num_fds; i++) {
     grpc_fd_shutdown(tfds[i].fd,
                      GRPC_ERROR_CREATE_FROM_STATIC_STRING("test_fd_cleanup"));
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
 
     grpc_fd_orphan(tfds[i].fd, NULL, &release_fd, false /* already_closed */,
                    "test_fd_cleanup");
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
 
     GPR_ASSERT(release_fd == tfds[i].inner_fd);
     close(tfds[i].inner_fd);
@@ -110,7 +110,7 @@ static void test_pollset_cleanup(test_pollset* pollsets, int num_pollsets) {
                       grpc_schedule_on_exec_ctx);
     grpc_pollset_shutdown(pollsets[i].pollset, &destroyed);
 
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
     gpr_free(pollsets[i].pollset);
   }
 }
@@ -168,32 +168,32 @@ static void test_add_fd_to_pollset() {
   /* == Step 1 == */
   for (i = 0; i <= 2; i++) {
     grpc_pollset_add_fd(pollsets[0].pollset, tfds[i].fd);
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
   }
 
   for (i = 3; i <= 4; i++) {
     grpc_pollset_add_fd(pollsets[1].pollset, tfds[i].fd);
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
   }
 
   for (i = 5; i <= 7; i++) {
     grpc_pollset_add_fd(pollsets[2].pollset, tfds[i].fd);
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
   }
 
   /* == Step 2 == */
   for (i = 0; i <= 1; i++) {
     grpc_pollset_add_fd(pollsets[3].pollset, tfds[i].fd);
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
   }
 
   /* == Step 3 == */
   grpc_pollset_add_fd(pollsets[1].pollset, tfds[0].fd);
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
 
   /* == Step 4 == */
   grpc_pollset_add_fd(pollsets[2].pollset, tfds[3].fd);
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
 
   /* All polling islands are merged at this point */
 
@@ -212,7 +212,6 @@ static void test_add_fd_to_pollset() {
 
   test_fd_cleanup(tfds, NUM_FDS);
   test_pollset_cleanup(pollsets, NUM_POLLSETS);
-  grpc_exec_ctx_finish();
 }
 
 #undef NUM_FDS
@@ -239,7 +238,6 @@ static void test_threading_loop(void* arg) {
         "pollset_work",
         grpc_pollset_work(shared->pollset, &worker, GRPC_MILLIS_INF_FUTURE)));
     gpr_mu_unlock(shared->mu);
-    grpc_exec_ctx_finish();
   }
 }
 
@@ -279,7 +277,6 @@ static void test_threading(void) {
         shared.wakeup_desc,
         GRPC_CLOSURE_INIT(&shared.on_wakeup, test_threading_wakeup, &shared,
                           grpc_schedule_on_exec_ctx));
-    grpc_exec_ctx_finish();
   }
   GPR_ASSERT(GRPC_LOG_IF_ERROR("wakeup_first",
                                grpc_wakeup_fd_wakeup(shared.wakeup_fd)));
@@ -296,7 +293,6 @@ static void test_threading(void) {
     grpc_pollset_shutdown(shared.pollset,
                           GRPC_CLOSURE_CREATE(destroy_pollset, shared.pollset,
                                               grpc_schedule_on_exec_ctx));
-    grpc_exec_ctx_finish();
   }
   gpr_free(shared.pollset);
 }
@@ -318,7 +314,6 @@ int main(int argc, char** argv) {
             poll_strategy);
   }
 
-  grpc_exec_ctx_finish();
   grpc_shutdown();
   return 0;
 }
diff --git a/test/core/iomgr/fd_conservation_posix_test.cc b/test/core/iomgr/fd_conservation_posix_test.cc
index a5f6d33998..7f3420269e 100644
--- a/test/core/iomgr/fd_conservation_posix_test.cc
+++ b/test/core/iomgr/fd_conservation_posix_test.cc
@@ -45,12 +45,11 @@ int main(int argc, char** argv) {
     p = grpc_iomgr_create_endpoint_pair("test", NULL);
     grpc_endpoint_destroy(p.client);
     grpc_endpoint_destroy(p.server);
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
   }
 
   grpc_resource_quota_unref(resource_quota);
 
-  grpc_exec_ctx_finish();
   grpc_shutdown();
   return 0;
 }
diff --git a/test/core/iomgr/fd_posix_test.cc b/test/core/iomgr/fd_posix_test.cc
index 9bf16923cb..d22cb5f4f6 100644
--- a/test/core/iomgr/fd_posix_test.cc
+++ b/test/core/iomgr/fd_posix_test.cc
@@ -252,7 +252,7 @@ static void server_wait_and_shutdown(server* sv) {
         "pollset_work",
         grpc_pollset_work(g_pollset, &worker, GRPC_MILLIS_INF_FUTURE)));
     gpr_mu_unlock(g_mu);
-    grpc_exec_ctx_finish();
+
     gpr_mu_lock(g_mu);
   }
   gpr_mu_unlock(g_mu);
@@ -367,7 +367,7 @@ static void client_wait_and_shutdown(client* cl) {
         "pollset_work",
         grpc_pollset_work(g_pollset, &worker, GRPC_MILLIS_INF_FUTURE)));
     gpr_mu_unlock(g_mu);
-    grpc_exec_ctx_finish();
+
     gpr_mu_lock(g_mu);
   }
   gpr_mu_unlock(g_mu);
@@ -386,7 +386,7 @@ static void test_grpc_fd(void) {
   port = server_start(&sv);
   client_init(&cl);
   client_start(&cl, port);
-  grpc_exec_ctx_finish();
+
   client_wait_and_shutdown(&cl);
   server_wait_and_shutdown(&sv);
   GPR_ASSERT(sv.read_bytes_total == cl.write_bytes_total);
@@ -469,7 +469,7 @@ static void test_grpc_fd_change(void) {
         "pollset_work",
         grpc_pollset_work(g_pollset, &worker, GRPC_MILLIS_INF_FUTURE)));
     gpr_mu_unlock(g_mu);
-    grpc_exec_ctx_finish();
+
     gpr_mu_lock(g_mu);
   }
   GPR_ASSERT(a.cb_that_ran == first_read_callback);
@@ -493,7 +493,7 @@ static void test_grpc_fd_change(void) {
         "pollset_work",
         grpc_pollset_work(g_pollset, &worker, GRPC_MILLIS_INF_FUTURE)));
     gpr_mu_unlock(g_mu);
-    grpc_exec_ctx_finish();
+
     gpr_mu_lock(g_mu);
   }
   /* Except now we verify that second_read_callback ran instead */
@@ -501,7 +501,7 @@ static void test_grpc_fd_change(void) {
   gpr_mu_unlock(g_mu);
 
   grpc_fd_orphan(em_fd, NULL, NULL, false /* already_closed */, "d");
-  grpc_exec_ctx_finish();
+
   destroy_change_data(&a);
   destroy_change_data(&b);
   close(sv[1]);
@@ -523,9 +523,9 @@ int main(int argc, char** argv) {
   GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset,
                     grpc_schedule_on_exec_ctx);
   grpc_pollset_shutdown(g_pollset, &destroyed);
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
   gpr_free(g_pollset);
-  grpc_exec_ctx_finish();
+
   grpc_shutdown();
   return 0;
 }
diff --git a/test/core/iomgr/pollset_set_test.cc b/test/core/iomgr/pollset_set_test.cc
index ba794ca192..e9b46f59e3 100644
--- a/test/core/iomgr/pollset_set_test.cc
+++ b/test/core/iomgr/pollset_set_test.cc
@@ -84,7 +84,7 @@ static void cleanup_test_pollsets(test_pollset* pollsets,
                       grpc_schedule_on_exec_ctx);
     grpc_pollset_shutdown(pollsets[i].ps, &destroyed);
 
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
     gpr_free(pollsets[i].ps);
     pollsets[i].ps = NULL;
   }
@@ -129,7 +129,7 @@ static void cleanup_test_fds(test_fd* tfds, const int num_fds) {
   for (int i = 0; i < num_fds; i++) {
     grpc_fd_shutdown(tfds[i].fd,
                      GRPC_ERROR_CREATE_FROM_STATIC_STRING("fd cleanup"));
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
 
     /* grpc_fd_orphan frees the memory allocated for grpc_fd. Normally it also
      * calls close() on the underlying fd. In our case, we are using
@@ -138,7 +138,7 @@ static void cleanup_test_fds(test_fd* tfds, const int num_fds) {
      * underlying fd, call it with a non-NULL 'release_fd' parameter */
     grpc_fd_orphan(tfds[i].fd, NULL, &release_fd, false /* already_closed */,
                    "test_fd_cleanup");
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
 
     grpc_wakeup_fd_destroy(&tfds[i].wakeup_fd);
   }
@@ -236,7 +236,7 @@ static void pollset_set_test_basic() {
   grpc_pollset_add_fd(pollsets[1].ps, tfds[8].fd);
   grpc_pollset_add_fd(pollsets[2].ps, tfds[9].fd);
 
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
 
   /* Test that if any FD in the above structure is readable, it is observable by
    * doing grpc_pollset_work on any pollset
@@ -259,10 +259,10 @@ static void pollset_set_test_basic() {
                grpc_pollset_work(pollsets[i].ps, &worker, deadline));
     gpr_mu_unlock(pollsets[i].mu);
 
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
 
     verify_readable_and_reset(tfds, num_fds);
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
   }
 
   /* Test tear down */
@@ -270,19 +270,18 @@ static void pollset_set_test_basic() {
   grpc_pollset_set_del_fd(pollset_sets[0].pss, tfds[5].fd);
   grpc_pollset_set_del_fd(pollset_sets[1].pss, tfds[1].fd);
   grpc_pollset_set_del_fd(pollset_sets[1].pss, tfds[6].fd);
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
 
   grpc_pollset_set_del_pollset(pollset_sets[1].pss, pollsets[0].ps);
   grpc_pollset_set_del_pollset(pollset_sets[0].pss, pollsets[1].ps);
   grpc_pollset_set_del_pollset(pollset_sets[0].pss, pollsets[2].ps);
 
   grpc_pollset_set_del_pollset_set(pollset_sets[0].pss, pollset_sets[1].pss);
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
 
   cleanup_test_fds(tfds, num_fds);
   cleanup_test_pollsets(pollsets, num_ps);
   cleanup_test_pollset_sets(pollset_sets, num_pss);
-  grpc_exec_ctx_finish();
 }
 
 /* Same FD added multiple times to the pollset_set tree */
@@ -338,10 +337,10 @@ void pollset_set_test_dup_fds() {
   GPR_ASSERT(GRPC_ERROR_NONE ==
              grpc_pollset_work(pollset.ps, &worker, deadline));
   gpr_mu_unlock(pollset.mu);
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
 
   verify_readable_and_reset(tfds, num_fds);
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
 
   /* Tear down */
   grpc_pollset_set_del_fd(pollset_sets[0].pss, tfds[0].fd);
@@ -350,12 +349,11 @@ void pollset_set_test_dup_fds() {
 
   grpc_pollset_set_del_pollset(pollset_sets[1].pss, pollset.ps);
   grpc_pollset_set_del_pollset_set(pollset_sets[0].pss, pollset_sets[1].pss);
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
 
   cleanup_test_fds(tfds, num_fds);
   cleanup_test_pollsets(&pollset, num_ps);
   cleanup_test_pollset_sets(pollset_sets, num_pss);
-  grpc_exec_ctx_finish();
 }
 
 /* Pollset_set with an empty pollset */
@@ -406,21 +404,20 @@ void pollset_set_test_empty_pollset() {
   GPR_ASSERT(GRPC_ERROR_NONE ==
              grpc_pollset_work(pollsets[0].ps, &worker, deadline));
   gpr_mu_unlock(pollsets[0].mu);
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
 
   verify_readable_and_reset(tfds, num_fds);
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
 
   /* Tear down */
   grpc_pollset_set_del_fd(pollset_set.pss, tfds[0].fd);
   grpc_pollset_set_del_pollset(pollset_set.pss, pollsets[0].ps);
   grpc_pollset_set_del_pollset(pollset_set.pss, pollsets[1].ps);
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
 
   cleanup_test_fds(tfds, num_fds);
   cleanup_test_pollsets(pollsets, num_ps);
   cleanup_test_pollset_sets(&pollset_set, num_pss);
-  grpc_exec_ctx_finish();
 }
 
 int main(int argc, char** argv) {
@@ -442,7 +439,6 @@ int main(int argc, char** argv) {
             poll_strategy);
   }
 
-  grpc_exec_ctx_finish();
   grpc_shutdown();
   return 0;
 }
diff --git a/test/core/iomgr/resolve_address_posix_test.cc b/test/core/iomgr/resolve_address_posix_test.cc
index d06777d86f..9870d7aa73 100644
--- a/test/core/iomgr/resolve_address_posix_test.cc
+++ b/test/core/iomgr/resolve_address_posix_test.cc
@@ -67,7 +67,7 @@ void args_finish(args_struct* args) {
                     grpc_schedule_on_exec_ctx);
   grpc_pollset_shutdown(args->pollset, &do_nothing_cb);
   // exec_ctx needs to be flushed before calling grpc_pollset_destroy()
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
   grpc_pollset_destroy(args->pollset);
   gpr_free(args->pollset);
 }
@@ -86,7 +86,7 @@ static void actually_poll(void* argsp) {
     if (done) {
       break;
     }
-    grpc_millis time_left = deadline - grpc_exec_ctx_now();
+    grpc_millis time_left = deadline - ExecCtx::Get()->Now();
     gpr_log(GPR_DEBUG, "done=%d, time_left=%" PRIdPTR, done, time_left);
     GPR_ASSERT(time_left >= 0);
     grpc_pollset_worker* worker = NULL;
@@ -94,10 +94,9 @@ static void actually_poll(void* argsp) {
     GRPC_LOG_IF_ERROR("pollset_work", grpc_pollset_work(args->pollset, &worker,
                                                         n_sec_deadline(1)));
     gpr_mu_unlock(args->mu);
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
   }
   gpr_event_set(&args->ev, (void*)1);
-  grpc_exec_ctx_finish();
 }
 
 static void poll_pollset_until_request_done(args_struct* args) {
@@ -130,7 +129,6 @@ static void test_unix_socket(void) {
       GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx),
       &args.addrs);
   args_finish(&args);
-  grpc_exec_ctx_finish();
 }
 
 static void test_unix_socket_path_name_too_long(void) {
@@ -153,7 +151,6 @@ static void test_unix_socket_path_name_too_long(void) {
       &args.addrs);
   gpr_free(path_name);
   args_finish(&args);
-  grpc_exec_ctx_finish();
 }
 
 int main(int argc, char** argv) {
@@ -163,7 +160,7 @@ int main(int argc, char** argv) {
   test_unix_socket();
   test_unix_socket_path_name_too_long();
   grpc_executor_shutdown();
-  grpc_exec_ctx_finish();
+
   grpc_shutdown();
   return 0;
 }
diff --git a/test/core/iomgr/resolve_address_test.cc b/test/core/iomgr/resolve_address_test.cc
index 1eb753dc85..dbc825884d 100644
--- a/test/core/iomgr/resolve_address_test.cc
+++ b/test/core/iomgr/resolve_address_test.cc
@@ -63,7 +63,7 @@ void args_finish(args_struct* args) {
   grpc_pollset_shutdown(args->pollset, &do_nothing_cb);
   gpr_mu_unlock(args->mu);
   // exec_ctx needs to be flushed before calling grpc_pollset_destroy()
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
   grpc_pollset_destroy(args->pollset);
   gpr_free(args->pollset);
 }
@@ -81,7 +81,7 @@ static void poll_pollset_until_request_done(args_struct* args) {
     if (done) {
       break;
     }
-    grpc_millis time_left = deadline - grpc_exec_ctx_now();
+    grpc_millis time_left = deadline - ExecCtx::Get()->Now();
     gpr_log(GPR_DEBUG, "done=%d, time_left=%" PRIdPTR, done, time_left);
     GPR_ASSERT(time_left >= 0);
     grpc_pollset_worker* worker = NULL;
@@ -89,10 +89,9 @@ static void poll_pollset_until_request_done(args_struct* args) {
     GRPC_LOG_IF_ERROR("pollset_work", grpc_pollset_work(args->pollset, &worker,
                                                         n_sec_deadline(1)));
     gpr_mu_unlock(args->mu);
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
   }
   gpr_event_set(&args->ev, (void*)1);
-  grpc_exec_ctx_finish();
 }
 
 static void must_succeed(void* argsp, grpc_error* err) {
@@ -123,10 +122,9 @@ static void test_localhost(void) {
       "localhost:1", NULL, args.pollset_set,
       GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx),
       &args.addrs);
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
   poll_pollset_until_request_done(&args);
   args_finish(&args);
-  grpc_exec_ctx_finish();
 }
 
 static void test_default_port(void) {
@@ -137,10 +135,9 @@ static void test_default_port(void) {
       "localhost", "1", args.pollset_set,
       GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx),
       &args.addrs);
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
   poll_pollset_until_request_done(&args);
   args_finish(&args);
-  grpc_exec_ctx_finish();
 }
 
 static void test_non_numeric_default_port(void) {
@@ -151,10 +148,9 @@ static void test_non_numeric_default_port(void) {
       "localhost", "https", args.pollset_set,
       GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx),
       &args.addrs);
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
   poll_pollset_until_request_done(&args);
   args_finish(&args);
-  grpc_exec_ctx_finish();
 }
 
 static void test_missing_default_port(void) {
@@ -165,10 +161,9 @@ static void test_missing_default_port(void) {
       "localhost", NULL, args.pollset_set,
       GRPC_CLOSURE_CREATE(must_fail, &args, grpc_schedule_on_exec_ctx),
       &args.addrs);
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
   poll_pollset_until_request_done(&args);
   args_finish(&args);
-  grpc_exec_ctx_finish();
 }
 
 static void test_ipv6_with_port(void) {
@@ -179,10 +174,9 @@ static void test_ipv6_with_port(void) {
       "[2001:db8::1]:1", NULL, args.pollset_set,
       GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx),
       &args.addrs);
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
   poll_pollset_until_request_done(&args);
   args_finish(&args);
-  grpc_exec_ctx_finish();
 }
 
 static void test_ipv6_without_port(void) {
@@ -200,10 +194,9 @@ static void test_ipv6_without_port(void) {
         kCases[i], "80", args.pollset_set,
         GRPC_CLOSURE_CREATE(must_succeed, &args, grpc_schedule_on_exec_ctx),
         &args.addrs);
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
     poll_pollset_until_request_done(&args);
     args_finish(&args);
-    grpc_exec_ctx_finish();
   }
 }
 
@@ -221,10 +214,9 @@ static void test_invalid_ip_addresses(void) {
         kCases[i], NULL, args.pollset_set,
         GRPC_CLOSURE_CREATE(must_fail, &args, grpc_schedule_on_exec_ctx),
         &args.addrs);
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
     poll_pollset_until_request_done(&args);
     args_finish(&args);
-    grpc_exec_ctx_finish();
   }
 }
 
@@ -241,10 +233,9 @@ static void test_unparseable_hostports(void) {
         kCases[i], "1", args.pollset_set,
         GRPC_CLOSURE_CREATE(must_fail, &args, grpc_schedule_on_exec_ctx),
         &args.addrs);
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
     poll_pollset_until_request_done(&args);
     args_finish(&args);
-    grpc_exec_ctx_finish();
   }
 }
 
@@ -261,7 +252,7 @@ int main(int argc, char** argv) {
   test_invalid_ip_addresses();
   test_unparseable_hostports();
   grpc_executor_shutdown();
-  grpc_exec_ctx_finish();
+
   grpc_shutdown();
   return 0;
 }
diff --git a/test/core/iomgr/resource_quota_test.cc b/test/core/iomgr/resource_quota_test.cc
index bee9373ff6..40beadc5d6 100644
--- a/test/core/iomgr/resource_quota_test.cc
+++ b/test/core/iomgr/resource_quota_test.cc
@@ -86,7 +86,6 @@ grpc_closure* make_unused_reclaimer(grpc_closure* then) {
 static void destroy_user(grpc_resource_user* usr) {
   ExecCtx _local_exec_ctx;
   grpc_resource_user_unref(usr);
-  grpc_exec_ctx_finish();
 }
 
 static void test_no_op(void) {
@@ -120,12 +119,10 @@ static void test_instant_alloc_then_free(void) {
   {
     ExecCtx _local_exec_ctx;
     grpc_resource_user_alloc(usr, 1024, NULL);
-    grpc_exec_ctx_finish();
   }
   {
     ExecCtx _local_exec_ctx;
     grpc_resource_user_free(usr, 1024);
-    grpc_exec_ctx_finish();
   }
   grpc_resource_quota_unref(q);
   destroy_user(usr);
@@ -141,7 +138,6 @@ static void test_instant_alloc_free_pair(void) {
     ExecCtx _local_exec_ctx;
     grpc_resource_user_alloc(usr, 1024, NULL);
     grpc_resource_user_free(usr, 1024);
-    grpc_exec_ctx_finish();
   }
   grpc_resource_quota_unref(q);
   destroy_user(usr);
@@ -158,14 +154,13 @@ static void test_simple_async_alloc(void) {
     gpr_event_init(&ev);
     ExecCtx _local_exec_ctx;
     grpc_resource_user_alloc(usr, 1024, set_event(&ev));
-    grpc_exec_ctx_finish();
+
     GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) !=
                NULL);
   }
   {
     ExecCtx _local_exec_ctx;
     grpc_resource_user_free(usr, 1024);
-    grpc_exec_ctx_finish();
   }
   grpc_resource_quota_unref(q);
   destroy_user(usr);
@@ -182,7 +177,7 @@ static void test_async_alloc_blocked_by_size(void) {
   {
     ExecCtx _local_exec_ctx;
     grpc_resource_user_alloc(usr, 1024, set_event(&ev));
-    grpc_exec_ctx_finish();
+
     GPR_ASSERT(gpr_event_wait(
                    &ev, grpc_timeout_milliseconds_to_deadline(100)) == NULL);
   }
@@ -192,7 +187,6 @@ static void test_async_alloc_blocked_by_size(void) {
   {
     ExecCtx _local_exec_ctx;
     grpc_resource_user_free(usr, 1024);
-    grpc_exec_ctx_finish();
   }
   grpc_resource_quota_unref(q);
   destroy_user(usr);
@@ -209,7 +203,7 @@ static void test_scavenge(void) {
     gpr_event_init(&ev);
     ExecCtx _local_exec_ctx;
     grpc_resource_user_alloc(usr1, 1024, set_event(&ev));
-    grpc_exec_ctx_finish();
+
     GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) !=
                NULL);
     ;
@@ -217,14 +211,13 @@ static void test_scavenge(void) {
   {
     ExecCtx _local_exec_ctx;
     grpc_resource_user_free(usr1, 1024);
-    grpc_exec_ctx_finish();
   }
   {
     gpr_event ev;
     gpr_event_init(&ev);
     ExecCtx _local_exec_ctx;
     grpc_resource_user_alloc(usr2, 1024, set_event(&ev));
-    grpc_exec_ctx_finish();
+
     GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) !=
                NULL);
     ;
@@ -232,7 +225,6 @@ static void test_scavenge(void) {
   {
     ExecCtx _local_exec_ctx;
     grpc_resource_user_free(usr2, 1024);
-    grpc_exec_ctx_finish();
   }
   grpc_resource_quota_unref(q);
   destroy_user(usr1);
@@ -250,7 +242,7 @@ static void test_scavenge_blocked(void) {
     gpr_event_init(&ev);
     ExecCtx _local_exec_ctx;
     grpc_resource_user_alloc(usr1, 1024, set_event(&ev));
-    grpc_exec_ctx_finish();
+
     GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) !=
                NULL);
     ;
@@ -259,14 +251,14 @@ static void test_scavenge_blocked(void) {
     gpr_event_init(&ev);
     ExecCtx _local_exec_ctx;
     grpc_resource_user_alloc(usr2, 1024, set_event(&ev));
-    grpc_exec_ctx_finish();
+
     GPR_ASSERT(gpr_event_wait(
                    &ev, grpc_timeout_milliseconds_to_deadline(100)) == NULL);
   }
   {
     ExecCtx _local_exec_ctx;
     grpc_resource_user_free(usr1, 1024);
-    grpc_exec_ctx_finish();
+
     GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) !=
                NULL);
     ;
@@ -274,7 +266,6 @@ static void test_scavenge_blocked(void) {
   {
     ExecCtx _local_exec_ctx;
     grpc_resource_user_free(usr2, 1024);
-    grpc_exec_ctx_finish();
   }
   grpc_resource_quota_unref(q);
   destroy_user(usr1);
@@ -292,7 +283,7 @@ static void test_blocked_until_scheduled_reclaim(void) {
     gpr_event_init(&ev);
     ExecCtx _local_exec_ctx;
     grpc_resource_user_alloc(usr, 1024, set_event(&ev));
-    grpc_exec_ctx_finish();
+
     GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) !=
                NULL);
     ;
@@ -303,14 +294,13 @@ static void test_blocked_until_scheduled_reclaim(void) {
     ExecCtx _local_exec_ctx;
     grpc_resource_user_post_reclaimer(
         usr, false, make_reclaimer(usr, 1024, set_event(&reclaim_done)));
-    grpc_exec_ctx_finish();
   }
   {
     gpr_event ev;
     gpr_event_init(&ev);
     ExecCtx _local_exec_ctx;
     grpc_resource_user_alloc(usr, 1024, set_event(&ev));
-    grpc_exec_ctx_finish();
+
     GPR_ASSERT(gpr_event_wait(&reclaim_done,
                               grpc_timeout_seconds_to_deadline(5)) != NULL);
     GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) !=
@@ -320,7 +310,6 @@ static void test_blocked_until_scheduled_reclaim(void) {
   {
     ExecCtx _local_exec_ctx;
     grpc_resource_user_free(usr, 1024);
-    grpc_exec_ctx_finish();
   }
   grpc_resource_quota_unref(q);
   destroy_user(usr);
@@ -338,7 +327,7 @@ static void test_blocked_until_scheduled_reclaim_and_scavenge(void) {
     gpr_event_init(&ev);
     ExecCtx _local_exec_ctx;
     grpc_resource_user_alloc(usr1, 1024, set_event(&ev));
-    grpc_exec_ctx_finish();
+
     GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) !=
                NULL);
     ;
@@ -349,14 +338,13 @@ static void test_blocked_until_scheduled_reclaim_and_scavenge(void) {
     ExecCtx _local_exec_ctx;
     grpc_resource_user_post_reclaimer(
         usr1, false, make_reclaimer(usr1, 1024, set_event(&reclaim_done)));
-    grpc_exec_ctx_finish();
   }
   {
     gpr_event ev;
     gpr_event_init(&ev);
     ExecCtx _local_exec_ctx;
     grpc_resource_user_alloc(usr2, 1024, set_event(&ev));
-    grpc_exec_ctx_finish();
+
     GPR_ASSERT(gpr_event_wait(&reclaim_done,
                               grpc_timeout_seconds_to_deadline(5)) != NULL);
     GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) !=
@@ -366,7 +354,6 @@ static void test_blocked_until_scheduled_reclaim_and_scavenge(void) {
   {
     ExecCtx _local_exec_ctx;
     grpc_resource_user_free(usr2, 1024);
-    grpc_exec_ctx_finish();
   }
   grpc_resource_quota_unref(q);
   destroy_user(usr1);
@@ -384,7 +371,7 @@ static void test_blocked_until_scheduled_destructive_reclaim(void) {
     gpr_event_init(&ev);
     ExecCtx _local_exec_ctx;
     grpc_resource_user_alloc(usr, 1024, set_event(&ev));
-    grpc_exec_ctx_finish();
+
     GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) !=
                NULL);
     ;
@@ -395,14 +382,13 @@ static void test_blocked_until_scheduled_destructive_reclaim(void) {
     ExecCtx _local_exec_ctx;
     grpc_resource_user_post_reclaimer(
         usr, true, make_reclaimer(usr, 1024, set_event(&reclaim_done)));
-    grpc_exec_ctx_finish();
   }
   {
     gpr_event ev;
     gpr_event_init(&ev);
     ExecCtx _local_exec_ctx;
     grpc_resource_user_alloc(usr, 1024, set_event(&ev));
-    grpc_exec_ctx_finish();
+
     GPR_ASSERT(gpr_event_wait(&reclaim_done,
                               grpc_timeout_seconds_to_deadline(5)) != NULL);
     GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) !=
@@ -412,7 +398,6 @@ static void test_blocked_until_scheduled_destructive_reclaim(void) {
   {
     ExecCtx _local_exec_ctx;
     grpc_resource_user_free(usr, 1024);
-    grpc_exec_ctx_finish();
   }
   grpc_resource_quota_unref(q);
   destroy_user(usr);
@@ -434,7 +419,7 @@ static void test_unused_reclaim_is_cancelled(void) {
         usr, false, make_unused_reclaimer(set_event(&benign_done)));
     grpc_resource_user_post_reclaimer(
         usr, true, make_unused_reclaimer(set_event(&destructive_done)));
-    grpc_exec_ctx_finish();
+
     GPR_ASSERT(gpr_event_wait(&benign_done,
                               grpc_timeout_milliseconds_to_deadline(100)) ==
                NULL);
@@ -465,7 +450,7 @@ static void test_benign_reclaim_is_preferred(void) {
     gpr_event_init(&ev);
     ExecCtx _local_exec_ctx;
     grpc_resource_user_alloc(usr, 1024, set_event(&ev));
-    grpc_exec_ctx_finish();
+
     GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) !=
                NULL);
     ;
@@ -476,7 +461,7 @@ static void test_benign_reclaim_is_preferred(void) {
         usr, false, make_reclaimer(usr, 1024, set_event(&benign_done)));
     grpc_resource_user_post_reclaimer(
         usr, true, make_unused_reclaimer(set_event(&destructive_done)));
-    grpc_exec_ctx_finish();
+
     GPR_ASSERT(gpr_event_wait(&benign_done,
                               grpc_timeout_milliseconds_to_deadline(100)) ==
                NULL);
@@ -489,7 +474,7 @@ static void test_benign_reclaim_is_preferred(void) {
     gpr_event_init(&ev);
     ExecCtx _local_exec_ctx;
     grpc_resource_user_alloc(usr, 1024, set_event(&ev));
-    grpc_exec_ctx_finish();
+
     GPR_ASSERT(gpr_event_wait(&benign_done,
                               grpc_timeout_seconds_to_deadline(5)) != NULL);
     GPR_ASSERT(gpr_event_wait(&destructive_done,
@@ -501,7 +486,6 @@ static void test_benign_reclaim_is_preferred(void) {
   {
     ExecCtx _local_exec_ctx;
     grpc_resource_user_free(usr, 1024);
-    grpc_exec_ctx_finish();
   }
   grpc_resource_quota_unref(q);
   destroy_user(usr);
@@ -526,7 +510,7 @@ static void test_multiple_reclaims_can_be_triggered(void) {
     gpr_event_init(&ev);
     ExecCtx _local_exec_ctx;
     grpc_resource_user_alloc(usr, 1024, set_event(&ev));
-    grpc_exec_ctx_finish();
+
     GPR_ASSERT(gpr_event_wait(&ev, grpc_timeout_seconds_to_deadline(5)) !=
                NULL);
     ;
@@ -537,7 +521,7 @@ static void test_multiple_reclaims_can_be_triggered(void) {
         usr, false, make_reclaimer(usr, 512, set_event(&benign_done)));
     grpc_resource_user_post_reclaimer(
         usr, true, make_reclaimer(usr, 512, set_event(&destructive_done)));
-    grpc_exec_ctx_finish();
+
     GPR_ASSERT(gpr_event_wait(&benign_done,
                               grpc_timeout_milliseconds_to_deadline(100)) ==
                NULL);
@@ -550,7 +534,7 @@ static void test_multiple_reclaims_can_be_triggered(void) {
     gpr_event_init(&ev);
     ExecCtx _local_exec_ctx;
     grpc_resource_user_alloc(usr, 1024, set_event(&ev));
-    grpc_exec_ctx_finish();
+
     GPR_ASSERT(gpr_event_wait(&benign_done,
                               grpc_timeout_seconds_to_deadline(5)) != NULL);
     GPR_ASSERT(gpr_event_wait(&destructive_done,
@@ -562,7 +546,6 @@ static void test_multiple_reclaims_can_be_triggered(void) {
   {
     ExecCtx _local_exec_ctx;
     grpc_resource_user_free(usr, 1024);
-    grpc_exec_ctx_finish();
   }
   grpc_resource_quota_unref(q);
   destroy_user(usr);
@@ -582,18 +565,15 @@ static void test_resource_user_stays_allocated_until_memory_released(void) {
   {
     ExecCtx _local_exec_ctx;
     grpc_resource_user_alloc(usr, 1024, NULL);
-    grpc_exec_ctx_finish();
   }
   {
     ExecCtx _local_exec_ctx;
     grpc_resource_quota_unref(q);
     grpc_resource_user_unref(usr);
-    grpc_exec_ctx_finish();
   }
   {
     ExecCtx _local_exec_ctx;
     grpc_resource_user_free(usr, 1024);
-    grpc_exec_ctx_finish();
   }
 }
 
@@ -616,7 +596,7 @@ test_resource_user_stays_allocated_and_reclaimers_unrun_until_memory_released(
       ExecCtx _local_exec_ctx;
       grpc_resource_user_post_reclaimer(
           usr, false, make_unused_reclaimer(set_event(&reclaimer_cancelled)));
-      grpc_exec_ctx_finish();
+
       GPR_ASSERT(gpr_event_wait(&reclaimer_cancelled,
                                 grpc_timeout_milliseconds_to_deadline(100)) ==
                  NULL);
@@ -626,7 +606,7 @@ test_resource_user_stays_allocated_and_reclaimers_unrun_until_memory_released(
       gpr_event_init(&allocated);
       ExecCtx _local_exec_ctx;
       grpc_resource_user_alloc(usr, 1024, set_event(&allocated));
-      grpc_exec_ctx_finish();
+
       GPR_ASSERT(gpr_event_wait(&allocated,
                                 grpc_timeout_seconds_to_deadline(5)) != NULL);
       GPR_ASSERT(gpr_event_wait(&reclaimer_cancelled,
@@ -636,7 +616,7 @@ test_resource_user_stays_allocated_and_reclaimers_unrun_until_memory_released(
     {
       ExecCtx _local_exec_ctx;
       grpc_resource_user_unref(usr);
-      grpc_exec_ctx_finish();
+
       GPR_ASSERT(gpr_event_wait(&reclaimer_cancelled,
                                 grpc_timeout_milliseconds_to_deadline(100)) ==
                  NULL);
@@ -644,7 +624,7 @@ test_resource_user_stays_allocated_and_reclaimers_unrun_until_memory_released(
     {
       ExecCtx _local_exec_ctx;
       grpc_resource_user_free(usr, 1024);
-      grpc_exec_ctx_finish();
+
       GPR_ASSERT(gpr_event_wait(&reclaimer_cancelled,
                                 grpc_timeout_seconds_to_deadline(5)) != NULL);
     }
@@ -663,7 +643,7 @@ static void test_reclaimers_can_be_posted_repeatedly(void) {
     gpr_event_init(&allocated);
     ExecCtx _local_exec_ctx;
     grpc_resource_user_alloc(usr, 1024, set_event(&allocated));
-    grpc_exec_ctx_finish();
+
     GPR_ASSERT(gpr_event_wait(&allocated,
                               grpc_timeout_seconds_to_deadline(5)) != NULL);
   }
@@ -674,7 +654,7 @@ static void test_reclaimers_can_be_posted_repeatedly(void) {
       ExecCtx _local_exec_ctx;
       grpc_resource_user_post_reclaimer(
           usr, false, make_reclaimer(usr, 1024, set_event(&reclaimer_done)));
-      grpc_exec_ctx_finish();
+
       GPR_ASSERT(gpr_event_wait(&reclaimer_done,
                                 grpc_timeout_milliseconds_to_deadline(100)) ==
                  NULL);
@@ -684,7 +664,7 @@ static void test_reclaimers_can_be_posted_repeatedly(void) {
       gpr_event_init(&allocated);
       ExecCtx _local_exec_ctx;
       grpc_resource_user_alloc(usr, 1024, set_event(&allocated));
-      grpc_exec_ctx_finish();
+
       GPR_ASSERT(gpr_event_wait(&allocated,
                                 grpc_timeout_seconds_to_deadline(5)) != NULL);
       GPR_ASSERT(gpr_event_wait(&reclaimer_done,
@@ -694,7 +674,6 @@ static void test_reclaimers_can_be_posted_repeatedly(void) {
   {
     ExecCtx _local_exec_ctx;
     grpc_resource_user_free(usr, 1024);
-    grpc_exec_ctx_finish();
   }
   destroy_user(usr);
   grpc_resource_quota_unref(q);
@@ -719,14 +698,13 @@ static void test_one_slice(void) {
     const int start_allocs = num_allocs;
     ExecCtx _local_exec_ctx;
     grpc_resource_user_alloc_slices(&alloc, 1024, 1, &buffer);
-    grpc_exec_ctx_finish();
+
     assert_counter_becomes(&num_allocs, start_allocs + 1);
   }
 
   {
     ExecCtx _local_exec_ctx;
     grpc_slice_buffer_destroy_internal(&buffer);
-    grpc_exec_ctx_finish();
   }
   destroy_user(usr);
   grpc_resource_quota_unref(q);
@@ -752,21 +730,19 @@ static void test_one_slice_deleted_late(void) {
     const int start_allocs = num_allocs;
     ExecCtx _local_exec_ctx;
     grpc_resource_user_alloc_slices(&alloc, 1024, 1, &buffer);
-    grpc_exec_ctx_finish();
+
     assert_counter_becomes(&num_allocs, start_allocs + 1);
   }
 
   {
     ExecCtx _local_exec_ctx;
     grpc_resource_user_unref(usr);
-    grpc_exec_ctx_finish();
   }
 
   grpc_resource_quota_unref(q);
   {
     ExecCtx _local_exec_ctx;
     grpc_slice_buffer_destroy_internal(&buffer);
-    grpc_exec_ctx_finish();
   }
 }
 
@@ -796,7 +772,7 @@ static void test_negative_rq_free_pool(void) {
     const int start_allocs = num_allocs;
     ExecCtx _local_exec_ctx;
     grpc_resource_user_alloc_slices(&alloc, 1024, 1, &buffer);
-    grpc_exec_ctx_finish();
+
     assert_counter_becomes(&num_allocs, start_allocs + 1);
   }
 
@@ -809,14 +785,12 @@ static void test_negative_rq_free_pool(void) {
   {
     ExecCtx _local_exec_ctx;
     grpc_resource_user_unref(usr);
-    grpc_exec_ctx_finish();
   }
 
   grpc_resource_quota_unref(q);
   {
     ExecCtx _local_exec_ctx;
     grpc_slice_buffer_destroy_internal(&buffer);
-    grpc_exec_ctx_finish();
   }
 }
 
diff --git a/test/core/iomgr/tcp_client_posix_test.cc b/test/core/iomgr/tcp_client_posix_test.cc
index 7fad3b08be..abefecba33 100644
--- a/test/core/iomgr/tcp_client_posix_test.cc
+++ b/test/core/iomgr/tcp_client_posix_test.cc
@@ -56,7 +56,7 @@ static void finish_connection() {
   ExecCtx _local_exec_ctx;
   GPR_ASSERT(
       GRPC_LOG_IF_ERROR("pollset_kick", grpc_pollset_kick(g_pollset, NULL)));
-  grpc_exec_ctx_finish();
+
   gpr_mu_unlock(g_mu);
 }
 
@@ -127,13 +127,11 @@ void test_succeeds(void) {
                           grpc_timespec_to_millis_round_up(
                               grpc_timeout_seconds_to_deadline(5)))));
     gpr_mu_unlock(g_mu);
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
     gpr_mu_lock(g_mu);
   }
 
   gpr_mu_unlock(g_mu);
-
-  grpc_exec_ctx_finish();
 }
 
 void test_fails(void) {
@@ -177,12 +175,11 @@ void test_fails(void) {
         break;
     }
     gpr_mu_unlock(g_mu);
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
     gpr_mu_lock(g_mu);
   }
 
   gpr_mu_unlock(g_mu);
-  grpc_exec_ctx_finish();
 }
 
 static void destroy_pollset(void* p, grpc_error* error) {
@@ -198,7 +195,7 @@ int main(int argc, char** argv) {
   g_pollset = static_cast<grpc_pollset*>(gpr_zalloc(grpc_pollset_size()));
   grpc_pollset_init(g_pollset, &g_mu);
   grpc_pollset_set_add_pollset(g_pollset_set, g_pollset);
-  grpc_exec_ctx_finish();
+
   test_succeeds();
   gpr_log(GPR_ERROR, "End of first test");
   test_fails();
@@ -206,7 +203,7 @@ int main(int argc, char** argv) {
   GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset,
                     grpc_schedule_on_exec_ctx);
   grpc_pollset_shutdown(g_pollset, &destroyed);
-  grpc_exec_ctx_finish();
+
   grpc_shutdown();
   gpr_free(g_pollset);
   return 0;
diff --git a/test/core/iomgr/tcp_client_uv_test.cc b/test/core/iomgr/tcp_client_uv_test.cc
index dd98fb2275..0355896b85 100644
--- a/test/core/iomgr/tcp_client_uv_test.cc
+++ b/test/core/iomgr/tcp_client_uv_test.cc
@@ -121,7 +121,7 @@ void test_succeeds(void) {
                           grpc_timespec_to_millis_round_up(
                               grpc_timeout_seconds_to_deadline(5)))));
     gpr_mu_unlock(g_mu);
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
     gpr_mu_lock(g_mu);
   }
 
@@ -129,8 +129,6 @@ void test_succeeds(void) {
   uv_close((uv_handle_t*)svr_handle, close_cb);
 
   gpr_mu_unlock(g_mu);
-
-  grpc_exec_ctx_finish();
 }
 
 void test_fails(void) {
@@ -175,12 +173,11 @@ void test_fails(void) {
         break;
     }
     gpr_mu_unlock(g_mu);
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
     gpr_mu_lock(g_mu);
   }
 
   gpr_mu_unlock(g_mu);
-  grpc_exec_ctx_finish();
 }
 
 static void destroy_pollset(void* p, grpc_error* error) {
@@ -194,14 +191,14 @@ int main(int argc, char** argv) {
   grpc_init();
   g_pollset = static_cast<grpc_pollset*>(gpr_malloc(grpc_pollset_size()));
   grpc_pollset_init(g_pollset, &g_mu);
-  grpc_exec_ctx_finish();
+
   test_succeeds();
   gpr_log(GPR_ERROR, "End of first test");
   test_fails();
   GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset,
                     grpc_schedule_on_exec_ctx);
   grpc_pollset_shutdown(g_pollset, &destroyed);
-  grpc_exec_ctx_finish();
+
   grpc_shutdown();
   gpr_free(g_pollset);
   return 0;
diff --git a/test/core/iomgr/tcp_posix_test.cc b/test/core/iomgr/tcp_posix_test.cc
index e4126fb05a..678e1c3638 100644
--- a/test/core/iomgr/tcp_posix_test.cc
+++ b/test/core/iomgr/tcp_posix_test.cc
@@ -193,7 +193,7 @@ static void read_test(size_t num_bytes, size_t slice_size) {
     GPR_ASSERT(GRPC_LOG_IF_ERROR(
         "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline)));
     gpr_mu_unlock(g_mu);
-    grpc_exec_ctx_finish();
+
     gpr_mu_lock(g_mu);
   }
   GPR_ASSERT(state.read_bytes == state.target_read_bytes);
@@ -201,7 +201,6 @@ static void read_test(size_t num_bytes, size_t slice_size) {
 
   grpc_slice_buffer_destroy_internal(&state.incoming);
   grpc_endpoint_destroy(ep);
-  grpc_exec_ctx_finish();
 }
 
 /* Write to a socket until it fills up, then read from it using the grpc_tcp
@@ -244,7 +243,7 @@ static void large_read_test(size_t slice_size) {
     GPR_ASSERT(GRPC_LOG_IF_ERROR(
         "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline)));
     gpr_mu_unlock(g_mu);
-    grpc_exec_ctx_finish();
+
     gpr_mu_lock(g_mu);
   }
   GPR_ASSERT(state.read_bytes == state.target_read_bytes);
@@ -252,7 +251,6 @@ static void large_read_test(size_t slice_size) {
 
   grpc_slice_buffer_destroy_internal(&state.incoming);
   grpc_endpoint_destroy(ep);
-  grpc_exec_ctx_finish();
 }
 
 struct write_socket_state {
@@ -316,7 +314,7 @@ void drain_socket_blocking(int fd, size_t num_bytes, size_t read_size) {
                           grpc_timespec_to_millis_round_up(
                               grpc_timeout_milliseconds_to_deadline(10)))));
     gpr_mu_unlock(g_mu);
-    grpc_exec_ctx_finish();
+
     do {
       bytes_read =
           read(fd, buf, bytes_left > read_size ? read_size : bytes_left);
@@ -385,7 +383,7 @@ static void write_test(size_t num_bytes, size_t slice_size) {
     GPR_ASSERT(GRPC_LOG_IF_ERROR(
         "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline)));
     gpr_mu_unlock(g_mu);
-    grpc_exec_ctx_finish();
+
     gpr_mu_lock(g_mu);
   }
   gpr_mu_unlock(g_mu);
@@ -393,7 +391,6 @@ static void write_test(size_t num_bytes, size_t slice_size) {
   grpc_slice_buffer_destroy_internal(&outgoing);
   grpc_endpoint_destroy(ep);
   gpr_free(slices);
-  grpc_exec_ctx_finish();
 }
 
 void on_fd_released(void* arg, grpc_error* errors) {
@@ -453,7 +450,7 @@ static void release_fd_test(size_t num_bytes, size_t slice_size) {
     gpr_log(GPR_DEBUG, "wakeup: read=%" PRIdPTR " target=%" PRIdPTR,
             state.read_bytes, state.target_read_bytes);
     gpr_mu_unlock(g_mu);
-    grpc_exec_ctx_flush();
+    ExecCtx::Get()->Flush();
     gpr_mu_lock(g_mu);
   }
   GPR_ASSERT(state.read_bytes == state.target_read_bytes);
@@ -461,7 +458,7 @@ static void release_fd_test(size_t num_bytes, size_t slice_size) {
 
   grpc_slice_buffer_destroy_internal(&state.incoming);
   grpc_tcp_destroy_and_release_fd(ep, &fd, &fd_released_cb);
-  grpc_exec_ctx_flush();
+  ExecCtx::Get()->Flush();
   gpr_mu_lock(g_mu);
   while (!fd_released_done) {
     grpc_pollset_worker* worker = NULL;
@@ -472,7 +469,6 @@ static void release_fd_test(size_t num_bytes, size_t slice_size) {
   gpr_mu_unlock(g_mu);
   GPR_ASSERT(fd_released_done == 1);
   GPR_ASSERT(fd == sv[1]);
-  grpc_exec_ctx_finish();
 
   written_bytes = fill_socket_partial(sv[0], num_bytes);
   drain_socket_blocking(fd, written_bytes, written_bytes);
@@ -528,8 +524,6 @@ static grpc_endpoint_test_fixture create_fixture_tcp_socketpair(
   grpc_endpoint_add_to_pollset(f.client_ep, g_pollset);
   grpc_endpoint_add_to_pollset(f.server_ep, g_pollset);
 
-  grpc_exec_ctx_finish();
-
   return f;
 }
 
@@ -553,7 +547,7 @@ int main(int argc, char** argv) {
   GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset,
                     grpc_schedule_on_exec_ctx);
   grpc_pollset_shutdown(g_pollset, &destroyed);
-  grpc_exec_ctx_finish();
+
   grpc_shutdown();
   gpr_free(g_pollset);
 
diff --git a/test/core/iomgr/tcp_server_posix_test.cc b/test/core/iomgr/tcp_server_posix_test.cc
index 3707634c29..1c3f4490d5 100644
--- a/test/core/iomgr/tcp_server_posix_test.cc
+++ b/test/core/iomgr/tcp_server_posix_test.cc
@@ -167,7 +167,6 @@ static void test_no_op(void) {
   grpc_tcp_server* s;
   GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(NULL, NULL, &s));
   grpc_tcp_server_unref(s);
-  grpc_exec_ctx_finish();
 }
 
 static void test_no_op_with_start(void) {
@@ -177,7 +176,6 @@ static void test_no_op_with_start(void) {
   LOG_TEST("test_no_op_with_start");
   grpc_tcp_server_start(s, NULL, 0, on_connect, NULL);
   grpc_tcp_server_unref(s);
-  grpc_exec_ctx_finish();
 }
 
 static void test_no_op_with_port(void) {
@@ -197,7 +195,6 @@ static void test_no_op_with_port(void) {
              port > 0);
 
   grpc_tcp_server_unref(s);
-  grpc_exec_ctx_finish();
 }
 
 static void test_no_op_with_port_and_start(void) {
@@ -219,7 +216,6 @@ static void test_no_op_with_port_and_start(void) {
   grpc_tcp_server_start(s, NULL, 0, on_connect, NULL);
 
   grpc_tcp_server_unref(s);
-  grpc_exec_ctx_finish();
 }
 
 static grpc_error* tcp_connect(const test_addr* remote,
@@ -247,7 +243,7 @@ static grpc_error* tcp_connect(const test_addr* remote,
     return GRPC_OS_ERROR(errno, "connect");
   }
   gpr_log(GPR_DEBUG, "wait");
-  while (g_nconnects == nconnects_before && deadline > grpc_exec_ctx_now()) {
+  while (g_nconnects == nconnects_before && deadline > ExecCtx::Get()->Now()) {
     grpc_pollset_worker* worker = NULL;
     grpc_error* err;
     if ((err = grpc_pollset_work(g_pollset, &worker, deadline)) !=
@@ -257,7 +253,7 @@ static grpc_error* tcp_connect(const test_addr* remote,
       return err;
     }
     gpr_mu_unlock(g_mu);
-    grpc_exec_ctx_finish();
+
     gpr_mu_lock(g_mu);
   }
   gpr_log(GPR_DEBUG, "wait done");
@@ -413,7 +409,6 @@ static void test_connect(size_t num_connects,
   GPR_ASSERT(grpc_tcp_server_port_fd(s, 0, 0) >= 0);
 
   grpc_tcp_server_unref(s);
-  grpc_exec_ctx_finish();
 
   /* Weak ref lost. */
   GPR_ASSERT(weak_ref.server == NULL);
@@ -489,7 +484,7 @@ int main(int argc, char** argv) {
   GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset,
                     grpc_schedule_on_exec_ctx);
   grpc_pollset_shutdown(g_pollset, &destroyed);
-  grpc_exec_ctx_finish();
+
   grpc_shutdown();
   gpr_free(dst_addrs);
   gpr_free(g_pollset);
diff --git a/test/core/iomgr/tcp_server_uv_test.cc b/test/core/iomgr/tcp_server_uv_test.cc
index 2a0ada225c..50042af37f 100644
--- a/test/core/iomgr/tcp_server_uv_test.cc
+++ b/test/core/iomgr/tcp_server_uv_test.cc
@@ -119,7 +119,6 @@ static void test_no_op(void) {
   grpc_tcp_server* s;
   GPR_ASSERT(GRPC_ERROR_NONE == grpc_tcp_server_create(NULL, NULL, &s));
   grpc_tcp_server_unref(s);
-  grpc_exec_ctx_finish();
 }
 
 static void test_no_op_with_start(void) {
@@ -129,7 +128,6 @@ static void test_no_op_with_start(void) {
   LOG_TEST("test_no_op_with_start");
   grpc_tcp_server_start(s, NULL, 0, on_connect, NULL);
   grpc_tcp_server_unref(s);
-  grpc_exec_ctx_finish();
 }
 
 static void test_no_op_with_port(void) {
@@ -149,7 +147,6 @@ static void test_no_op_with_port(void) {
              port > 0);
 
   grpc_tcp_server_unref(s);
-  grpc_exec_ctx_finish();
 }
 
 static void test_no_op_with_port_and_start(void) {
@@ -171,7 +168,6 @@ static void test_no_op_with_port_and_start(void) {
   grpc_tcp_server_start(s, NULL, 0, on_connect, NULL);
 
   grpc_tcp_server_unref(s);
-  grpc_exec_ctx_finish();
 }
 
 static void connect_cb(uv_connect_t* req, int status) {
@@ -205,7 +201,7 @@ static void tcp_connect(const struct sockaddr* remote, socklen_t remote_len,
         grpc_pollset_work(g_pollset, &worker,
                           grpc_timespec_to_millis_round_up(deadline))));
     gpr_mu_unlock(g_mu);
-    grpc_exec_ctx_finish();
+
     gpr_mu_lock(g_mu);
   }
   gpr_log(GPR_DEBUG, "wait done");
@@ -277,7 +273,6 @@ static void test_connect(unsigned n) {
   GPR_ASSERT(weak_ref.server != NULL);
 
   grpc_tcp_server_unref(s);
-  grpc_exec_ctx_finish();
 
   /* Weak ref lost. */
   GPR_ASSERT(weak_ref.server == NULL);
@@ -305,7 +300,7 @@ int main(int argc, char** argv) {
   GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset,
                     grpc_schedule_on_exec_ctx);
   grpc_pollset_shutdown(g_pollset, &destroyed);
-  grpc_exec_ctx_finish();
+
   grpc_shutdown();
   gpr_free(g_pollset);
   return 0;
diff --git a/test/core/iomgr/timer_list_test.cc b/test/core/iomgr/timer_list_test.cc
index 07dfec168c..7281f55b85 100644
--- a/test/core/iomgr/timer_list_test.cc
+++ b/test/core/iomgr/timer_list_test.cc
@@ -52,7 +52,7 @@ static void add_test(void) {
   grpc_timer_check_trace.value = 1;
   memset(cb_called, 0, sizeof(cb_called));
 
-  grpc_millis start = grpc_exec_ctx_now();
+  grpc_millis start = ExecCtx::Get()->Now();
 
   /* 10 ms timers.  will expire in the current epoch */
   for (i = 0; i < 10; i++) {
@@ -69,32 +69,32 @@ static void add_test(void) {
   }
 
   /* collect timers.  Only the first batch should be ready. */
-  exec_ctx->now = start + 500;
+  ExecCtx::Get()->SetNow(start + 500);
   GPR_ASSERT(grpc_timer_check(NULL) == GRPC_TIMERS_FIRED);
-  grpc_exec_ctx_finish();
+
   for (i = 0; i < 20; i++) {
     GPR_ASSERT(cb_called[i][1] == (i < 10));
     GPR_ASSERT(cb_called[i][0] == 0);
   }
 
-  exec_ctx->now = start + 600;
+  ExecCtx::Get()->SetNow(start + 600);
   GPR_ASSERT(grpc_timer_check(NULL) == GRPC_TIMERS_CHECKED_AND_EMPTY);
-  grpc_exec_ctx_finish();
+
   for (i = 0; i < 30; i++) {
     GPR_ASSERT(cb_called[i][1] == (i < 10));
     GPR_ASSERT(cb_called[i][0] == 0);
   }
 
   /* collect the rest of the timers */
-  exec_ctx->now = start + 1500;
+  ExecCtx::Get()->SetNow(start + 1500);
   GPR_ASSERT(grpc_timer_check(NULL) == GRPC_TIMERS_FIRED);
-  grpc_exec_ctx_finish();
+
   for (i = 0; i < 30; i++) {
     GPR_ASSERT(cb_called[i][1] == (i < 20));
     GPR_ASSERT(cb_called[i][0] == 0);
   }
 
-  exec_ctx->now = start + 1600;
+  ExecCtx::Get()->SetNow(start + 1600);
   GPR_ASSERT(grpc_timer_check(NULL) == GRPC_TIMERS_CHECKED_AND_EMPTY);
   for (i = 0; i < 30; i++) {
     GPR_ASSERT(cb_called[i][1] == (i < 20));
@@ -102,7 +102,6 @@ static void add_test(void) {
   }
 
   grpc_timer_list_shutdown();
-  grpc_exec_ctx_finish();
 }
 
 /* Cleaning up a list with pending timers. */
@@ -112,8 +111,7 @@ void destruction_test(void) {
 
   gpr_log(GPR_INFO, "destruction_test");
 
-  exec_ctx->now_is_valid = true;
-  exec_ctx->now = 0;
+  ExecCtx::Get()->SetNow(0);
   grpc_timer_list_init();
   grpc_timer_trace.value = 1;
   grpc_timer_check_trace.value = 1;
@@ -134,18 +132,18 @@ void destruction_test(void) {
   grpc_timer_init(
       &timers[4], 1,
       GRPC_CLOSURE_CREATE(cb, (void*)(intptr_t)4, grpc_schedule_on_exec_ctx));
-  exec_ctx->now = 2;
+  ExecCtx::Get()->SetNow(2);
   GPR_ASSERT(grpc_timer_check(NULL) == GRPC_TIMERS_FIRED);
-  grpc_exec_ctx_finish();
+
   GPR_ASSERT(1 == cb_called[4][1]);
   grpc_timer_cancel(&timers[0]);
   grpc_timer_cancel(&timers[3]);
-  grpc_exec_ctx_finish();
+
   GPR_ASSERT(1 == cb_called[0][0]);
   GPR_ASSERT(1 == cb_called[3][0]);
 
   grpc_timer_list_shutdown();
-  grpc_exec_ctx_finish();
+
   GPR_ASSERT(1 == cb_called[1][0]);
   GPR_ASSERT(1 == cb_called[2][0]);
 }
diff --git a/test/core/iomgr/udp_server_test.cc b/test/core/iomgr/udp_server_test.cc
index c079dbf716..47e5cf0254 100644
--- a/test/core/iomgr/udp_server_test.cc
+++ b/test/core/iomgr/udp_server_test.cc
@@ -130,7 +130,6 @@ static void test_no_op(void) {
   ExecCtx _local_exec_ctx;
   grpc_udp_server* s = grpc_udp_server_create(NULL);
   grpc_udp_server_destroy(s, NULL);
-  grpc_exec_ctx_finish();
 }
 
 static void test_no_op_with_start(void) {
@@ -139,7 +138,6 @@ static void test_no_op_with_start(void) {
   LOG_TEST("test_no_op_with_start");
   grpc_udp_server_start(s, NULL, 0, NULL);
   grpc_udp_server_destroy(s, NULL);
-  grpc_exec_ctx_finish();
 }
 
 static void test_no_op_with_port(void) {
@@ -157,7 +155,6 @@ static void test_no_op_with_port(void) {
                                       on_fd_orphaned));
 
   grpc_udp_server_destroy(s, NULL);
-  grpc_exec_ctx_finish();
 
   /* The server had a single FD, which should have been orphaned. */
   GPR_ASSERT(g_number_of_orphan_calls == 1);
@@ -188,7 +185,7 @@ static void test_no_op_with_port_and_socket_factory(void) {
   GPR_ASSERT(socket_factory->number_of_bind_calls == 1);
 
   grpc_udp_server_destroy(s, NULL);
-  grpc_exec_ctx_finish();
+
   grpc_socket_factory_unref(&socket_factory->base);
 
   /* The server had a single FD, which should have been orphaned. */
@@ -212,7 +209,6 @@ static void test_no_op_with_port_and_start(void) {
   grpc_udp_server_start(s, NULL, 0, NULL);
 
   grpc_udp_server_destroy(s, NULL);
-  grpc_exec_ctx_finish();
 
   /* The server had a single FD, which is orphaned exactly once in *
    * grpc_udp_server_destroy. */
@@ -264,12 +260,12 @@ static void test_receive(int number_of_clients) {
                        (socklen_t)resolved_addr.len) == 0);
     GPR_ASSERT(5 == write(clifd, "hello", 5));
     while (g_number_of_reads == number_of_reads_before &&
-           deadline > grpc_exec_ctx_now()) {
+           deadline > ExecCtx::Get()->Now()) {
       grpc_pollset_worker* worker = NULL;
       GPR_ASSERT(GRPC_LOG_IF_ERROR(
           "pollset_work", grpc_pollset_work(g_pollset, &worker, deadline)));
       gpr_mu_unlock(g_mu);
-      grpc_exec_ctx_flush();
+      ExecCtx::Get()->Flush();
       gpr_mu_lock(g_mu);
     }
     GPR_ASSERT(g_number_of_reads == number_of_reads_before + 1);
@@ -280,7 +276,6 @@ static void test_receive(int number_of_clients) {
   gpr_mu_unlock(g_mu);
 
   grpc_udp_server_destroy(s, NULL);
-  grpc_exec_ctx_finish();
 
   /* The server had a single FD, which is orphaned exactly once in *
    * grpc_udp_server_destroy. */
@@ -313,7 +308,7 @@ int main(int argc, char** argv) {
   GRPC_CLOSURE_INIT(&destroyed, destroy_pollset, g_pollset,
                     grpc_schedule_on_exec_ctx);
   grpc_pollset_shutdown(g_pollset, &destroyed);
-  grpc_exec_ctx_finish();
+
   gpr_free(g_pollset);
   grpc_shutdown();
   return 0;