diff options
Diffstat (limited to 'test/core/end2end/fixtures')
-rw-r--r-- | test/core/end2end/fixtures/h2_sockpair+trace.c | 32 | ||||
-rw-r--r-- | test/core/end2end/fixtures/h2_sockpair.c | 28 | ||||
-rw-r--r-- | test/core/end2end/fixtures/h2_sockpair_1byte.c | 28 |
3 files changed, 44 insertions, 44 deletions
diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.c b/test/core/end2end/fixtures/h2_sockpair+trace.c index d0279e79ba..b79c483703 100644 --- a/test/core/end2end/fixtures/h2_sockpair+trace.c +++ b/test/core/end2end/fixtures/h2_sockpair+trace.c @@ -62,11 +62,11 @@ static void server_setup_transport(void *ts, grpc_transport *transport, grpc_end2end_test_fixture *f = 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( f->server, transport, extra_filters, GPR_ARRAY_SIZE(extra_filters), mdctx, - grpc_server_get_channel_args(f->server), &call_list); - grpc_call_list_run(&call_list); + grpc_server_get_channel_args(f->server), &closure_list); + grpc_closure_list_run(&closure_list); } typedef struct { @@ -76,7 +76,7 @@ typedef struct { static void client_setup_transport(void *ts, grpc_transport *transport, grpc_mdctx *mdctx, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { sp_client_setup *cs = ts; const grpc_channel_filter *filters[] = {&grpc_http_client_filter, @@ -85,7 +85,7 @@ static void client_setup_transport(void *ts, grpc_transport *transport, size_t nfilters = sizeof(filters) / sizeof(*filters); grpc_channel *channel = grpc_channel_create_from_filters("socketpair-target", filters, nfilters, - cs->client_args, mdctx, 1, call_list); + cs->client_args, mdctx, 1, closure_list); cs->f->client = channel; @@ -109,7 +109,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( static void chttp2_init_client_socketpair(grpc_end2end_test_fixture *f, grpc_channel_args *client_args) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_transport *transport; grpc_mdctx *mdctx = grpc_mdctx_create(); @@ -117,16 +117,16 @@ static void chttp2_init_client_socketpair(grpc_end2end_test_fixture *f, cs.client_args = client_args; cs.f = f; transport = grpc_create_chttp2_transport(client_args, sfd->client, mdctx, 1, - &call_list); - client_setup_transport(&cs, transport, mdctx, &call_list); + &closure_list); + client_setup_transport(&cs, transport, mdctx, &closure_list); GPR_ASSERT(f->client); - 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); } static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, grpc_channel_args *server_args) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_mdctx *mdctx = grpc_mdctx_create(); grpc_transport *transport; @@ -135,10 +135,10 @@ static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, grpc_server_register_completion_queue(f->server, f->cq, NULL); grpc_server_start(f->server); transport = grpc_create_chttp2_transport(server_args, sfd->server, mdctx, 0, - &call_list); + &closure_list); server_setup_transport(f, 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); } static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture *f) { @@ -154,7 +154,7 @@ static grpc_end2end_test_config configs[] = { int main(int argc, char **argv) { size_t i; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; /* force tracing on, with a value to force many code paths in trace.c to be taken */ @@ -167,7 +167,7 @@ int main(int argc, char **argv) { grpc_test_init(argc, argv); grpc_init(); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); 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 57fc986974..e927a0e0d8 100644 --- a/test/core/end2end/fixtures/h2_sockpair.c +++ b/test/core/end2end/fixtures/h2_sockpair.c @@ -61,11 +61,11 @@ static void server_setup_transport(void *ts, grpc_transport *transport, grpc_end2end_test_fixture *f = 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( f->server, transport, extra_filters, GPR_ARRAY_SIZE(extra_filters), mdctx, - grpc_server_get_channel_args(f->server), &call_list); - grpc_call_list_run(&call_list); + grpc_server_get_channel_args(f->server), &closure_list); + grpc_closure_list_run(&closure_list); } typedef struct { @@ -75,7 +75,7 @@ typedef struct { static void client_setup_transport(void *ts, grpc_transport *transport, grpc_mdctx *mdctx, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { sp_client_setup *cs = ts; const grpc_channel_filter *filters[] = {&grpc_http_client_filter, @@ -84,7 +84,7 @@ static void client_setup_transport(void *ts, grpc_transport *transport, size_t nfilters = sizeof(filters) / sizeof(*filters); grpc_channel *channel = grpc_channel_create_from_filters("socketpair-target", filters, nfilters, - cs->client_args, mdctx, 1, call_list); + cs->client_args, mdctx, 1, closure_list); cs->f->client = channel; @@ -108,7 +108,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( static void chttp2_init_client_socketpair(grpc_end2end_test_fixture *f, grpc_channel_args *client_args) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_transport *transport; grpc_mdctx *mdctx = grpc_mdctx_create(); @@ -116,16 +116,16 @@ static void chttp2_init_client_socketpair(grpc_end2end_test_fixture *f, cs.client_args = client_args; cs.f = f; transport = grpc_create_chttp2_transport(client_args, sfd->client, mdctx, 1, - &call_list); - client_setup_transport(&cs, transport, mdctx, &call_list); + &closure_list); + client_setup_transport(&cs, transport, mdctx, &closure_list); GPR_ASSERT(f->client); - 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); } static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, grpc_channel_args *server_args) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_mdctx *mdctx = grpc_mdctx_create(); grpc_transport *transport; @@ -134,10 +134,10 @@ static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, grpc_server_register_completion_queue(f->server, f->cq, NULL); grpc_server_start(f->server); transport = grpc_create_chttp2_transport(server_args, sfd->server, mdctx, 0, - &call_list); + &closure_list); server_setup_transport(f, 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); } static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture *f) { diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.c b/test/core/end2end/fixtures/h2_sockpair_1byte.c index d0c552a669..8a9196d3b6 100644 --- a/test/core/end2end/fixtures/h2_sockpair_1byte.c +++ b/test/core/end2end/fixtures/h2_sockpair_1byte.c @@ -61,11 +61,11 @@ static void server_setup_transport(void *ts, grpc_transport *transport, grpc_end2end_test_fixture *f = 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( f->server, transport, extra_filters, GPR_ARRAY_SIZE(extra_filters), mdctx, - grpc_server_get_channel_args(f->server), &call_list); - grpc_call_list_run(&call_list); + grpc_server_get_channel_args(f->server), &closure_list); + grpc_closure_list_run(&closure_list); } typedef struct { @@ -75,7 +75,7 @@ typedef struct { static void client_setup_transport(void *ts, grpc_transport *transport, grpc_mdctx *mdctx, - grpc_call_list *call_list) { + grpc_closure_list *closure_list) { sp_client_setup *cs = ts; const grpc_channel_filter *filters[] = {&grpc_http_client_filter, @@ -84,7 +84,7 @@ static void client_setup_transport(void *ts, grpc_transport *transport, size_t nfilters = sizeof(filters) / sizeof(*filters); grpc_channel *channel = grpc_channel_create_from_filters("socketpair-target", filters, nfilters, - cs->client_args, mdctx, 1, call_list); + cs->client_args, mdctx, 1, closure_list); cs->f->client = channel; @@ -108,7 +108,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_socketpair( static void chttp2_init_client_socketpair(grpc_end2end_test_fixture *f, grpc_channel_args *client_args) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_transport *transport; grpc_mdctx *mdctx = grpc_mdctx_create(); @@ -116,16 +116,16 @@ static void chttp2_init_client_socketpair(grpc_end2end_test_fixture *f, cs.client_args = client_args; cs.f = f; transport = grpc_create_chttp2_transport(client_args, sfd->client, mdctx, 1, - &call_list); - client_setup_transport(&cs, transport, mdctx, &call_list); + &closure_list); + client_setup_transport(&cs, transport, mdctx, &closure_list); GPR_ASSERT(f->client); - 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); } static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, grpc_channel_args *server_args) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_endpoint_pair *sfd = f->fixture_data; grpc_mdctx *mdctx = grpc_mdctx_create(); grpc_transport *transport; @@ -134,10 +134,10 @@ static void chttp2_init_server_socketpair(grpc_end2end_test_fixture *f, grpc_server_register_completion_queue(f->server, f->cq, NULL); grpc_server_start(f->server); transport = grpc_create_chttp2_transport(server_args, sfd->server, mdctx, 0, - &call_list); + &closure_list); server_setup_transport(f, 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); } static void chttp2_tear_down_socketpair(grpc_end2end_test_fixture *f) { |