diff options
Diffstat (limited to 'test/core/iomgr/tcp_client_posix_test.c')
| -rw-r--r-- | test/core/iomgr/tcp_client_posix_test.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/core/iomgr/tcp_client_posix_test.c b/test/core/iomgr/tcp_client_posix_test.c index 3ddae66b70..7ce85b7403 100644 --- a/test/core/iomgr/tcp_client_posix_test.c +++ b/test/core/iomgr/tcp_client_posix_test.c @@ -115,7 +115,7 @@ test_succeeds (void) /* connect to it */ GPR_ASSERT (getsockname (svr_fd, (struct sockaddr *) &addr, &addr_len) == 0); grpc_closure_init (&done, must_succeed, NULL); - grpc_tcp_client_connect (&done, &g_connecting, &g_pollset_set, (struct sockaddr *) &addr, addr_len, gpr_inf_future (GPR_CLOCK_REALTIME), &closure_list); + grpc_tcp_client_connect (&done, &g_connecting, &g_pollset_set, (struct sockaddr *) &addr, addr_len, gpr_inf_future (&exec_ctx, GPR_CLOCK_REALTIME)); /* await the connection */ do @@ -132,7 +132,7 @@ test_succeeds (void) while (g_connections_complete == connections_complete_before) { grpc_pollset_worker worker; - grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (5), &closure_list); + grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (&exec_ctx, 5)); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); @@ -161,7 +161,7 @@ test_fails (void) /* connect to a broken address */ grpc_closure_init (&done, must_fail, NULL); - grpc_tcp_client_connect (&done, &g_connecting, &g_pollset_set, (struct sockaddr *) &addr, addr_len, gpr_inf_future (GPR_CLOCK_REALTIME), &closure_list); + grpc_tcp_client_connect (&done, &g_connecting, &g_pollset_set, (struct sockaddr *) &addr, addr_len, gpr_inf_future (&exec_ctx, GPR_CLOCK_REALTIME)); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); @@ -169,7 +169,7 @@ test_fails (void) while (g_connections_complete == connections_complete_before) { grpc_pollset_worker worker; - grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), test_deadline (), &closure_list); + grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), test_deadline (&exec_ctx, )); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); @@ -229,7 +229,7 @@ test_times_out (void) gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); grpc_closure_init (&done, must_fail, NULL); - grpc_tcp_client_connect (&done, &g_connecting, &g_pollset_set, (struct sockaddr *) &addr, addr_len, connect_deadline, &closure_list); + grpc_tcp_client_connect (&done, &g_connecting, &g_pollset_set, (&exec_ctx, struct sockaddr *) &addr, addr_len, connect_deadline); /* Make sure the event doesn't trigger early */ gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); @@ -255,7 +255,7 @@ test_times_out (void) { GPR_ASSERT (g_connections_complete == connections_complete_before + is_after_deadline); } - grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_MILLIS_TO_DEADLINE (10), &closure_list); + grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_MILLIS_TO_DEADLINE (&exec_ctx, 10)); gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset)); grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); @@ -284,7 +284,7 @@ main (int argc, char **argv) grpc_init (); 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_pollset_set_add_pollset (&exec_ctx, &g_pollset_set, &g_pollset); grpc_exec_ctx_finish (&exec_ctx); test_succeeds (); gpr_log (GPR_ERROR, "End of first test"); @@ -292,7 +292,7 @@ main (int argc, char **argv) test_times_out (); grpc_pollset_set_destroy (&g_pollset_set); grpc_closure_init (&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown (&g_pollset, &destroyed, &closure_list); + grpc_pollset_shutdown (&exec_ctx, &g_pollset, &destroyed); grpc_exec_ctx_finish (&exec_ctx); grpc_shutdown (); return 0; |