diff options
author | 2015-07-10 16:43:58 -0700 | |
---|---|---|
committer | 2015-07-10 16:43:58 -0700 | |
commit | d1c925402964f5c1139d71ff7fe5cac97b1ee257 (patch) | |
tree | 49cfb2ff68a32ddc5ebfb3e771dcdcc334c25c0a /src/core/surface/server.c | |
parent | 25adcaa164780075cf85ae63774e0cae867effff (diff) | |
parent | 080d6c50bbed3dde739b2de610023d8bd8d7966f (diff) |
Merge pull request #2289 from ctiller/footprints-on-the-sands-of-time
Introduce multiple clocks to GPR
Diffstat (limited to 'src/core/surface/server.c')
-rw-r--r-- | src/core/surface/server.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/surface/server.c b/src/core/surface/server.c index eed2320e45..4dc51bf031 100644 --- a/src/core/surface/server.c +++ b/src/core/surface/server.c @@ -488,9 +488,9 @@ static void maybe_finish_shutdown(grpc_server *server) { if (server->root_channel_data.next != &server->root_channel_data || server->listeners_destroyed < num_listeners(server)) { if (gpr_time_cmp( - gpr_time_sub(gpr_now(), server->last_shutdown_message_time), + gpr_time_sub(gpr_now(GPR_CLOCK_REALTIME), server->last_shutdown_message_time), gpr_time_from_seconds(1)) >= 0) { - server->last_shutdown_message_time = gpr_now(); + server->last_shutdown_message_time = gpr_now(GPR_CLOCK_REALTIME); gpr_log(GPR_DEBUG, "Waiting for %d channels and %d/%d listeners to be destroyed" " before shutting down server", @@ -948,7 +948,7 @@ void grpc_server_shutdown_and_notify(grpc_server *server, return; } - server->last_shutdown_message_time = gpr_now(); + server->last_shutdown_message_time = gpr_now(GPR_CLOCK_REALTIME); channel_broadcaster_init(server, &broadcaster); |