aboutsummaryrefslogtreecommitdiffhomepage
path: root/test/core/iomgr
diff options
context:
space:
mode:
Diffstat (limited to 'test/core/iomgr')
-rw-r--r--test/core/iomgr/alarm_list_test.c28
-rw-r--r--test/core/iomgr/endpoint_pair_test.c6
-rw-r--r--test/core/iomgr/endpoint_tests.c14
-rw-r--r--test/core/iomgr/fd_conservation_posix_test.c4
-rw-r--r--test/core/iomgr/fd_posix_test.c22
-rw-r--r--test/core/iomgr/tcp_client_posix_test.c16
-rw-r--r--test/core/iomgr/tcp_posix_test.c32
-rw-r--r--test/core/iomgr/tcp_server_posix_test.c16
-rw-r--r--test/core/iomgr/udp_server_test.c12
-rw-r--r--test/core/iomgr/workqueue_test.c8
10 files changed, 79 insertions, 79 deletions
diff --git a/test/core/iomgr/alarm_list_test.c b/test/core/iomgr/alarm_list_test.c
index cfb079920c..0696359f4f 100644
--- a/test/core/iomgr/alarm_list_test.c
+++ b/test/core/iomgr/alarm_list_test.c
@@ -63,17 +63,17 @@ add_test (void)
/* 10 ms alarms. will expire in the current epoch */
for (i = 0; i < 10; i++)
{
- grpc_alarm_init (&alarms[i], gpr_time_add (start, gpr_time_from_millis (10, GPR_TIMESPAN)), cb, (void *) (gpr_intptr) i, start, &closure_list);
+ grpc_alarm_init (&alarms[i], gpr_time_add (start, gpr_time_from_millis (10, GPR_TIMESPAN)), cb, (void *) (&exec_ctx, gpr_intptr) i, start);
}
/* 1010 ms alarms. will expire in the next epoch */
for (i = 10; i < 20; i++)
{
- grpc_alarm_init (&alarms[i], gpr_time_add (start, gpr_time_from_millis (1010, GPR_TIMESPAN)), cb, (void *) (gpr_intptr) i, start, &closure_list);
+ grpc_alarm_init (&alarms[i], gpr_time_add (start, gpr_time_from_millis (1010, GPR_TIMESPAN)), cb, (void *) (&exec_ctx, gpr_intptr) i, start);
}
/* 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));
+ GPR_ASSERT (10 == grpc_alarm_check (gpr_time_add (start, gpr_time_from_millis (&exec_ctx, 500, GPR_TIMESPAN)), NULL));
grpc_exec_ctx_finish (&exec_ctx);
for (i = 0; i < 20; i++)
{
@@ -81,7 +81,7 @@ add_test (void)
GPR_ASSERT (cb_called[i][0] == 0);
}
- GPR_ASSERT (0 == grpc_alarm_check (gpr_time_add (start, gpr_time_from_millis (600, GPR_TIMESPAN)), NULL, &closure_list));
+ GPR_ASSERT (0 == grpc_alarm_check (gpr_time_add (start, gpr_time_from_millis (&exec_ctx, 600, GPR_TIMESPAN)), NULL));
grpc_exec_ctx_finish (&exec_ctx);
for (i = 0; i < 30; i++)
{
@@ -90,7 +90,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));
+ GPR_ASSERT (10 == grpc_alarm_check (gpr_time_add (start, gpr_time_from_millis (&exec_ctx, 1500, GPR_TIMESPAN)), NULL));
grpc_exec_ctx_finish (&exec_ctx);
for (i = 0; i < 30; i++)
{
@@ -98,7 +98,7 @@ add_test (void)
GPR_ASSERT (cb_called[i][0] == 0);
}
- GPR_ASSERT (0 == grpc_alarm_check (gpr_time_add (start, gpr_time_from_millis (1600, GPR_TIMESPAN)), NULL, &closure_list));
+ GPR_ASSERT (0 == grpc_alarm_check (gpr_time_add (start, gpr_time_from_millis (&exec_ctx, 1600, GPR_TIMESPAN)), NULL));
for (i = 0; i < 30; i++)
{
GPR_ASSERT (cb_called[i][1] == (i < 20));
@@ -127,16 +127,16 @@ destruction_test (void)
grpc_alarm_list_init (gpr_time_0 (GPR_CLOCK_REALTIME));
memset (cb_called, 0, sizeof (cb_called));
- grpc_alarm_init (&alarms[0], tfm (100), cb, (void *) (gpr_intptr) 0, gpr_time_0 (GPR_CLOCK_REALTIME), &closure_list);
- grpc_alarm_init (&alarms[1], tfm (3), cb, (void *) (gpr_intptr) 1, gpr_time_0 (GPR_CLOCK_REALTIME), &closure_list);
- grpc_alarm_init (&alarms[2], tfm (100), cb, (void *) (gpr_intptr) 2, gpr_time_0 (GPR_CLOCK_REALTIME), &closure_list);
- 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_alarm_init (&alarms[0], tfm (100), cb, (void *) (gpr_intptr) 0, gpr_time_0 (&exec_ctx, GPR_CLOCK_REALTIME));
+ grpc_alarm_init (&alarms[1], tfm (3), cb, (void *) (gpr_intptr) 1, gpr_time_0 (&exec_ctx, GPR_CLOCK_REALTIME));
+ grpc_alarm_init (&alarms[2], tfm (100), cb, (void *) (gpr_intptr) 2, gpr_time_0 (&exec_ctx, GPR_CLOCK_REALTIME));
+ grpc_alarm_init (&alarms[3], tfm (3), cb, (void *) (gpr_intptr) 3, gpr_time_0 (&exec_ctx, GPR_CLOCK_REALTIME));
+ grpc_alarm_init (&alarms[4], tfm (1), cb, (void *) (gpr_intptr) 4, gpr_time_0 (&exec_ctx, GPR_CLOCK_REALTIME));
+ GPR_ASSERT (1 == grpc_alarm_check (tfm (&exec_ctx, 2), NULL));
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_alarm_cancel (&exec_ctx, &alarms[0]);
+ grpc_alarm_cancel (&exec_ctx, &alarms[3]);
grpc_exec_ctx_finish (&exec_ctx);
GPR_ASSERT (1 == cb_called[0][0]);
GPR_ASSERT (1 == cb_called[3][0]);
diff --git a/test/core/iomgr/endpoint_pair_test.c b/test/core/iomgr/endpoint_pair_test.c
index fe15b47f73..5f1e3600dd 100644
--- a/test/core/iomgr/endpoint_pair_test.c
+++ b/test/core/iomgr/endpoint_pair_test.c
@@ -58,8 +58,8 @@ create_fixture_endpoint_pair (size_t slice_size)
f.client_ep = p.client;
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_endpoint_add_to_pollset (&exec_ctx, f.client_ep, &g_pollset);
+ grpc_endpoint_add_to_pollset (&exec_ctx, f.server_ep, &g_pollset);
grpc_exec_ctx_finish (&exec_ctx);
return f;
@@ -85,7 +85,7 @@ main (int argc, char **argv)
grpc_pollset_init (&g_pollset);
grpc_endpoint_tests (configs[0], &g_pollset);
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 ();
diff --git a/test/core/iomgr/endpoint_tests.c b/test/core/iomgr/endpoint_tests.c
index 8cc27a885b..49b6d79271 100644
--- a/test/core/iomgr/endpoint_tests.c
+++ b/test/core/iomgr/endpoint_tests.c
@@ -231,17 +231,17 @@ read_and_write_test (grpc_endpoint_test_config config, size_t num_bytes, size_t
for the first iteration as for later iterations. It does the right thing
even when bytes_written is unsigned. */
state.bytes_written -= state.current_write_size;
- read_and_write_test_write_handler (&state, 1, &closure_list);
+ read_and_write_test_write_handler (&exec_ctx, &state, 1);
grpc_exec_ctx_finish (&exec_ctx);
- grpc_endpoint_read (state.read_ep, &state.incoming, &state.done_read, &closure_list);
+ grpc_endpoint_read (&exec_ctx, state.read_ep, &state.incoming, &state.done_read);
if (shutdown)
{
gpr_log (GPR_DEBUG, "shutdown read");
- grpc_endpoint_shutdown (state.read_ep, &closure_list);
+ grpc_endpoint_shutdown (&exec_ctx, state.read_ep);
gpr_log (GPR_DEBUG, "shutdown write");
- grpc_endpoint_shutdown (state.write_ep, &closure_list);
+ grpc_endpoint_shutdown (&exec_ctx, state.write_ep);
}
grpc_exec_ctx_finish (&exec_ctx);
@@ -250,7 +250,7 @@ read_and_write_test (grpc_endpoint_test_config config, size_t num_bytes, size_t
{
grpc_pollset_worker worker;
GPR_ASSERT (gpr_time_cmp (gpr_now (GPR_CLOCK_MONOTONIC), deadline) < 0);
- grpc_pollset_work (g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list);
+ grpc_pollset_work (g_pollset, &worker, gpr_now (&exec_ctx, GPR_CLOCK_MONOTONIC), deadline);
}
gpr_mu_unlock (GRPC_POLLSET_MU (g_pollset));
grpc_exec_ctx_finish (&exec_ctx);
@@ -258,8 +258,8 @@ read_and_write_test (grpc_endpoint_test_config config, size_t num_bytes, size_t
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_endpoint_destroy (&exec_ctx, state.read_ep);
+ grpc_endpoint_destroy (&exec_ctx, state.write_ep);
grpc_exec_ctx_finish (&exec_ctx);
}
diff --git a/test/core/iomgr/fd_conservation_posix_test.c b/test/core/iomgr/fd_conservation_posix_test.c
index 4f6b290e4d..b0fbd78ca0 100644
--- a/test/core/iomgr/fd_conservation_posix_test.c
+++ b/test/core/iomgr/fd_conservation_posix_test.c
@@ -59,8 +59,8 @@ main (int argc, char **argv)
{
grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
p = grpc_iomgr_create_endpoint_pair ("test", 1);
- grpc_endpoint_destroy (p.client, &closure_list);
- grpc_endpoint_destroy (p.server, &closure_list);
+ grpc_endpoint_destroy (&exec_ctx, p.client);
+ grpc_endpoint_destroy (&exec_ctx, p.server);
grpc_exec_ctx_finish (&exec_ctx);
}
diff --git a/test/core/iomgr/fd_posix_test.c b/test/core/iomgr/fd_posix_test.c
index a0b060aa25..8b76e0dc6d 100644
--- a/test/core/iomgr/fd_posix_test.c
+++ b/test/core/iomgr/fd_posix_test.c
@@ -283,7 +283,7 @@ server_wait_and_shutdown (server * sv)
{
grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
grpc_pollset_worker worker;
- grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list);
+ grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (&exec_ctx, GPR_CLOCK_MONOTONIC));
gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset));
grpc_exec_ctx_finish (&exec_ctx);
gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset));
@@ -423,7 +423,7 @@ client_wait_and_shutdown (client * cl)
{
grpc_pollset_worker worker;
grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
- grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list);
+ grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (&exec_ctx, GPR_CLOCK_MONOTONIC));
gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset));
grpc_exec_ctx_finish (&exec_ctx);
gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset));
@@ -443,9 +443,9 @@ test_grpc_fd (void)
grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
server_init (&sv);
- port = server_start (&sv, &closure_list);
+ port = server_start (&exec_ctx, &sv);
client_init (&cl);
- client_start (&cl, port, &closure_list);
+ client_start (&exec_ctx, &cl, port);
grpc_exec_ctx_finish (&exec_ctx);
client_wait_and_shutdown (&cl);
server_wait_and_shutdown (&sv);
@@ -525,10 +525,10 @@ test_grpc_fd_change (void)
GPR_ASSERT (fcntl (sv[1], F_SETFL, flags | O_NONBLOCK) == 0);
em_fd = grpc_fd_create (sv[0], "test_grpc_fd_change");
- grpc_pollset_add_fd (&g_pollset, em_fd, &closure_list);
+ grpc_pollset_add_fd (&exec_ctx, &g_pollset, em_fd);
/* Register the first callback, then make its FD readable */
- grpc_fd_notify_on_read (em_fd, &first_closure, &closure_list);
+ grpc_fd_notify_on_read (&exec_ctx, em_fd, &first_closure);
data = 0;
result = write (sv[1], &data, 1);
GPR_ASSERT (result == 1);
@@ -538,7 +538,7 @@ test_grpc_fd_change (void)
while (a.cb_that_ran == NULL)
{
grpc_pollset_worker worker;
- grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list);
+ grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (&exec_ctx, GPR_CLOCK_MONOTONIC));
gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset));
grpc_exec_ctx_finish (&exec_ctx);
gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset));
@@ -552,7 +552,7 @@ test_grpc_fd_change (void)
/* Now register a second callback with distinct change data, and do the same
thing again. */
- grpc_fd_notify_on_read (em_fd, &second_closure, &closure_list);
+ grpc_fd_notify_on_read (&exec_ctx, em_fd, &second_closure);
data = 0;
result = write (sv[1], &data, 1);
GPR_ASSERT (result == 1);
@@ -561,7 +561,7 @@ test_grpc_fd_change (void)
while (b.cb_that_ran == NULL)
{
grpc_pollset_worker worker;
- grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (GPR_CLOCK_MONOTONIC), &closure_list);
+ grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), gpr_inf_future (&exec_ctx, GPR_CLOCK_MONOTONIC));
gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset));
grpc_exec_ctx_finish (&exec_ctx);
gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset));
@@ -570,7 +570,7 @@ test_grpc_fd_change (void)
GPR_ASSERT (b.cb_that_ran == second_read_callback);
gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset));
- grpc_fd_orphan (em_fd, NULL, "d", &closure_list);
+ grpc_fd_orphan (&exec_ctx, em_fd, NULL, "d");
grpc_exec_ctx_finish (&exec_ctx);
destroy_change_data (&a);
destroy_change_data (&b);
@@ -594,7 +594,7 @@ main (int argc, char **argv)
test_grpc_fd ();
test_grpc_fd_change ();
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_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 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;
diff --git a/test/core/iomgr/tcp_posix_test.c b/test/core/iomgr/tcp_posix_test.c
index aa8669312b..2ed6157479 100644
--- a/test/core/iomgr/tcp_posix_test.c
+++ b/test/core/iomgr/tcp_posix_test.c
@@ -197,7 +197,7 @@ read_test (size_t num_bytes, size_t slice_size)
create_sockets (sv);
ep = grpc_tcp_create (grpc_fd_create (sv[1], "read_test"), slice_size, "test");
- grpc_endpoint_add_to_pollset (ep, &g_pollset, &closure_list);
+ grpc_endpoint_add_to_pollset (&exec_ctx, ep, &g_pollset);
written_bytes = fill_socket_partial (sv[0], num_bytes);
gpr_log (GPR_INFO, "Wrote %d bytes", written_bytes);
@@ -208,13 +208,13 @@ read_test (size_t num_bytes, size_t slice_size)
gpr_slice_buffer_init (&state.incoming);
grpc_closure_init (&state.read_cb, read_cb, &state);
- grpc_endpoint_read (ep, &state.incoming, &state.read_cb, &closure_list);
+ grpc_endpoint_read (&exec_ctx, ep, &state.incoming, &state.read_cb);
gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset));
while (state.read_bytes < state.target_read_bytes)
{
grpc_pollset_worker worker;
- grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list);
+ grpc_pollset_work (&g_pollset, &worker, gpr_now (&exec_ctx, GPR_CLOCK_MONOTONIC), deadline);
gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset));
grpc_exec_ctx_finish (&exec_ctx);
gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset));
@@ -223,7 +223,7 @@ read_test (size_t num_bytes, size_t slice_size)
gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset));
gpr_slice_buffer_destroy (&state.incoming);
- grpc_endpoint_destroy (ep, &closure_list);
+ grpc_endpoint_destroy (&exec_ctx, ep);
grpc_exec_ctx_finish (&exec_ctx);
}
@@ -244,7 +244,7 @@ large_read_test (size_t slice_size)
create_sockets (sv);
ep = grpc_tcp_create (grpc_fd_create (sv[1], "large_read_test"), slice_size, "test");
- grpc_endpoint_add_to_pollset (ep, &g_pollset, &closure_list);
+ grpc_endpoint_add_to_pollset (&exec_ctx, ep, &g_pollset);
written_bytes = fill_socket (sv[0]);
gpr_log (GPR_INFO, "Wrote %d bytes", written_bytes);
@@ -255,13 +255,13 @@ large_read_test (size_t slice_size)
gpr_slice_buffer_init (&state.incoming);
grpc_closure_init (&state.read_cb, read_cb, &state);
- grpc_endpoint_read (ep, &state.incoming, &state.read_cb, &closure_list);
+ grpc_endpoint_read (&exec_ctx, ep, &state.incoming, &state.read_cb);
gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset));
while (state.read_bytes < state.target_read_bytes)
{
grpc_pollset_worker worker;
- grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list);
+ grpc_pollset_work (&g_pollset, &worker, gpr_now (&exec_ctx, GPR_CLOCK_MONOTONIC), deadline);
gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset));
grpc_exec_ctx_finish (&exec_ctx);
gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset));
@@ -270,7 +270,7 @@ large_read_test (size_t slice_size)
gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset));
gpr_slice_buffer_destroy (&state.incoming);
- grpc_endpoint_destroy (ep, &closure_list);
+ grpc_endpoint_destroy (&exec_ctx, ep);
grpc_exec_ctx_finish (&exec_ctx);
}
@@ -336,7 +336,7 @@ drain_socket_blocking (int fd, size_t num_bytes, size_t read_size)
{
grpc_pollset_worker worker;
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);
+ 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);
do
@@ -382,7 +382,7 @@ write_test (size_t num_bytes, size_t slice_size)
create_sockets (sv);
ep = grpc_tcp_create (grpc_fd_create (sv[1], "write_test"), GRPC_TCP_DEFAULT_READ_SLICE_SIZE, "test");
- grpc_endpoint_add_to_pollset (ep, &g_pollset, &closure_list);
+ grpc_endpoint_add_to_pollset (&exec_ctx, ep, &g_pollset);
state.ep = ep;
state.write_done = 0;
@@ -393,7 +393,7 @@ write_test (size_t num_bytes, size_t slice_size)
gpr_slice_buffer_addn (&outgoing, slices, num_blocks);
grpc_closure_init (&write_done_closure, write_done, &state);
- grpc_endpoint_write (ep, &outgoing, &write_done_closure, &closure_list);
+ grpc_endpoint_write (&exec_ctx, ep, &outgoing, &write_done_closure);
drain_socket_blocking (sv[0], num_bytes, num_bytes);
gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset));
for (;;)
@@ -403,7 +403,7 @@ write_test (size_t num_bytes, size_t slice_size)
{
break;
}
- grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list);
+ grpc_pollset_work (&g_pollset, &worker, gpr_now (&exec_ctx, GPR_CLOCK_MONOTONIC), deadline);
gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset));
grpc_exec_ctx_finish (&exec_ctx);
gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset));
@@ -411,7 +411,7 @@ write_test (size_t num_bytes, size_t slice_size)
gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset));
gpr_slice_buffer_destroy (&outgoing);
- grpc_endpoint_destroy (ep, &closure_list);
+ grpc_endpoint_destroy (&exec_ctx, ep);
gpr_free (slices);
grpc_exec_ctx_finish (&exec_ctx);
}
@@ -455,8 +455,8 @@ create_fixture_tcp_socketpair (size_t slice_size)
create_sockets (sv);
f.client_ep = grpc_tcp_create (grpc_fd_create (sv[0], "fixture:client"), slice_size, "test");
f.server_ep = grpc_tcp_create (grpc_fd_create (sv[1], "fixture:server"), slice_size, "test");
- 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_endpoint_add_to_pollset (&exec_ctx, f.client_ep, &g_pollset);
+ grpc_endpoint_add_to_pollset (&exec_ctx, f.server_ep, &g_pollset);
grpc_exec_ctx_finish (&exec_ctx);
@@ -484,7 +484,7 @@ main (int argc, char **argv)
run_tests ();
grpc_endpoint_tests (configs[0], &g_pollset);
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 ();
diff --git a/test/core/iomgr/tcp_server_posix_test.c b/test/core/iomgr/tcp_server_posix_test.c
index 755158bcdf..1ccc31faf7 100644
--- a/test/core/iomgr/tcp_server_posix_test.c
+++ b/test/core/iomgr/tcp_server_posix_test.c
@@ -73,7 +73,7 @@ test_no_op_with_start (void)
grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
grpc_tcp_server *s = grpc_tcp_server_create ();
LOG_TEST ("test_no_op_with_start");
- grpc_tcp_server_start (s, NULL, 0, on_connect, NULL, &closure_list);
+ grpc_tcp_server_start (&exec_ctx, s, NULL, 0, on_connect, NULL);
grpc_tcp_server_destroy (s, NULL, NULL);
grpc_exec_ctx_finish (&exec_ctx);
}
@@ -90,7 +90,7 @@ test_no_op_with_port (void)
addr.sin_family = AF_INET;
GPR_ASSERT (grpc_tcp_server_add_port (s, (struct sockaddr *) &addr, sizeof (addr)));
- grpc_tcp_server_destroy (s, NULL, &closure_list);
+ grpc_tcp_server_destroy (&exec_ctx, s, NULL);
grpc_exec_ctx_finish (&exec_ctx);
}
@@ -106,9 +106,9 @@ test_no_op_with_port_and_start (void)
addr.sin_family = AF_INET;
GPR_ASSERT (grpc_tcp_server_add_port (s, (struct sockaddr *) &addr, sizeof (addr)));
- grpc_tcp_server_start (s, NULL, 0, on_connect, NULL, &closure_list);
+ grpc_tcp_server_start (&exec_ctx, s, NULL, 0, on_connect, NULL);
- grpc_tcp_server_destroy (s, NULL, &closure_list);
+ grpc_tcp_server_destroy (&exec_ctx, s, NULL);
grpc_exec_ctx_finish (&exec_ctx);
}
@@ -137,7 +137,7 @@ test_connect (int n)
GPR_ASSERT (addr_len <= sizeof (addr));
pollsets[0] = &g_pollset;
- grpc_tcp_server_start (s, pollsets, 1, on_connect, NULL, &closure_list);
+ grpc_tcp_server_start (&exec_ctx, s, pollsets, 1, on_connect, NULL);
gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset));
@@ -155,7 +155,7 @@ test_connect (int n)
while (g_nconnects == nconnects_before && gpr_time_cmp (deadline, gpr_now (deadline.clock_type)) > 0)
{
grpc_pollset_worker worker;
- grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list);
+ grpc_pollset_work (&g_pollset, &worker, gpr_now (&exec_ctx, GPR_CLOCK_MONOTONIC), deadline);
gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset));
grpc_exec_ctx_finish (&exec_ctx);
gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset));
@@ -168,7 +168,7 @@ test_connect (int n)
gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset));
- grpc_tcp_server_destroy (s, NULL, &closure_list);
+ grpc_tcp_server_destroy (&exec_ctx, s, NULL);
grpc_exec_ctx_finish (&exec_ctx);
}
@@ -195,7 +195,7 @@ main (int argc, char **argv)
test_connect (10);
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_iomgr_shutdown ();
return 0;
diff --git a/test/core/iomgr/udp_server_test.c b/test/core/iomgr/udp_server_test.c
index 672c9cf55f..c2729c759d 100644
--- a/test/core/iomgr/udp_server_test.c
+++ b/test/core/iomgr/udp_server_test.c
@@ -78,7 +78,7 @@ test_no_op_with_start (void)
grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT;
grpc_udp_server *s = grpc_udp_server_create ();
LOG_TEST ("test_no_op_with_start");
- grpc_udp_server_start (s, NULL, 0, &closure_list);
+ grpc_udp_server_start (&exec_ctx, s, NULL, 0);
grpc_udp_server_destroy (s, NULL, NULL);
grpc_exec_ctx_finish (&exec_ctx);
}
@@ -109,9 +109,9 @@ test_no_op_with_port_and_start (void)
addr.sin_family = AF_INET;
GPR_ASSERT (grpc_udp_server_add_port (s, (struct sockaddr *) &addr, sizeof (addr), on_read));
- grpc_udp_server_start (s, NULL, 0, &closure_list);
+ grpc_udp_server_start (&exec_ctx, s, NULL, 0);
- grpc_udp_server_destroy (s, NULL, &closure_list);
+ grpc_udp_server_destroy (&exec_ctx, s, NULL);
grpc_exec_ctx_finish (&exec_ctx);
}
@@ -142,7 +142,7 @@ test_receive (int number_of_clients)
GPR_ASSERT (addr_len <= sizeof (addr));
pollsets[0] = &g_pollset;
- grpc_udp_server_start (s, pollsets, 1, &closure_list);
+ grpc_udp_server_start (&exec_ctx, s, pollsets, 1);
gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset));
@@ -159,7 +159,7 @@ test_receive (int number_of_clients)
while (g_number_of_reads == number_of_reads_before && gpr_time_cmp (deadline, gpr_now (deadline.clock_type)) > 0)
{
grpc_pollset_worker worker;
- grpc_pollset_work (&g_pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline, &closure_list);
+ grpc_pollset_work (&g_pollset, &worker, gpr_now (&exec_ctx, GPR_CLOCK_MONOTONIC), deadline);
gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset));
grpc_exec_ctx_finish (&exec_ctx);
gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset));
@@ -197,7 +197,7 @@ main (int argc, char **argv)
test_receive (10);
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_iomgr_shutdown ();
return 0;
diff --git a/test/core/iomgr/workqueue_test.c b/test/core/iomgr/workqueue_test.c
index e785ccefdf..eadb080a41 100644
--- a/test/core/iomgr/workqueue_test.c
+++ b/test/core/iomgr/workqueue_test.c
@@ -62,16 +62,16 @@ test_add_closure (void)
grpc_closure_init (&c, must_succeed, &done);
grpc_workqueue_push (wq, &c, 1);
- grpc_workqueue_add_to_pollset (wq, &g_pollset, &closure_list);
+ grpc_workqueue_add_to_pollset (&exec_ctx, wq, &g_pollset);
gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset));
GPR_ASSERT (!done);
- grpc_pollset_work (&g_pollset, &worker, gpr_now (deadline.clock_type), deadline, &closure_list);
+ grpc_pollset_work (&g_pollset, &worker, gpr_now (&exec_ctx, deadline.clock_type), deadline);
gpr_mu_unlock (GRPC_POLLSET_MU (&g_pollset));
grpc_exec_ctx_finish (&exec_ctx);
GPR_ASSERT (done);
- GRPC_WORKQUEUE_UNREF (wq, "destroy", &closure_list);
+ GRPC_WORKQUEUE_UNREF (&exec_ctx, wq, "destroy");
grpc_exec_ctx_finish (&exec_ctx);
}
@@ -93,7 +93,7 @@ main (int argc, char **argv)
test_add_closure ();
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;
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-06 06:35:38 +0000