diff options
Diffstat (limited to 'test/core')
25 files changed, 108 insertions, 108 deletions
diff --git a/test/core/bad_client/bad_client.c b/test/core/bad_client/bad_client.c index 0b59aa3185..d03c6579d2 100644 --- a/test/core/bad_client/bad_client.c +++ b/test/core/bad_client/bad_client.c @@ -78,7 +78,7 @@ server_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx }; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_server_setup_transport (a->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (a->server), &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } void @@ -119,7 +119,7 @@ grpc_run_bad_client_test (grpc_bad_client_server_side_validator validator, const transport = grpc_create_chttp2_transport (NULL, sfd.server, mdctx, 0, &closure_list); server_setup_transport (&a, transport, mdctx); grpc_chttp2_transport_start_reading (transport, NULL, 0, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); /* Bind everything into the same pollset */ grpc_endpoint_add_to_pollset (sfd.client, grpc_cq_pollset (a.cq), &closure_list); @@ -137,7 +137,7 @@ grpc_run_bad_client_test (grpc_bad_client_server_side_validator validator, const /* Write data */ grpc_endpoint_write (sfd.client, &outgoing, &done_write_closure, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); /* Await completion */ GPR_ASSERT (gpr_event_wait (&a.done_write, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5))); @@ -146,7 +146,7 @@ grpc_run_bad_client_test (grpc_bad_client_server_side_validator validator, const { grpc_endpoint_shutdown (sfd.client, &closure_list); grpc_endpoint_destroy (sfd.client, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); sfd.client = NULL; } @@ -157,7 +157,7 @@ grpc_run_bad_client_test (grpc_bad_client_server_side_validator validator, const { grpc_endpoint_shutdown (sfd.client, &closure_list); grpc_endpoint_destroy (sfd.client, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } grpc_server_shutdown_and_notify (a.server, a.cq, NULL); GPR_ASSERT (grpc_completion_queue_pluck (a.cq, NULL, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (1), NULL).type == GRPC_OP_COMPLETE); @@ -165,6 +165,6 @@ grpc_run_bad_client_test (grpc_bad_client_server_side_validator validator, const grpc_completion_queue_destroy (a.cq); gpr_slice_buffer_destroy (&outgoing); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); grpc_shutdown (); } diff --git a/test/core/client_config/lb_policies_test.c b/test/core/client_config/lb_policies_test.c index 931bdef017..3405db8fc3 100644 --- a/test/core/client_config/lb_policies_test.c +++ b/test/core/client_config/lb_policies_test.c @@ -423,7 +423,7 @@ assert_channel_connectivity (grpc_channel * ch, size_t num_accepted_conn_states, client_channel_filter = grpc_channel_stack_last_element (client_stack); actual_conn_state = grpc_client_channel_check_connectivity_state (client_channel_filter, 0 /* don't try to connect */ , &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); va_start (ap, accepted_conn_state); for (i = 0; i < num_accepted_conn_states; i++) { diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.c b/test/core/end2end/fixtures/h2_sockpair+trace.c index 276436ba12..75dc0a593e 100644 --- a/test/core/end2end/fixtures/h2_sockpair+trace.c +++ b/test/core/end2end/fixtures/h2_sockpair+trace.c @@ -66,7 +66,7 @@ server_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx }; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_server_setup_transport (f->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (f->server), &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } typedef struct @@ -122,7 +122,7 @@ chttp2_init_client_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args client_setup_transport (&cs, transport, mdctx, &closure_list); GPR_ASSERT (f->client); grpc_chttp2_transport_start_reading (transport, NULL, 0, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -139,7 +139,7 @@ chttp2_init_server_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args transport = grpc_create_chttp2_transport (server_args, sfd->server, mdctx, 0, &closure_list); server_setup_transport (f, transport, mdctx); grpc_chttp2_transport_start_reading (transport, NULL, 0, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -172,7 +172,7 @@ main (int argc, char **argv) grpc_test_init (argc, argv); grpc_init (); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); GPR_ASSERT (0 == grpc_tracer_set_enabled ("also-doesnt-exist", 0)); GPR_ASSERT (1 == grpc_tracer_set_enabled ("http", 1)); diff --git a/test/core/end2end/fixtures/h2_sockpair.c b/test/core/end2end/fixtures/h2_sockpair.c index 5cdc6cacaf..ba6d7436d6 100644 --- a/test/core/end2end/fixtures/h2_sockpair.c +++ b/test/core/end2end/fixtures/h2_sockpair.c @@ -65,7 +65,7 @@ server_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx }; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_server_setup_transport (f->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (f->server), &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } typedef struct @@ -121,7 +121,7 @@ chttp2_init_client_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args client_setup_transport (&cs, transport, mdctx, &closure_list); GPR_ASSERT (f->client); grpc_chttp2_transport_start_reading (transport, NULL, 0, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -138,7 +138,7 @@ chttp2_init_server_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args transport = grpc_create_chttp2_transport (server_args, sfd->server, mdctx, 0, &closure_list); server_setup_transport (f, transport, mdctx); grpc_chttp2_transport_start_reading (transport, NULL, 0, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.c b/test/core/end2end/fixtures/h2_sockpair_1byte.c index 2685b57e7a..7e3c44070e 100644 --- a/test/core/end2end/fixtures/h2_sockpair_1byte.c +++ b/test/core/end2end/fixtures/h2_sockpair_1byte.c @@ -65,7 +65,7 @@ server_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx }; grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_server_setup_transport (f->server, transport, extra_filters, GPR_ARRAY_SIZE (extra_filters), mdctx, grpc_server_get_channel_args (f->server), &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } typedef struct @@ -121,7 +121,7 @@ chttp2_init_client_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args client_setup_transport (&cs, transport, mdctx, &closure_list); GPR_ASSERT (f->client); grpc_chttp2_transport_start_reading (transport, NULL, 0, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -138,7 +138,7 @@ chttp2_init_server_socketpair (grpc_end2end_test_fixture * f, grpc_channel_args transport = grpc_create_chttp2_transport (server_args, sfd->server, mdctx, 0, &closure_list); server_setup_transport (f, transport, mdctx); grpc_chttp2_transport_start_reading (transport, NULL, 0, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void diff --git a/test/core/httpcli/httpcli_test.c b/test/core/httpcli/httpcli_test.c index 0287009fae..1b6be7c526 100644 --- a/test/core/httpcli/httpcli_test.c +++ b/test/core/httpcli/httpcli_test.c @@ -95,7 +95,7 @@ test_get (int use_ssl, int port) grpc_pollset_worker worker; grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), n_seconds_time (20), &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); } gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); @@ -127,7 +127,7 @@ test_post (int use_ssl, int port) grpc_pollset_worker worker; grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), n_seconds_time (20), &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); } gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); @@ -185,7 +185,7 @@ main (int argc, char **argv) grpc_httpcli_context_destroy (&g_context); grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); grpc_shutdown (); gpr_subprocess_destroy (server); diff --git a/test/core/iomgr/alarm_list_test.c b/test/core/iomgr/alarm_list_test.c index 8867545b33..272524da63 100644 --- a/test/core/iomgr/alarm_list_test.c +++ b/test/core/iomgr/alarm_list_test.c @@ -74,7 +74,7 @@ add_test (void) /* collect alarms. Only the first batch should be ready. */ GPR_ASSERT (10 == grpc_alarm_check (gpr_time_add (start, gpr_time_from_millis (500, GPR_TIMESPAN)), NULL, &closure_list)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); for (i = 0; i < 20; i++) { GPR_ASSERT (cb_called[i][1] == (i < 10)); @@ -82,7 +82,7 @@ add_test (void) } GPR_ASSERT (0 == grpc_alarm_check (gpr_time_add (start, gpr_time_from_millis (600, GPR_TIMESPAN)), NULL, &closure_list)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); for (i = 0; i < 30; i++) { GPR_ASSERT (cb_called[i][1] == (i < 10)); @@ -91,7 +91,7 @@ add_test (void) /* collect the rest of the alarms */ GPR_ASSERT (10 == grpc_alarm_check (gpr_time_add (start, gpr_time_from_millis (1500, GPR_TIMESPAN)), NULL, &closure_list)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); for (i = 0; i < 30; i++) { GPR_ASSERT (cb_called[i][1] == (i < 20)); @@ -106,7 +106,7 @@ add_test (void) } grpc_alarm_list_shutdown (&closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static gpr_timespec @@ -133,16 +133,16 @@ destruction_test (void) grpc_alarm_init (&alarms[3], tfm (3), cb, (void *) (gpr_intptr) 3, gpr_time_0 (GPR_CLOCK_REALTIME), &closure_list); grpc_alarm_init (&alarms[4], tfm (1), cb, (void *) (gpr_intptr) 4, gpr_time_0 (GPR_CLOCK_REALTIME), &closure_list); GPR_ASSERT (1 == grpc_alarm_check (tfm (2), NULL, &closure_list)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); GPR_ASSERT (1 == cb_called[4][1]); grpc_alarm_cancel (&alarms[0], &closure_list); grpc_alarm_cancel (&alarms[3], &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); GPR_ASSERT (1 == cb_called[0][0]); GPR_ASSERT (1 == cb_called[3][0]); grpc_alarm_list_shutdown (&closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); GPR_ASSERT (1 == cb_called[1][0]); GPR_ASSERT (1 == cb_called[2][0]); } diff --git a/test/core/iomgr/endpoint_pair_test.c b/test/core/iomgr/endpoint_pair_test.c index 2bc79301ea..9270f0772a 100644 --- a/test/core/iomgr/endpoint_pair_test.c +++ b/test/core/iomgr/endpoint_pair_test.c @@ -60,7 +60,7 @@ create_fixture_endpoint_pair (size_t slice_size) f.server_ep = p.server; grpc_endpoint_add_to_pollset (f.client_ep, &g_pollset, &closure_list); grpc_endpoint_add_to_pollset (f.server_ep, &g_pollset, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); return f; } @@ -86,7 +86,7 @@ main (int argc, char **argv) grpc_endpoint_tests (configs[0], &g_pollset); grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); grpc_shutdown (); return 0; diff --git a/test/core/iomgr/endpoint_tests.c b/test/core/iomgr/endpoint_tests.c index 32d08a7c6a..b1b5f71cb4 100644 --- a/test/core/iomgr/endpoint_tests.c +++ b/test/core/iomgr/endpoint_tests.c @@ -232,7 +232,7 @@ read_and_write_test (grpc_endpoint_test_config config, size_t num_bytes, size_t even when bytes_written is unsigned. */ state.bytes_written -= state.current_write_size; read_and_write_test_write_handler (&state, 1, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); grpc_endpoint_read (state.read_ep, &state.incoming, &state.done_read, &closure_list); @@ -243,7 +243,7 @@ read_and_write_test (grpc_endpoint_test_config config, size_t num_bytes, size_t gpr_log (GPR_DEBUG, "shutdown write"); grpc_endpoint_shutdown (state.write_ep, &closure_list); } - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (g_pollset)); while (!state.read_done || !state.write_done) @@ -253,14 +253,14 @@ read_and_write_test (grpc_endpoint_test_config config, size_t num_bytes, size_t grpc_pollset_work (g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list); } gpr_mu_unlock (GRPC_POLLSET_MU (g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); end_test (config); gpr_slice_buffer_destroy (&state.outgoing); gpr_slice_buffer_destroy (&state.incoming); grpc_endpoint_destroy (state.read_ep, &closure_list); grpc_endpoint_destroy (state.write_ep, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } void diff --git a/test/core/iomgr/fd_conservation_posix_test.c b/test/core/iomgr/fd_conservation_posix_test.c index 703edc660e..d742917dc1 100644 --- a/test/core/iomgr/fd_conservation_posix_test.c +++ b/test/core/iomgr/fd_conservation_posix_test.c @@ -61,7 +61,7 @@ main (int argc, char **argv) p = grpc_iomgr_create_endpoint_pair ("test", 1); grpc_endpoint_destroy (p.client, &closure_list); grpc_endpoint_destroy (p.server, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } grpc_iomgr_shutdown (); diff --git a/test/core/iomgr/fd_posix_test.c b/test/core/iomgr/fd_posix_test.c index 82d6206c86..fac2ad4e3b 100644 --- a/test/core/iomgr/fd_posix_test.c +++ b/test/core/iomgr/fd_posix_test.c @@ -285,7 +285,7 @@ server_wait_and_shutdown (server * sv) grpc_pollset_worker worker; grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); } gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); @@ -425,7 +425,7 @@ client_wait_and_shutdown (client * cl) grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); } gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); @@ -446,7 +446,7 @@ test_grpc_fd (void) port = server_start (&sv, &closure_list); client_init (&cl); client_start (&cl, port, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); client_wait_and_shutdown (&cl); server_wait_and_shutdown (&sv); GPR_ASSERT (sv.read_bytes_total == cl.write_bytes_total); @@ -540,7 +540,7 @@ test_grpc_fd_change (void) grpc_pollset_worker worker; grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); } GPR_ASSERT (a.cb_that_ran == first_read_callback); @@ -563,7 +563,7 @@ test_grpc_fd_change (void) grpc_pollset_worker worker; grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); } /* Except now we verify that second_read_callback ran instead */ @@ -571,7 +571,7 @@ test_grpc_fd_change (void) gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); grpc_fd_orphan (em_fd, NULL, "d", &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); destroy_change_data (&a); destroy_change_data (&b); close (sv[1]); @@ -595,7 +595,7 @@ main (int argc, char **argv) test_grpc_fd_change (); grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); grpc_iomgr_shutdown (); return 0; } diff --git a/test/core/iomgr/tcp_client_posix_test.c b/test/core/iomgr/tcp_client_posix_test.c index 6dcdf9ee25..519f8ceb95 100644 --- a/test/core/iomgr/tcp_client_posix_test.c +++ b/test/core/iomgr/tcp_client_posix_test.c @@ -134,7 +134,7 @@ test_succeeds (void) grpc_pollset_worker worker; grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); } @@ -171,7 +171,7 @@ test_fails (void) grpc_pollset_worker worker; grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), test_deadline (), &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); } @@ -257,7 +257,7 @@ test_times_out (void) } grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_MILLIS_TO_DEADLINE (10), &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); } gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); @@ -285,7 +285,7 @@ main (int argc, char **argv) grpc_pollset_set_init (&g_pollset_set); grpc_pollset_init (&g_pollset); grpc_pollset_set_add_pollset (&g_pollset_set, &g_pollset, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); test_succeeds (); gpr_log (GPR_ERROR, "End of first test"); test_fails (); @@ -293,7 +293,7 @@ main (int argc, char **argv) grpc_pollset_set_destroy (&g_pollset_set); grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); grpc_shutdown (); return 0; } diff --git a/test/core/iomgr/tcp_posix_test.c b/test/core/iomgr/tcp_posix_test.c index 168fc87d16..f1c4d4a353 100644 --- a/test/core/iomgr/tcp_posix_test.c +++ b/test/core/iomgr/tcp_posix_test.c @@ -216,7 +216,7 @@ read_test (size_t num_bytes, size_t slice_size) grpc_pollset_worker worker; grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); } GPR_ASSERT (state.read_bytes == state.target_read_bytes); @@ -224,7 +224,7 @@ read_test (size_t num_bytes, size_t slice_size) gpr_slice_buffer_destroy (&state.incoming); grpc_endpoint_destroy (ep, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } /* Write to a socket until it fills up, then read from it using the grpc_tcp @@ -263,7 +263,7 @@ large_read_test (size_t slice_size) grpc_pollset_worker worker; grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); } GPR_ASSERT (state.read_bytes == state.target_read_bytes); @@ -271,7 +271,7 @@ large_read_test (size_t slice_size) gpr_slice_buffer_destroy (&state.incoming); grpc_endpoint_destroy (ep, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } struct write_socket_state @@ -338,7 +338,7 @@ drain_socket_blocking (int fd, size_t num_bytes, size_t read_size) gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_MILLIS_TO_DEADLINE (10), &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); do { bytes_read = read (fd, buf, bytes_left > read_size ? read_size : bytes_left); @@ -405,7 +405,7 @@ write_test (size_t num_bytes, size_t slice_size) } grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); } gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); @@ -413,7 +413,7 @@ write_test (size_t num_bytes, size_t slice_size) gpr_slice_buffer_destroy (&outgoing); grpc_endpoint_destroy (ep, &closure_list); gpr_free (slices); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } void @@ -458,7 +458,7 @@ create_fixture_tcp_socketpair (size_t slice_size) grpc_endpoint_add_to_pollset (f.client_ep, &g_pollset, &closure_list); grpc_endpoint_add_to_pollset (f.server_ep, &g_pollset, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); return f; } @@ -485,7 +485,7 @@ main (int argc, char **argv) grpc_endpoint_tests (configs[0], &g_pollset); grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); grpc_shutdown (); return 0; diff --git a/test/core/iomgr/tcp_server_posix_test.c b/test/core/iomgr/tcp_server_posix_test.c index e59e45a8b2..4dbb7c9063 100644 --- a/test/core/iomgr/tcp_server_posix_test.c +++ b/test/core/iomgr/tcp_server_posix_test.c @@ -75,7 +75,7 @@ test_no_op_with_start (void) LOG_TEST ("test_no_op_with_start"); grpc_tcp_server_start (s, NULL, 0, on_connect, NULL, &closure_list); grpc_tcp_server_destroy (s, NULL, NULL); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -91,7 +91,7 @@ test_no_op_with_port (void) GPR_ASSERT (grpc_tcp_server_add_port (s, (struct sockaddr *) &addr, sizeof (addr))); grpc_tcp_server_destroy (s, NULL, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -109,7 +109,7 @@ test_no_op_with_port_and_start (void) grpc_tcp_server_start (s, NULL, 0, on_connect, NULL, &closure_list); grpc_tcp_server_destroy (s, NULL, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -157,7 +157,7 @@ test_connect (int n) grpc_pollset_worker worker; grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); } gpr_log (GPR_DEBUG, "wait done"); @@ -169,7 +169,7 @@ test_connect (int n) gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); grpc_tcp_server_destroy (s, NULL, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -196,7 +196,7 @@ main (int argc, char **argv) grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); grpc_iomgr_shutdown (); return 0; } diff --git a/test/core/iomgr/udp_server_test.c b/test/core/iomgr/udp_server_test.c index 86e84adb55..ac5c4f0d80 100644 --- a/test/core/iomgr/udp_server_test.c +++ b/test/core/iomgr/udp_server_test.c @@ -80,7 +80,7 @@ test_no_op_with_start (void) LOG_TEST ("test_no_op_with_start"); grpc_udp_server_start (s, NULL, 0, &closure_list); grpc_udp_server_destroy (s, NULL, NULL); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -112,7 +112,7 @@ test_no_op_with_port_and_start (void) grpc_udp_server_start (s, NULL, 0, &closure_list); grpc_udp_server_destroy (s, NULL, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -161,7 +161,7 @@ test_receive (int number_of_clients) grpc_pollset_worker worker; grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); } GPR_ASSERT (g_number_of_reads == number_of_reads_before + 1); @@ -198,7 +198,7 @@ main (int argc, char **argv) grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); grpc_iomgr_shutdown (); return 0; } diff --git a/test/core/iomgr/workqueue_test.c b/test/core/iomgr/workqueue_test.c index 7e0f336a0d..8497f09a52 100644 --- a/test/core/iomgr/workqueue_test.c +++ b/test/core/iomgr/workqueue_test.c @@ -68,11 +68,11 @@ test_add_closure (void) GPR_ASSERT (!done); grpc_pollset_work (&g_pollset, &worker, gpr_now (deadline.clock_type), deadline, &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); GPR_ASSERT (done); GRPC_WORKQUEUE_UNREF (wq, "destroy", &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -94,7 +94,7 @@ main (int argc, char **argv) grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); grpc_shutdown (); return 0; } diff --git a/test/core/security/credentials_test.c b/test/core/security/credentials_test.c index 3facb9556f..5e5b69f16c 100644 --- a/test/core/security/credentials_test.c +++ b/test/core/security/credentials_test.c @@ -309,7 +309,7 @@ test_google_iam_creds (void) GPR_ASSERT (grpc_credentials_has_request_metadata (creds)); GPR_ASSERT (grpc_credentials_has_request_metadata_only (creds)); grpc_credentials_get_request_metadata (creds, NULL, test_service_url, check_google_iam_metadata, creds, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -332,7 +332,7 @@ test_access_token_creds (void) GPR_ASSERT (grpc_credentials_has_request_metadata_only (creds)); GPR_ASSERT (strcmp (creds->type, GRPC_CREDENTIALS_TYPE_OAUTH2) == 0); grpc_credentials_get_request_metadata (creds, NULL, test_service_url, check_access_token_metadata, creds, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -366,7 +366,7 @@ test_ssl_oauth2_composite_creds (void) GPR_ASSERT (strcmp (creds_array->creds_array[0]->type, GRPC_CREDENTIALS_TYPE_SSL) == 0); GPR_ASSERT (strcmp (creds_array->creds_array[1]->type, GRPC_CREDENTIALS_TYPE_OAUTH2) == 0); grpc_credentials_get_request_metadata (composite_creds, NULL, test_service_url, check_ssl_oauth2_composite_metadata, composite_creds, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } void @@ -422,7 +422,7 @@ test_ssl_oauth2_google_iam_composite_creds (void) GPR_ASSERT (strcmp (creds_array->creds_array[1]->type, GRPC_CREDENTIALS_TYPE_OAUTH2) == 0); GPR_ASSERT (strcmp (creds_array->creds_array[2]->type, GRPC_CREDENTIALS_TYPE_IAM) == 0); grpc_credentials_get_request_metadata (composite_creds, NULL, test_service_url, check_ssl_oauth2_google_iam_composite_metadata, composite_creds, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -499,12 +499,12 @@ test_compute_engine_creds_success (void) /* First request: http get should be called. */ grpc_httpcli_set_override (compute_engine_httpcli_get_success_override, httpcli_post_should_not_be_called); grpc_credentials_get_request_metadata (compute_engine_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_success, (void *) test_user_data, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); /* Second request: the cached token should be served directly. */ grpc_httpcli_set_override (httpcli_get_should_not_be_called, httpcli_post_should_not_be_called); grpc_credentials_get_request_metadata (compute_engine_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_success, (void *) test_user_data, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); grpc_credentials_unref (compute_engine_creds); grpc_httpcli_set_override (NULL, NULL); @@ -521,7 +521,7 @@ test_compute_engine_creds_failure (void) grpc_credentials_get_request_metadata (compute_engine_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_failure, (void *) test_user_data, &closure_list); grpc_credentials_unref (compute_engine_creds); grpc_httpcli_set_override (NULL, NULL); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -573,16 +573,16 @@ test_refresh_token_creds_success (void) /* First request: http get should be called. */ grpc_httpcli_set_override (httpcli_get_should_not_be_called, refresh_token_httpcli_post_success); grpc_credentials_get_request_metadata (refresh_token_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_success, (void *) test_user_data, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); /* Second request: the cached token should be served directly. */ grpc_httpcli_set_override (httpcli_get_should_not_be_called, httpcli_post_should_not_be_called); grpc_credentials_get_request_metadata (refresh_token_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_success, (void *) test_user_data, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); grpc_credentials_unref (refresh_token_creds); grpc_httpcli_set_override (NULL, NULL); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -597,7 +597,7 @@ test_refresh_token_creds_failure (void) grpc_credentials_get_request_metadata (refresh_token_creds, NULL, test_service_url, on_oauth2_creds_get_metadata_failure, (void *) test_user_data, &closure_list); grpc_credentials_unref (refresh_token_creds); grpc_httpcli_set_override (NULL, NULL); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -670,18 +670,18 @@ test_jwt_creds_success (void) /* First request: jwt_encode_and_sign should be called. */ grpc_jwt_encode_and_sign_set_override (encode_and_sign_jwt_success); grpc_credentials_get_request_metadata (jwt_creds, NULL, test_service_url, on_jwt_creds_get_metadata_success, (void *) test_user_data, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); /* Second request: the cached token should be served directly. */ grpc_jwt_encode_and_sign_set_override (encode_and_sign_jwt_should_not_be_called); grpc_credentials_get_request_metadata (jwt_creds, NULL, test_service_url, on_jwt_creds_get_metadata_success, (void *) test_user_data, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); /* Third request: Different service url so jwt_encode_and_sign should be called again (no caching). */ grpc_jwt_encode_and_sign_set_override (encode_and_sign_jwt_success); grpc_credentials_get_request_metadata (jwt_creds, NULL, other_test_service_url, on_jwt_creds_get_metadata_success, (void *) test_user_data, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_free (json_key_string); grpc_credentials_unref (jwt_creds); @@ -703,7 +703,7 @@ test_jwt_creds_signing_failure (void) gpr_free (json_key_string); grpc_credentials_unref (jwt_creds); grpc_jwt_encode_and_sign_set_override (NULL); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -858,7 +858,7 @@ test_metadata_plugin_success (void) GPR_ASSERT (state == PLUGIN_GET_METADATA_CALLED_STATE); grpc_credentials_release (creds); GPR_ASSERT (state == PLUGIN_DESTROY_CALLED_STATE); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -879,7 +879,7 @@ test_metadata_plugin_failure (void) GPR_ASSERT (state == PLUGIN_GET_METADATA_CALLED_STATE); grpc_credentials_release (creds); GPR_ASSERT (state == PLUGIN_DESTROY_CALLED_STATE); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } int diff --git a/test/core/security/jwt_verifier_test.c b/test/core/security/jwt_verifier_test.c index 8832dca817..2883cf858b 100644 --- a/test/core/security/jwt_verifier_test.c +++ b/test/core/security/jwt_verifier_test.c @@ -236,7 +236,7 @@ test_jwt_verifier_google_email_issuer_success (void) gpr_free (jwt); grpc_jwt_verifier_destroy (verifier); grpc_httpcli_set_override (NULL, NULL); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static int @@ -269,7 +269,7 @@ test_jwt_verifier_custom_email_issuer_success (void) gpr_free (jwt); grpc_jwt_verifier_destroy (verifier); grpc_httpcli_set_override (NULL, NULL); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static int @@ -315,7 +315,7 @@ test_jwt_verifier_url_issuer_success (void) gpr_free (jwt); grpc_jwt_verifier_destroy (verifier); grpc_httpcli_set_override (NULL, NULL); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -354,7 +354,7 @@ test_jwt_verifier_url_issuer_bad_config (void) gpr_free (jwt); grpc_jwt_verifier_destroy (verifier); grpc_httpcli_set_override (NULL, NULL); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -375,7 +375,7 @@ test_jwt_verifier_bad_json_key (void) gpr_free (jwt); grpc_jwt_verifier_destroy (verifier); grpc_httpcli_set_override (NULL, NULL); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static void @@ -423,7 +423,7 @@ test_jwt_verifier_bad_signature (void) gpr_free (jwt); grpc_jwt_verifier_destroy (verifier); grpc_httpcli_set_override (NULL, NULL); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } static int @@ -450,7 +450,7 @@ test_jwt_verifier_bad_format (void) grpc_jwt_verifier_verify (verifier, NULL, "bad jwt", expected_audience, on_verification_bad_format, (void *) expected_user_data, &closure_list); grpc_jwt_verifier_destroy (verifier); grpc_httpcli_set_override (NULL, NULL); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } /* find verification key: bad jks, cannot find key in jks */ diff --git a/test/core/security/oauth2_utils.c b/test/core/security/oauth2_utils.c index 9035557a41..f096fa9ca8 100644 --- a/test/core/security/oauth2_utils.c +++ b/test/core/security/oauth2_utils.c @@ -94,7 +94,7 @@ grpc_test_fetch_oauth2_token_with_credentials (grpc_credentials * creds) grpc_credentials_get_request_metadata (creds, &request.pollset, "", on_oauth2_response, &request, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&request.pollset)); while (!request.is_done) @@ -105,7 +105,7 @@ grpc_test_fetch_oauth2_token_with_credentials (grpc_credentials * creds) gpr_mu_unlock (GRPC_POLLSET_MU (&request.pollset)); grpc_pollset_shutdown (&request.pollset, &do_nothing_closure, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); grpc_pollset_destroy (&request.pollset); return request.token; } diff --git a/test/core/security/print_google_default_creds_token.c b/test/core/security/print_google_default_creds_token.c index 3f6720b6ea..51a0968a20 100644 --- a/test/core/security/print_google_default_creds_token.c +++ b/test/core/security/print_google_default_creds_token.c @@ -105,7 +105,7 @@ main (int argc, char **argv) grpc_pollset_worker worker; grpc_pollset_work (&sync.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&sync.pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&sync.pollset)); } gpr_mu_unlock (GRPC_POLLSET_MU (&sync.pollset)); diff --git a/test/core/security/secure_endpoint_test.c b/test/core/security/secure_endpoint_test.c index 595e84c8b1..bd760320cc 100644 --- a/test/core/security/secure_endpoint_test.c +++ b/test/core/security/secure_endpoint_test.c @@ -110,7 +110,7 @@ secure_endpoint_create_fixture_tcp_socketpair (size_t slice_size, gpr_slice * le } f.server_ep = grpc_secure_endpoint_create (fake_write_protector, tcp.server, NULL, 0); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); return f; } @@ -162,7 +162,7 @@ test_leftover (grpc_endpoint_test_config config, size_t slice_size) gpr_slice_buffer_init (&incoming); grpc_closure_init (&done_closure, inc_call_ctr, &n); grpc_endpoint_read (f.client_ep, &incoming, &done_closure, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); GPR_ASSERT (n == 1); GPR_ASSERT (incoming.count == 1); GPR_ASSERT (0 == gpr_slice_cmp (s, incoming.slices[0])); @@ -171,7 +171,7 @@ test_leftover (grpc_endpoint_test_config config, size_t slice_size) grpc_endpoint_shutdown (f.server_ep, &closure_list); grpc_endpoint_destroy (f.client_ep, &closure_list); grpc_endpoint_destroy (f.server_ep, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_slice_unref (s); gpr_slice_buffer_destroy (&incoming); @@ -197,7 +197,7 @@ main (int argc, char **argv) test_leftover (configs[1], 1); grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); grpc_shutdown (); return 0; diff --git a/test/core/security/verify_jwt.c b/test/core/security/verify_jwt.c index fd8aaeb484..d7d261299e 100644 --- a/test/core/security/verify_jwt.c +++ b/test/core/security/verify_jwt.c @@ -121,7 +121,7 @@ main (int argc, char **argv) grpc_pollset_worker worker; grpc_pollset_work (&sync.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&sync.pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&sync.pollset)); } gpr_mu_unlock (GRPC_POLLSET_MU (&sync.pollset)); diff --git a/test/core/surface/completion_queue_test.c b/test/core/surface/completion_queue_test.c index 48f1122242..fa959402f0 100644 --- a/test/core/surface/completion_queue_test.c +++ b/test/core/surface/completion_queue_test.c @@ -244,7 +244,7 @@ producer_thread (void *arg) { grpc_cq_end_op (opt->cc, (void *) (gpr_intptr) 1, 1, free_completion, NULL, gpr_malloc (sizeof (grpc_cq_completion)), &closure_list); opt->events_triggered++; - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } gpr_log (GPR_INFO, "producer %d phase 2 done", opt->id); diff --git a/test/core/util/port_posix.c b/test/core/util/port_posix.c index a1893375ec..8403d4a131 100644 --- a/test/core/util/port_posix.c +++ b/test/core/util/port_posix.c @@ -126,9 +126,9 @@ free_port_using_server (char *server, int port) gpr_mu_unlock (GRPC_POLLSET_MU (&pr.pollset)); grpc_httpcli_context_destroy (&context); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); grpc_pollset_shutdown (&pr.pollset, &shutdown_closure, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_free (path); } @@ -288,7 +288,7 @@ pick_port_using_server (char *server) grpc_httpcli_context_init (&context); grpc_httpcli_get (&context, &pr.pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (10), got_port_from_server, &pr, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&pr.pollset)); while (pr.port == -1) { @@ -299,7 +299,7 @@ pick_port_using_server (char *server) grpc_httpcli_context_destroy (&context); grpc_pollset_shutdown (&pr.pollset, &shutdown_closure, &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); return pr.port; } diff --git a/test/core/util/reconnect_server.c b/test/core/util/reconnect_server.c index f3a7df1f69..d5ebb8dac3 100644 --- a/test/core/util/reconnect_server.c +++ b/test/core/util/reconnect_server.c @@ -143,7 +143,7 @@ reconnect_server_start (reconnect_server * server, int port) grpc_tcp_server_start (server->tcp_server, server->pollsets, 1, on_connect, server, &closure_list); gpr_log (GPR_INFO, "reconnect tcp server listening on 0.0.0.0:%d", port); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } void @@ -156,7 +156,7 @@ reconnect_server_poll (reconnect_server * server, int seconds) gpr_mu_lock (GRPC_POLLSET_MU (&server->pollset)); grpc_pollset_work (&server->pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list); gpr_mu_unlock (GRPC_POLLSET_MU (&server->pollset)); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); } void @@ -189,7 +189,7 @@ reconnect_server_destroy (reconnect_server * server) grpc_tcp_server_destroy (server->tcp_server, &do_nothing_closure[0], &closure_list); reconnect_server_clear_timestamps (server); grpc_pollset_shutdown (&server->pollset, &do_nothing_closure[1], &closure_list); - grpc_closure_list_run (&closure_list); + grpc_exec_ctx_finish (&exec_ctx); grpc_pollset_destroy (&server->pollset); grpc_shutdown (); } |