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/iomgr/udp_server_test.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'test/core/iomgr/udp_server_test.c') diff --git a/test/core/iomgr/udp_server_test.c b/test/core/iomgr/udp_server_test.c index 86b6b9a9fa..067838777a 100644 --- a/test/core/iomgr/udp_server_test.c +++ b/test/core/iomgr/udp_server_test.c @@ -69,12 +69,12 @@ static void test_no_op(void) { } static void test_no_op_with_start(void) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_udp_server *s = grpc_udp_server_create(); LOG_TEST("test_no_op_with_start"); - grpc_udp_server_start(s, NULL, 0, &call_list); + grpc_udp_server_start(s, NULL, 0, &closure_list); grpc_udp_server_destroy(s, NULL, NULL); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); } static void test_no_op_with_port(void) { @@ -91,7 +91,7 @@ static void test_no_op_with_port(void) { } static void test_no_op_with_port_and_start(void) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; struct sockaddr_in addr; grpc_udp_server *s = grpc_udp_server_create(); LOG_TEST("test_no_op_with_port_and_start"); @@ -101,14 +101,14 @@ static void test_no_op_with_port_and_start(void) { GPR_ASSERT(grpc_udp_server_add_port(s, (struct sockaddr *)&addr, sizeof(addr), on_read)); - grpc_udp_server_start(s, NULL, 0, &call_list); + grpc_udp_server_start(s, NULL, 0, &closure_list); - grpc_udp_server_destroy(s, NULL, &call_list); - grpc_call_list_run(&call_list); + grpc_udp_server_destroy(s, NULL, &closure_list); + grpc_closure_list_run(&closure_list); } static void test_receive(int number_of_clients) { - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; struct sockaddr_storage addr; socklen_t addr_len = sizeof(addr); int clifd, svrfd; @@ -133,7 +133,7 @@ static void test_receive(int number_of_clients) { GPR_ASSERT(addr_len <= sizeof(addr)); pollsets[0] = &g_pollset; - grpc_udp_server_start(s, pollsets, 1, &call_list); + grpc_udp_server_start(s, pollsets, 1, &closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); @@ -150,9 +150,9 @@ static void test_receive(int number_of_clients) { 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, &call_list); + deadline, &closure_list); gpr_mu_unlock(GRPC_POLLSET_MU(&g_pollset)); - grpc_call_list_run(&call_list); + grpc_closure_list_run(&closure_list); gpr_mu_lock(GRPC_POLLSET_MU(&g_pollset)); } GPR_ASSERT(g_number_of_reads == number_of_reads_before + 1); @@ -165,13 +165,14 @@ static void test_receive(int number_of_clients) { grpc_udp_server_destroy(s, NULL, NULL); } -static void destroy_pollset(void *p, int success, grpc_call_list *call_list) { +static void destroy_pollset(void *p, int success, + grpc_closure_list *closure_list) { grpc_pollset_destroy(p); } int main(int argc, char **argv) { grpc_closure destroyed; - grpc_call_list call_list = GRPC_CALL_LIST_INIT; + grpc_closure_list closure_list = GRPC_CLOSURE_LIST_INIT; grpc_test_init(argc, argv); grpc_iomgr_init(); grpc_pollset_init(&g_pollset); @@ -184,8 +185,8 @@ int main(int argc, char **argv) { test_receive(10); grpc_closure_init(&destroyed, destroy_pollset, &g_pollset); - grpc_pollset_shutdown(&g_pollset, &destroyed, &call_list); - grpc_call_list_run(&call_list); + grpc_pollset_shutdown(&g_pollset, &destroyed, &closure_list); + grpc_closure_list_run(&closure_list); grpc_iomgr_shutdown(); return 0; } -- cgit v1.2.3