diff options
author | Yash Tibrewal <yashkt@google.com> | 2017-11-13 15:37:58 -0800 |
---|---|---|
committer | Yash Tibrewal <yashkt@google.com> | 2017-11-14 01:36:28 -0800 |
commit | 75122c23578e24417dcf64081c737571a9fc2dbc (patch) | |
tree | f4b8491964ec0508a5826490628c9f87b82c3326 /test/core/util | |
parent | 36cd68f0d543b9024c84eff82319890a791de7f6 (diff) |
Address some PR comments
Diffstat (limited to 'test/core/util')
-rw-r--r-- | test/core/util/port_server_client.cc | 18 | ||||
-rw-r--r-- | test/core/util/test_tcp_server.cc | 5 |
2 files changed, 10 insertions, 13 deletions
diff --git a/test/core/util/port_server_client.cc b/test/core/util/port_server_client.cc index 2cabd560ee..4e68ee3744 100644 --- a/test/core/util/port_server_client.cc +++ b/test/core/util/port_server_client.cc @@ -85,19 +85,19 @@ void grpc_free_port_using_server(int port) { grpc_resource_quota* resource_quota = grpc_resource_quota_create("port_server_client/free"); grpc_httpcli_get(&context, &pr.pops, resource_quota, &req, - grpc_exec_ctx_now() + 30 * GPR_MS_PER_SEC, + ExecCtx::Get()->Now() + 30 * GPR_MS_PER_SEC, GRPC_CLOSURE_CREATE(freed_port_from_server, &pr, grpc_schedule_on_exec_ctx), &rsp); grpc_resource_quota_unref_internal(resource_quota); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); gpr_mu_lock(pr.mu); while (!pr.done) { grpc_pollset_worker* worker = NULL; if (!GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(grpc_polling_entity_pollset(&pr.pops), &worker, - grpc_exec_ctx_now() + GPR_MS_PER_SEC))) { + ExecCtx::Get()->Now() + GPR_MS_PER_SEC))) { pr.done = 1; } } @@ -106,7 +106,7 @@ void grpc_free_port_using_server(int port) { grpc_httpcli_context_destroy(&context); grpc_pollset_shutdown(grpc_polling_entity_pollset(&pr.pops), shutdown_closure); - grpc_exec_ctx_finish(); + gpr_free(path); grpc_http_response_destroy(&rsp); @@ -167,7 +167,7 @@ static void got_port_from_server(void* arg, grpc_error* error) { grpc_resource_quota* resource_quota = grpc_resource_quota_create("port_server_client/pick_retry"); grpc_httpcli_get(pr->ctx, &pr->pops, resource_quota, &req, - grpc_exec_ctx_now() + 30 * GPR_MS_PER_SEC, + ExecCtx::Get()->Now() + 30 * GPR_MS_PER_SEC, GRPC_CLOSURE_CREATE(got_port_from_server, pr, grpc_schedule_on_exec_ctx), &pr->response); @@ -217,18 +217,18 @@ int grpc_pick_port_using_server(void) { grpc_resource_quota_create("port_server_client/pick"); grpc_httpcli_get( &context, &pr.pops, resource_quota, &req, - grpc_exec_ctx_now() + 30 * GPR_MS_PER_SEC, + ExecCtx::Get()->Now() + 30 * GPR_MS_PER_SEC, GRPC_CLOSURE_CREATE(got_port_from_server, &pr, grpc_schedule_on_exec_ctx), &pr.response); grpc_resource_quota_unref_internal(resource_quota); - grpc_exec_ctx_flush(); + ExecCtx::Get()->Flush(); gpr_mu_lock(pr.mu); while (pr.port == -1) { grpc_pollset_worker* worker = NULL; if (!GRPC_LOG_IF_ERROR( "pollset_work", grpc_pollset_work(grpc_polling_entity_pollset(&pr.pops), &worker, - grpc_exec_ctx_now() + GPR_MS_PER_SEC))) { + ExecCtx::Get()->Now() + GPR_MS_PER_SEC))) { pr.port = 0; } } @@ -238,7 +238,7 @@ int grpc_pick_port_using_server(void) { grpc_httpcli_context_destroy(&context); grpc_pollset_shutdown(grpc_polling_entity_pollset(&pr.pops), shutdown_closure); - grpc_exec_ctx_finish(); + grpc_shutdown(); return pr.port; diff --git a/test/core/util/test_tcp_server.cc b/test/core/util/test_tcp_server.cc index 79178a7cbd..7e17ff1f53 100644 --- a/test/core/util/test_tcp_server.cc +++ b/test/core/util/test_tcp_server.cc @@ -72,8 +72,6 @@ void test_tcp_server_start(test_tcp_server* server, int port) { grpc_tcp_server_start(server->tcp_server, &server->pollset, 1, server->on_connect, server->cb_data); gpr_log(GPR_INFO, "test tcp server listening on 0.0.0.0:%d", port); - - grpc_exec_ctx_finish(); } void test_tcp_server_poll(test_tcp_server* server, int seconds) { @@ -85,7 +83,6 @@ void test_tcp_server_poll(test_tcp_server* server, int seconds) { GRPC_LOG_IF_ERROR("pollset_work", grpc_pollset_work(server->pollset, &worker, deadline)); gpr_mu_unlock(server->mu); - grpc_exec_ctx_finish(); } static void do_nothing(void* arg, grpc_error* error) {} @@ -109,7 +106,7 @@ void test_tcp_server_destroy(test_tcp_server* server) { grpc_pollset_shutdown(server->pollset, GRPC_CLOSURE_CREATE(finish_pollset, server->pollset, grpc_schedule_on_exec_ctx)); - grpc_exec_ctx_finish(); + gpr_free(server->pollset); grpc_shutdown(); } |