diff options
Diffstat (limited to 'test')
24 files changed, 68 insertions, 68 deletions
diff --git a/test/core/bad_client/bad_client.c b/test/core/bad_client/bad_client.c index 7661aec656..0b59aa3185 100644 --- a/test/core/bad_client/bad_client.c +++ b/test/core/bad_client/bad_client.c @@ -63,7 +63,7 @@ thd_func (void *arg) } static void -done_write (void *arg, int success, grpc_closure_list * closure_list) +done_write (grpc_exec_ctx * exec_ctx, void *arg, int success) { thd_args *a = arg; gpr_event_set (&a->done_write, (void *) 1); diff --git a/test/core/channel/channel_stack_test.c b/test/core/channel/channel_stack_test.c index af5c705810..1cdd2259b0 100644 --- a/test/core/channel/channel_stack_test.c +++ b/test/core/channel/channel_stack_test.c @@ -42,7 +42,7 @@ #include "test/core/util/test_config.h" static void -channel_init_func (grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * metadata_context, int is_first, int is_last, grpc_closure_list * closure_list) +channel_init_func (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_channel * master, const grpc_channel_args * args, grpc_mdctx * metadata_context, int is_first, int is_last) { GPR_ASSERT (args->num_args == 1); GPR_ASSERT (args->args[0].type == GRPC_ARG_INTEGER); @@ -54,37 +54,37 @@ channel_init_func (grpc_channel_element * elem, grpc_channel * master, const grp } static void -call_init_func (grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op, grpc_closure_list * closure_list) +call_init_func (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, const void *server_transport_data, grpc_transport_stream_op * initial_op) { ++*(int *) (elem->channel_data); *(int *) (elem->call_data) = 0; } static void -channel_destroy_func (grpc_channel_element * elem, grpc_closure_list * closure_list) +channel_destroy_func (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem) { } static void -call_destroy_func (grpc_call_element * elem, grpc_closure_list * closure_list) +call_destroy_func (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) { ++*(int *) (elem->channel_data); } static void -call_func (grpc_call_element * elem, grpc_transport_stream_op * op, grpc_closure_list * closure_list) +call_func (grpc_exec_ctx * exec_ctx, grpc_call_element * elem, grpc_transport_stream_op * op) { ++*(int *) (elem->call_data); } static void -channel_func (grpc_channel_element * elem, grpc_transport_op * op, grpc_closure_list * closure_list) +channel_func (grpc_exec_ctx * exec_ctx, grpc_channel_element * elem, grpc_transport_op * op) { ++*(int *) (elem->channel_data); } static char * -get_peer (grpc_call_element * elem, grpc_closure_list * closure_list) +get_peer (grpc_exec_ctx * exec_ctx, grpc_call_element * elem) { return gpr_strdup ("peer"); } diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.c b/test/core/end2end/fixtures/h2_sockpair+trace.c index 85fa111ad4..276436ba12 100644 --- a/test/core/end2end/fixtures/h2_sockpair+trace.c +++ b/test/core/end2end/fixtures/h2_sockpair+trace.c @@ -76,7 +76,7 @@ typedef struct } sp_client_setup; static void -client_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx, grpc_closure_list * closure_list) +client_setup_transport (grpc_exec_ctx * exec_ctx, void *ts, grpc_transport * transport, grpc_mdctx * mdctx) { sp_client_setup *cs = ts; diff --git a/test/core/end2end/fixtures/h2_sockpair.c b/test/core/end2end/fixtures/h2_sockpair.c index 48faad97d3..5cdc6cacaf 100644 --- a/test/core/end2end/fixtures/h2_sockpair.c +++ b/test/core/end2end/fixtures/h2_sockpair.c @@ -75,7 +75,7 @@ typedef struct } sp_client_setup; static void -client_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx, grpc_closure_list * closure_list) +client_setup_transport (grpc_exec_ctx * exec_ctx, void *ts, grpc_transport * transport, grpc_mdctx * mdctx) { sp_client_setup *cs = ts; diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.c b/test/core/end2end/fixtures/h2_sockpair_1byte.c index 0e11a944af..2685b57e7a 100644 --- a/test/core/end2end/fixtures/h2_sockpair_1byte.c +++ b/test/core/end2end/fixtures/h2_sockpair_1byte.c @@ -75,7 +75,7 @@ typedef struct } sp_client_setup; static void -client_setup_transport (void *ts, grpc_transport * transport, grpc_mdctx * mdctx, grpc_closure_list * closure_list) +client_setup_transport (grpc_exec_ctx * exec_ctx, void *ts, grpc_transport * transport, grpc_mdctx * mdctx) { sp_client_setup *cs = ts; diff --git a/test/core/httpcli/httpcli_test.c b/test/core/httpcli/httpcli_test.c index 1982b00cd1..0287009fae 100644 --- a/test/core/httpcli/httpcli_test.c +++ b/test/core/httpcli/httpcli_test.c @@ -56,7 +56,7 @@ n_seconds_time (int seconds) } static void -on_finish (void *arg, const grpc_httpcli_response * response, grpc_closure_list * closure_list) +on_finish (grpc_exec_ctx * exec_ctx, void *arg, const grpc_httpcli_response * response) { const char *expect = "<html><head><title>Hello world!</title></head>" "<body><p>This is a test</p></body></html>"; GPR_ASSERT (arg == (void *) 42); @@ -135,7 +135,7 @@ test_post (int use_ssl, int port) } static void -destroy_pollset (void *p, int success, grpc_closure_list * closure_list) +destroy_pollset (grpc_exec_ctx * exec_ctx, void *p, int success) { grpc_pollset_destroy (p); } diff --git a/test/core/iomgr/alarm_list_test.c b/test/core/iomgr/alarm_list_test.c index d81dd49c35..8867545b33 100644 --- a/test/core/iomgr/alarm_list_test.c +++ b/test/core/iomgr/alarm_list_test.c @@ -44,7 +44,7 @@ static int cb_called[MAX_CB][2]; static void -cb (void *arg, int success, grpc_closure_list * closure_list) +cb (grpc_exec_ctx * exec_ctx, void *arg, int success) { cb_called[(gpr_intptr) arg][success]++; } diff --git a/test/core/iomgr/endpoint_pair_test.c b/test/core/iomgr/endpoint_pair_test.c index 4e7079ef14..2bc79301ea 100644 --- a/test/core/iomgr/endpoint_pair_test.c +++ b/test/core/iomgr/endpoint_pair_test.c @@ -70,7 +70,7 @@ static grpc_endpoint_test_config configs[] = { }; static void -destroy_pollset (void *p, int success, grpc_closure_list * closure_list) +destroy_pollset (grpc_exec_ctx * exec_ctx, void *p, int success) { grpc_pollset_destroy (p); } diff --git a/test/core/iomgr/endpoint_tests.c b/test/core/iomgr/endpoint_tests.c index 4a72043283..bea0371053 100644 --- a/test/core/iomgr/endpoint_tests.c +++ b/test/core/iomgr/endpoint_tests.c @@ -138,7 +138,7 @@ struct read_and_write_test_state }; static void -read_and_write_test_read_handler (void *data, int success, grpc_closure_list * closure_list) +read_and_write_test_read_handler (grpc_exec_ctx * exec_ctx, void *data, int success) { struct read_and_write_test_state *state = data; @@ -158,7 +158,7 @@ read_and_write_test_read_handler (void *data, int success, grpc_closure_list * c } static void -read_and_write_test_write_handler (void *data, int success, grpc_closure_list * closure_list) +read_and_write_test_write_handler (grpc_exec_ctx * exec_ctx, void *data, int success) { struct read_and_write_test_state *state = data; gpr_slice *slices = NULL; diff --git a/test/core/iomgr/fd_posix_test.c b/test/core/iomgr/fd_posix_test.c index 5449c38768..d8b4032162 100644 --- a/test/core/iomgr/fd_posix_test.c +++ b/test/core/iomgr/fd_posix_test.c @@ -250,7 +250,7 @@ listen_cb (void *arg, /*=sv_arg*/ When connection request arrives, listen_cb() is called to accept the connection request. */ static int -server_start (server * sv, grpc_closure_list * closure_list) +server_start (grpc_exec_ctx * exec_ctx, server * sv) { int port = 0; int fd; @@ -382,7 +382,7 @@ client_session_write (void *arg, /*client */ /* Start a client to send a stream of bytes. */ static void -client_start (client * cl, int port, grpc_closure_list * closure_list) +client_start (grpc_exec_ctx * exec_ctx, client * cl, int port) { int fd; struct sockaddr_in sin; @@ -455,7 +455,7 @@ test_grpc_fd (void) typedef struct fd_change_data { - void (*cb_that_ran) (void *, int success, grpc_closure_list * closure_list); + void (*cb_that_ran) (grpc_exec_ctx * exec_ctx, void *, int success); } fd_change_data; void @@ -578,7 +578,7 @@ test_grpc_fd_change (void) } static void -destroy_pollset (void *p, int success, grpc_closure_list * closure_list) +destroy_pollset (grpc_exec_ctx * exec_ctx, void *p, int success) { grpc_pollset_destroy (p); } diff --git a/test/core/iomgr/resolve_address_test.c b/test/core/iomgr/resolve_address_test.c index a1ce7efaf0..814cb9e150 100644 --- a/test/core/iomgr/resolve_address_test.c +++ b/test/core/iomgr/resolve_address_test.c @@ -45,7 +45,7 @@ test_deadline (void) } static void -must_succeed (void *evp, grpc_resolved_addresses * p, grpc_closure_list * closure_list) +must_succeed (grpc_exec_ctx * exec_ctx, void *evp, grpc_resolved_addresses * p) { GPR_ASSERT (p); GPR_ASSERT (p->naddrs >= 1); @@ -54,7 +54,7 @@ must_succeed (void *evp, grpc_resolved_addresses * p, grpc_closure_list * closur } static void -must_fail (void *evp, grpc_resolved_addresses * p, grpc_closure_list * closure_list) +must_fail (grpc_exec_ctx * exec_ctx, void *evp, grpc_resolved_addresses * p) { GPR_ASSERT (!p); gpr_event_set (evp, (void *) 1); diff --git a/test/core/iomgr/tcp_client_posix_test.c b/test/core/iomgr/tcp_client_posix_test.c index af9b96db14..b93b9a5725 100644 --- a/test/core/iomgr/tcp_client_posix_test.c +++ b/test/core/iomgr/tcp_client_posix_test.c @@ -68,7 +68,7 @@ finish_connection () } static void -must_succeed (void *arg, int success, grpc_closure_list * closure_list) +must_succeed (grpc_exec_ctx * exec_ctx, void *arg, int success) { GPR_ASSERT (g_connecting != NULL); GPR_ASSERT (success); @@ -79,7 +79,7 @@ must_succeed (void *arg, int success, grpc_closure_list * closure_list) } static void -must_fail (void *arg, int success, grpc_closure_list * closure_list) +must_fail (grpc_exec_ctx * exec_ctx, void *arg, int success) { GPR_ASSERT (g_connecting == NULL); GPR_ASSERT (!success); @@ -270,7 +270,7 @@ test_times_out (void) } static void -destroy_pollset (void *p, int success, grpc_closure_list * closure_list) +destroy_pollset (grpc_exec_ctx * exec_ctx, void *p, int success) { grpc_pollset_destroy (p); } diff --git a/test/core/iomgr/tcp_posix_test.c b/test/core/iomgr/tcp_posix_test.c index 5683e7cf53..af338249c5 100644 --- a/test/core/iomgr/tcp_posix_test.c +++ b/test/core/iomgr/tcp_posix_test.c @@ -157,7 +157,7 @@ count_slices (gpr_slice * slices, size_t nslices, int *current_data) } static void -read_cb (void *user_data, int success, grpc_closure_list * closure_list) +read_cb (grpc_exec_ctx * exec_ctx, void *user_data, int success) { struct read_socket_state *state = (struct read_socket_state *) user_data; size_t read_bytes; @@ -468,7 +468,7 @@ static grpc_endpoint_test_config configs[] = { }; static void -destroy_pollset (void *p, int success, grpc_closure_list * closure_list) +destroy_pollset (grpc_exec_ctx * exec_ctx, void *p, int success) { grpc_pollset_destroy (p); } diff --git a/test/core/iomgr/tcp_server_posix_test.c b/test/core/iomgr/tcp_server_posix_test.c index 92edfdd850..8467e937ee 100644 --- a/test/core/iomgr/tcp_server_posix_test.c +++ b/test/core/iomgr/tcp_server_posix_test.c @@ -49,7 +49,7 @@ static grpc_pollset g_pollset; static int g_nconnects = 0; static void -on_connect (void *arg, grpc_endpoint * tcp, grpc_closure_list * closure_list) +on_connect (grpc_exec_ctx * exec_ctx, void *arg, grpc_endpoint * tcp) { grpc_endpoint_shutdown (tcp, closure_list); grpc_endpoint_destroy (tcp, closure_list); @@ -173,7 +173,7 @@ test_connect (int n) } static void -destroy_pollset (void *p, int success, grpc_closure_list * closure_list) +destroy_pollset (grpc_exec_ctx * exec_ctx, void *p, int success) { grpc_pollset_destroy (p); } diff --git a/test/core/iomgr/udp_server_test.c b/test/core/iomgr/udp_server_test.c index b9cf289ed6..86e84adb55 100644 --- a/test/core/iomgr/udp_server_test.c +++ b/test/core/iomgr/udp_server_test.c @@ -175,7 +175,7 @@ test_receive (int number_of_clients) } static void -destroy_pollset (void *p, int success, grpc_closure_list * closure_list) +destroy_pollset (grpc_exec_ctx * exec_ctx, void *p, int success) { grpc_pollset_destroy (p); } diff --git a/test/core/iomgr/workqueue_test.c b/test/core/iomgr/workqueue_test.c index 43eebc3fbf..7e0f336a0d 100644 --- a/test/core/iomgr/workqueue_test.c +++ b/test/core/iomgr/workqueue_test.c @@ -41,7 +41,7 @@ static grpc_pollset g_pollset; static void -must_succeed (void *p, int success, grpc_closure_list * closure_list) +must_succeed (grpc_exec_ctx * exec_ctx, void *p, int success) { GPR_ASSERT (success == 1); gpr_mu_lock (GRPC_POLLSET_MU (&g_pollset)); @@ -76,7 +76,7 @@ test_add_closure (void) } static void -destroy_pollset (void *p, int success, grpc_closure_list * closure_list) +destroy_pollset (grpc_exec_ctx * exec_ctx, void *p, int success) { grpc_pollset_destroy (p); } diff --git a/test/core/security/credentials_test.c b/test/core/security/credentials_test.c index 6769de1a60..281f14f3b7 100644 --- a/test/core/security/credentials_test.c +++ b/test/core/security/credentials_test.c @@ -286,7 +286,7 @@ check_metadata (expected_md * expected, grpc_credentials_md * md_elems, size_t n } static void -check_google_iam_metadata (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +check_google_iam_metadata (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) { grpc_credentials *c = (grpc_credentials *) user_data; expected_md emd[] = { {GRPC_IAM_AUTHORIZATION_TOKEN_METADATA_KEY, @@ -313,7 +313,7 @@ test_google_iam_creds (void) } static void -check_access_token_metadata (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +check_access_token_metadata (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) { grpc_credentials *c = (grpc_credentials *) user_data; expected_md emd[] = { {GRPC_AUTHORIZATION_METADATA_KEY, "Bearer blah"} }; @@ -336,7 +336,7 @@ test_access_token_creds (void) } static void -check_ssl_oauth2_composite_metadata (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +check_ssl_oauth2_composite_metadata (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) { grpc_credentials *c = (grpc_credentials *) user_data; expected_md emd[] = { @@ -382,7 +382,7 @@ test_ssl_fake_transport_security_composite_creds_failure (void) } static void -check_ssl_oauth2_google_iam_composite_metadata (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +check_ssl_oauth2_google_iam_composite_metadata (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) { grpc_credentials *c = (grpc_credentials *) user_data; expected_md emd[] = { @@ -426,7 +426,7 @@ test_ssl_oauth2_google_iam_composite_creds (void) } static void -on_oauth2_creds_get_metadata_success (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +on_oauth2_creds_get_metadata_success (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) { GPR_ASSERT (status == GRPC_CREDENTIALS_OK); GPR_ASSERT (num_md == 1); @@ -437,7 +437,7 @@ on_oauth2_creds_get_metadata_success (void *user_data, grpc_credentials_md * md_ } static void -on_oauth2_creds_get_metadata_failure (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +on_oauth2_creds_get_metadata_failure (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) { GPR_ASSERT (status == GRPC_CREDENTIALS_ERROR); GPR_ASSERT (num_md == 0); @@ -457,7 +457,7 @@ validate_compute_engine_http_request (const grpc_httpcli_request * request) } static int -compute_engine_httpcli_get_success_override (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +compute_engine_httpcli_get_success_override (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) { grpc_httpcli_response response = http_response (200, valid_oauth2_json_response); validate_compute_engine_http_request (request); @@ -466,7 +466,7 @@ compute_engine_httpcli_get_success_override (const grpc_httpcli_request * reques } static int -compute_engine_httpcli_get_failure_override (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +compute_engine_httpcli_get_failure_override (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) { grpc_httpcli_response response = http_response (403, "Not Authorized."); validate_compute_engine_http_request (request); @@ -475,14 +475,14 @@ compute_engine_httpcli_get_failure_override (const grpc_httpcli_request * reques } static int -httpcli_post_should_not_be_called (const grpc_httpcli_request * request, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +httpcli_post_should_not_be_called (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) { GPR_ASSERT ("HTTP POST should not be called" == NULL); return 1; } static int -httpcli_get_should_not_be_called (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +httpcli_get_should_not_be_called (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) { GPR_ASSERT ("HTTP GET should not be called" == NULL); return 1; @@ -544,7 +544,7 @@ validate_refresh_token_http_request (const grpc_httpcli_request * request, const } static int -refresh_token_httpcli_post_success (const grpc_httpcli_request * request, const char *body, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +refresh_token_httpcli_post_success (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, const char *body, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) { grpc_httpcli_response response = http_response (200, valid_oauth2_json_response); validate_refresh_token_http_request (request, body, body_size); @@ -553,7 +553,7 @@ refresh_token_httpcli_post_success (const grpc_httpcli_request * request, const } static int -refresh_token_httpcli_post_failure (const grpc_httpcli_request * request, const char *body, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +refresh_token_httpcli_post_failure (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, const char *body, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) { grpc_httpcli_response response = http_response (403, "Not Authorized."); validate_refresh_token_http_request (request, body, body_size); @@ -636,7 +636,7 @@ encode_and_sign_jwt_should_not_be_called (const grpc_auth_json_key * json_key, c } static void -on_jwt_creds_get_metadata_success (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +on_jwt_creds_get_metadata_success (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) { char *expected_md_value; gpr_asprintf (&expected_md_value, "Bearer %s", test_signed_jwt); @@ -650,7 +650,7 @@ on_jwt_creds_get_metadata_success (void *user_data, grpc_credentials_md * md_ele } static void -on_jwt_creds_get_metadata_failure (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +on_jwt_creds_get_metadata_failure (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) { GPR_ASSERT (status == GRPC_CREDENTIALS_ERROR); GPR_ASSERT (num_md == 0); @@ -811,7 +811,7 @@ plugin_get_metadata_failure (void *state, const char *service_url, grpc_credenti } static void -on_plugin_metadata_received_success (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +on_plugin_metadata_received_success (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) { size_t i = 0; GPR_ASSERT (user_data == NULL); @@ -825,7 +825,7 @@ on_plugin_metadata_received_success (void *user_data, grpc_credentials_md * md_e } static void -on_plugin_metadata_received_failure (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +on_plugin_metadata_received_failure (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) { GPR_ASSERT (user_data == NULL); GPR_ASSERT (md_elems == NULL); diff --git a/test/core/security/jwt_verifier_test.c b/test/core/security/jwt_verifier_test.c index 15c19e2533..506918d27c 100644 --- a/test/core/security/jwt_verifier_test.c +++ b/test/core/security/jwt_verifier_test.c @@ -190,14 +190,14 @@ http_response (int status, char *body) } static int -httpcli_post_should_not_be_called (const grpc_httpcli_request * request, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +httpcli_post_should_not_be_called (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, const char *body_bytes, size_t body_size, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) { GPR_ASSERT ("HTTP POST should not be called" == NULL); return 1; } static int -httpcli_get_google_keys_for_email (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +httpcli_get_google_keys_for_email (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) { grpc_httpcli_response response = http_response (200, good_google_email_keys ()); GPR_ASSERT (request->handshaker == &grpc_httpcli_ssl); @@ -240,7 +240,7 @@ test_jwt_verifier_google_email_issuer_success (void) } static int -httpcli_get_custom_keys_for_email (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +httpcli_get_custom_keys_for_email (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) { grpc_httpcli_response response = http_response (200, gpr_strdup (good_jwk_set)); GPR_ASSERT (request->handshaker == &grpc_httpcli_ssl); @@ -273,7 +273,7 @@ test_jwt_verifier_custom_email_issuer_success (void) } static int -httpcli_get_jwk_set (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +httpcli_get_jwk_set (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) { grpc_httpcli_response response = http_response (200, gpr_strdup (good_jwk_set)); GPR_ASSERT (request->handshaker == &grpc_httpcli_ssl); @@ -285,7 +285,7 @@ httpcli_get_jwk_set (const grpc_httpcli_request * request, gpr_timespec deadline } static int -httpcli_get_openid_config (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +httpcli_get_openid_config (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) { grpc_httpcli_response response = http_response (200, gpr_strdup (good_openid_config)); GPR_ASSERT (request->handshaker == &grpc_httpcli_ssl); @@ -327,7 +327,7 @@ on_verification_key_retrieval_error (void *user_data, grpc_jwt_verifier_status s } static int -httpcli_get_bad_json (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +httpcli_get_bad_json (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) { grpc_httpcli_response response = http_response (200, gpr_strdup ("{\"bad\": \"stuff\"}")); GPR_ASSERT (request->handshaker == &grpc_httpcli_ssl); @@ -427,7 +427,7 @@ test_jwt_verifier_bad_signature (void) } static int -httpcli_get_should_not_be_called (const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data, grpc_closure_list * closure_list) +httpcli_get_should_not_be_called (grpc_exec_ctx * exec_ctx, const grpc_httpcli_request * request, gpr_timespec deadline, grpc_httpcli_response_cb on_response, void *user_data) { GPR_ASSERT (0); return 1; diff --git a/test/core/security/oauth2_utils.c b/test/core/security/oauth2_utils.c index a490ba4668..9035557a41 100644 --- a/test/core/security/oauth2_utils.c +++ b/test/core/security/oauth2_utils.c @@ -52,7 +52,7 @@ typedef struct } oauth2_request; static void -on_oauth2_response (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +on_oauth2_response (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) { oauth2_request *request = user_data; char *token = NULL; @@ -77,7 +77,7 @@ on_oauth2_response (void *user_data, grpc_credentials_md * md_elems, size_t num_ } static void -do_nothing (void *unused, int success, grpc_closure_list * closure_list) +do_nothing (grpc_exec_ctx * exec_ctx, void *unused, int success) { } diff --git a/test/core/security/print_google_default_creds_token.c b/test/core/security/print_google_default_creds_token.c index faac2c7846..3f6720b6ea 100644 --- a/test/core/security/print_google_default_creds_token.c +++ b/test/core/security/print_google_default_creds_token.c @@ -51,7 +51,7 @@ typedef struct } synchronizer; static void -on_metadata_response (void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status, grpc_closure_list * closure_list) +on_metadata_response (grpc_exec_ctx * exec_ctx, void *user_data, grpc_credentials_md * md_elems, size_t num_md, grpc_credentials_status status) { synchronizer *sync = user_data; if (status == GRPC_CREDENTIALS_ERROR) diff --git a/test/core/security/secure_endpoint_test.c b/test/core/security/secure_endpoint_test.c index 32db8194e4..595e84c8b1 100644 --- a/test/core/security/secure_endpoint_test.c +++ b/test/core/security/secure_endpoint_test.c @@ -143,7 +143,7 @@ static grpc_endpoint_test_config configs[] = { }; static void -inc_call_ctr (void *arg, int success, grpc_closure_list * closure_list) +inc_call_ctr (grpc_exec_ctx * exec_ctx, void *arg, int success) { ++*(int *) arg; } @@ -179,7 +179,7 @@ test_leftover (grpc_endpoint_test_config config, size_t slice_size) } static void -destroy_pollset (void *p, int success, grpc_closure_list * closure_list) +destroy_pollset (grpc_exec_ctx * exec_ctx, void *p, int success) { grpc_pollset_destroy (p); } diff --git a/test/core/surface/completion_queue_test.c b/test/core/surface/completion_queue_test.c index cd0bce8fc2..48f1122242 100644 --- a/test/core/surface/completion_queue_test.c +++ b/test/core/surface/completion_queue_test.c @@ -84,7 +84,7 @@ test_wait_empty (void) } static void -do_nothing_end_completion (void *arg, grpc_cq_completion * c, grpc_closure_list * closure_list) +do_nothing_end_completion (grpc_exec_ctx * exec_ctx, void *arg, grpc_cq_completion * c) { } @@ -213,7 +213,7 @@ ten_seconds_time (void) } static void -free_completion (void *arg, grpc_cq_completion * completion, grpc_closure_list * closure_list) +free_completion (grpc_exec_ctx * exec_ctx, void *arg, grpc_cq_completion * completion) { gpr_free (completion); } diff --git a/test/core/util/port_posix.c b/test/core/util/port_posix.c index 2bb545a376..670b19e28c 100644 --- a/test/core/util/port_posix.c +++ b/test/core/util/port_posix.c @@ -78,14 +78,14 @@ typedef struct freereq } freereq; static void -destroy_pollset_and_shutdown (void *p, int success, grpc_closure_list * closure_list) +destroy_pollset_and_shutdown (grpc_exec_ctx * exec_ctx, void *p, int success) { grpc_pollset_destroy (p); grpc_shutdown (); } static void -freed_port_from_server (void *arg, const grpc_httpcli_response * response, grpc_closure_list * closure_list) +freed_port_from_server (grpc_exec_ctx * exec_ctx, void *arg, const grpc_httpcli_response * response) { freereq *pr = arg; gpr_mu_lock (GRPC_POLLSET_MU (&pr->pollset)); @@ -231,7 +231,7 @@ typedef struct portreq } portreq; static void -got_port_from_server (void *arg, const grpc_httpcli_response * response, grpc_closure_list * closure_list) +got_port_from_server (grpc_exec_ctx * exec_ctx, void *arg, const grpc_httpcli_response * response) { size_t i; int port = 0; diff --git a/test/core/util/reconnect_server.c b/test/core/util/reconnect_server.c index f730303004..4d1ef62e17 100644 --- a/test/core/util/reconnect_server.c +++ b/test/core/util/reconnect_server.c @@ -67,7 +67,7 @@ pretty_print_backoffs (reconnect_server * server) } static void -on_connect (void *arg, grpc_endpoint * tcp, grpc_closure_list * closure_list) +on_connect (grpc_exec_ctx * exec_ctx, void *arg, grpc_endpoint * tcp) { char *peer; char *last_colon; @@ -175,7 +175,7 @@ reconnect_server_clear_timestamps (reconnect_server * server) } static void -do_nothing (void *ignored, int success, grpc_closure_list * closure_list) +do_nothing (grpc_exec_ctx * exec_ctx, void *ignored, int success) { } |