Skip to content
Snippets Groups Projects
Commit 5e7e4946 authored by yang-g's avatar yang-g
Browse files

Use milliseconds for test_server timeout

parent e74bde77
No related branches found
No related tags found
No related merge requests found
...@@ -250,7 +250,7 @@ static void actually_poll_server(void* arg) { ...@@ -250,7 +250,7 @@ static void actually_poll_server(void* arg) {
if (done || gpr_time_cmp(time_left, gpr_time_0(GPR_TIMESPAN)) < 0) { if (done || gpr_time_cmp(time_left, gpr_time_0(GPR_TIMESPAN)) < 0) {
break; break;
} }
test_tcp_server_poll(pa->server, 1); test_tcp_server_poll(pa->server, 1000);
} }
gpr_event_set(pa->signal_when_done, (void*)1); gpr_event_set(pa->signal_when_done, (void*)1);
gpr_free(pa); gpr_free(pa);
......
...@@ -109,7 +109,7 @@ void reconnect_server_start(reconnect_server* server, int port) { ...@@ -109,7 +109,7 @@ void reconnect_server_start(reconnect_server* server, int port) {
} }
void reconnect_server_poll(reconnect_server* server, int seconds) { void reconnect_server_poll(reconnect_server* server, int seconds) {
test_tcp_server_poll(&server->tcp_server, seconds); test_tcp_server_poll(&server->tcp_server, 1000 * seconds);
} }
void reconnect_server_clear_timestamps(reconnect_server* server) { void reconnect_server_clear_timestamps(reconnect_server* server) {
......
...@@ -77,11 +77,11 @@ void test_tcp_server_start(test_tcp_server* server, int port) { ...@@ -77,11 +77,11 @@ void test_tcp_server_start(test_tcp_server* server, int port) {
gpr_log(GPR_INFO, "test tcp server listening on 0.0.0.0:%d", port); gpr_log(GPR_INFO, "test tcp server listening on 0.0.0.0:%d", port);
} }
void test_tcp_server_poll(test_tcp_server* server, int seconds) { void test_tcp_server_poll(test_tcp_server* server, int milliseconds) {
grpc_pollset_worker* worker = nullptr; grpc_pollset_worker* worker = nullptr;
grpc_core::ExecCtx exec_ctx; grpc_core::ExecCtx exec_ctx;
grpc_millis deadline = grpc_timespec_to_millis_round_up( grpc_millis deadline = grpc_timespec_to_millis_round_up(
grpc_timeout_seconds_to_deadline(seconds)); grpc_timeout_milliseconds_to_deadline(milliseconds));
gpr_mu_lock(server->mu); gpr_mu_lock(server->mu);
GRPC_LOG_IF_ERROR("pollset_work", GRPC_LOG_IF_ERROR("pollset_work",
grpc_pollset_work(server->pollset, &worker, deadline)); grpc_pollset_work(server->pollset, &worker, deadline));
...@@ -104,7 +104,7 @@ void test_tcp_server_destroy(test_tcp_server* server) { ...@@ -104,7 +104,7 @@ void test_tcp_server_destroy(test_tcp_server* server) {
gpr_time_from_seconds(5, GPR_TIMESPAN)); gpr_time_from_seconds(5, GPR_TIMESPAN));
while (!server->shutdown && while (!server->shutdown &&
gpr_time_cmp(gpr_now(GPR_CLOCK_MONOTONIC), shutdown_deadline) < 0) { gpr_time_cmp(gpr_now(GPR_CLOCK_MONOTONIC), shutdown_deadline) < 0) {
test_tcp_server_poll(server, 1); test_tcp_server_poll(server, 1000);
} }
grpc_pollset_shutdown(server->pollset, grpc_pollset_shutdown(server->pollset,
GRPC_CLOSURE_CREATE(finish_pollset, server->pollset, GRPC_CLOSURE_CREATE(finish_pollset, server->pollset,
......
...@@ -35,7 +35,7 @@ typedef struct test_tcp_server { ...@@ -35,7 +35,7 @@ typedef struct test_tcp_server {
void test_tcp_server_init(test_tcp_server* server, void test_tcp_server_init(test_tcp_server* server,
grpc_tcp_server_cb on_connect, void* user_data); grpc_tcp_server_cb on_connect, void* user_data);
void test_tcp_server_start(test_tcp_server* server, int port); void test_tcp_server_start(test_tcp_server* server, int port);
void test_tcp_server_poll(test_tcp_server* server, int seconds); void test_tcp_server_poll(test_tcp_server* server, int milliseconds);
void test_tcp_server_destroy(test_tcp_server* server); void test_tcp_server_destroy(test_tcp_server* server);
#endif /* GRPC_TEST_CORE_UTIL_TEST_TCP_SERVER_H */ #endif /* GRPC_TEST_CORE_UTIL_TEST_TCP_SERVER_H */
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment