From d9ccbbf6b98721f3e0256436e8a31fb378324d34 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Tue, 22 Sep 2015 09:30:00 -0700 Subject: Rename call_list to closure_list --- test/core/bad_client/bad_client.c | 42 +++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 19 deletions(-) (limited to 'test/core/bad_client') diff --git a/test/core/bad_client/bad_client.c b/test/core/bad_client/bad_client.c index 747ce4050b..7605904411 100644 --- a/test/core/bad_client/bad_client.c +++ b/test/core/bad_client/bad_client.c @@ -59,7 +59,8 @@ static void thd_func(void *arg) { gpr_event_set(&a->done_thd, (void *)1); } -static void done_write(void *arg, int success, grpc_call_list *call_list) { +static void done_write(void *arg, int success, + grpc_closure_list *closure_list) { thd_args *a = arg; gpr_event_set(&a->done_write, (void *)1); } @@ -69,11 +70,11 @@ static void server_setup_transport(void *ts, grpc_transport *transport, thd_args *a = ts; static grpc_channel_filter const *extra_filters[] = { &grpc_http_server_filter}; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + 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), &call_list); - grpc_call_list_run(&call_list); + grpc_server_get_channel_args(a->server), &closure_list); + grpc_closure_list_run(&closure_list); } void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, @@ -89,7 +90,7 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, gpr_slice_from_copied_buffer(client_payload, client_payload_length); gpr_slice_buffer outgoing; grpc_closure done_write_closure; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; hex = gpr_dump(client_payload, client_payload_length, GPR_DUMP_HEX | GPR_DUMP_ASCII); @@ -114,14 +115,16 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, grpc_server_register_completion_queue(a.server, a.cq, NULL); grpc_server_start(a.server); transport = - grpc_create_chttp2_transport(NULL, sfd.server, mdctx, 0, &call_list); + 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, &call_list); - grpc_call_list_run(&call_list); + grpc_chttp2_transport_start_reading(transport, NULL, 0, &closure_list); + grpc_closure_list_run(&closure_list); /* Bind everything into the same pollset */ - grpc_endpoint_add_to_pollset(sfd.client, grpc_cq_pollset(a.cq), &call_list); - grpc_endpoint_add_to_pollset(sfd.server, grpc_cq_pollset(a.cq), &call_list); + grpc_endpoint_add_to_pollset(sfd.client, grpc_cq_pollset(a.cq), + &closure_list); + grpc_endpoint_add_to_pollset(sfd.server, grpc_cq_pollset(a.cq), + &closure_list); /* Check a ground truth */ GPR_ASSERT(grpc_server_has_open_connections(a.server)); @@ -134,17 +137,18 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, grpc_closure_init(&done_write_closure, done_write, &a); /* Write data */ - grpc_endpoint_write(sfd.client, &outgoing, &done_write_closure, &call_list); - grpc_call_list_run(&call_list); + grpc_endpoint_write(sfd.client, &outgoing, &done_write_closure, + &closure_list); + grpc_closure_list_run(&closure_list); /* Await completion */ GPR_ASSERT( gpr_event_wait(&a.done_write, GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5))); if (flags & GRPC_BAD_CLIENT_DISCONNECT) { - grpc_endpoint_shutdown(sfd.client, &call_list); - grpc_endpoint_destroy(sfd.client, &call_list); - grpc_call_list_run(&call_list); + grpc_endpoint_shutdown(sfd.client, &closure_list); + grpc_endpoint_destroy(sfd.client, &closure_list); + grpc_closure_list_run(&closure_list); sfd.client = NULL; } @@ -152,9 +156,9 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, /* Shutdown */ if (sfd.client) { - grpc_endpoint_shutdown(sfd.client, &call_list); - grpc_endpoint_destroy(sfd.client, &call_list); - grpc_call_list_run(&call_list); + grpc_endpoint_shutdown(sfd.client, &closure_list); + grpc_endpoint_destroy(sfd.client, &closure_list); + grpc_closure_list_run(&closure_list); } grpc_server_shutdown_and_notify(a.server, a.cq, NULL); GPR_ASSERT(grpc_completion_queue_pluck( @@ -164,6 +168,6 @@ void grpc_run_bad_client_test(grpc_bad_client_server_side_validator validator, grpc_completion_queue_destroy(a.cq); gpr_slice_buffer_destroy(&outgoing); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); grpc_shutdown(); } -- cgit v1.2.3