diff options
Diffstat (limited to 'test/core/util')
| -rw-r--r-- | test/core/util/port_posix.c | 10 | ||||
| -rw-r--r-- | test/core/util/reconnect_server.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/test/core/util/port_posix.c b/test/core/util/port_posix.c index bce72f4a0c..da2541ecc3 100644 --- a/test/core/util/port_posix.c +++ b/test/core/util/port_posix.c @@ -116,12 +116,12 @@ free_port_using_server (char *server, int port) req.path = path; grpc_httpcli_context_init (&context); - grpc_httpcli_get (&context, &pr.pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (&exec_ctx, 10), freed_port_from_server, &pr); + grpc_httpcli_get (&exec_ctx, &context, &pr.pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (10), freed_port_from_server, &pr); gpr_mu_lock (GRPC_POLLSET_MU (&pr.pollset)); while (!pr.done) { grpc_pollset_worker worker; - grpc_pollset_work (&pr.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (&exec_ctx, 1)); + grpc_pollset_work (&exec_ctx, &pr.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (1)); } gpr_mu_unlock (GRPC_POLLSET_MU (&pr.pollset)); @@ -247,7 +247,7 @@ got_port_from_server (grpc_exec_ctx * exec_ctx, void *arg, const grpc_httpcli_re req.path = "/get"; gpr_log (GPR_DEBUG, "failed port pick from server: retrying"); sleep (1); - grpc_httpcli_get (pr->ctx, &pr->pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (exec_ctx, 10), got_port_from_server, pr); + grpc_httpcli_get (exec_ctx, pr->ctx, &pr->pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (10), got_port_from_server, pr); return; } GPR_ASSERT (response); @@ -287,13 +287,13 @@ pick_port_using_server (char *server) req.path = "/get"; grpc_httpcli_context_init (&context); - grpc_httpcli_get (&context, &pr.pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (&exec_ctx, 10), got_port_from_server, &pr); + grpc_httpcli_get (&exec_ctx, &context, &pr.pollset, &req, GRPC_TIMEOUT_SECONDS_TO_DEADLINE (10), got_port_from_server, &pr); grpc_exec_ctx_finish (&exec_ctx); gpr_mu_lock (GRPC_POLLSET_MU (&pr.pollset)); while (pr.port == -1) { grpc_pollset_worker worker; - grpc_pollset_work (&pr.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (&exec_ctx, 1)); + grpc_pollset_work (&exec_ctx, &pr.pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_SECONDS_TO_DEADLINE (1)); } gpr_mu_unlock (GRPC_POLLSET_MU (&pr.pollset)); diff --git a/test/core/util/reconnect_server.c b/test/core/util/reconnect_server.c index 761ef233ac..6de06280ca 100644 --- a/test/core/util/reconnect_server.c +++ b/test/core/util/reconnect_server.c @@ -154,7 +154,7 @@ reconnect_server_poll (reconnect_server * server, int seconds) gpr_time_from_seconds (seconds, GPR_TIMESPAN)); grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; gpr_mu_lock (GRPC_POLLSET_MU (&server->pollset)); - grpc_pollset_work (&server->pollset, &worker, gpr_now (&exec_ctx, GPR_CLOCK_MONOTONIC), deadline); + grpc_pollset_work (&exec_ctx, &server->pollset, &worker, gpr_now (GPR_CLOCK_MONOTONIC), deadline); gpr_mu_unlock (GRPC_POLLSET_MU (&server->pollset)); grpc_exec_ctx_finish (&exec_ctx); } |