diff options
| author |  Sree Kuchibhotla <sreek@google.com> | 2017-02-01 08:33:33 -0800 |
|---|---|---|
| committer | Sree Kuchibhotla <sreek@google.com> | 2017-02-01 08:33:33 -0800 |
| commit | 03370d31a8adab18761f075754f74cae74636880 (patch) | |
| tree | e2e6d7ddca5f87ce45948826aedd7d10b329a474 /test/core/memory_usage/server.c | |
| parent | 6687cb829767c3ab77536b8943343885f8eda131 (diff) | |
| parent | 459e10d80e09a5c8e88dc10ff703358b5d3ee57b (diff) | |
Merge branch 'master' into poll-cv-disable
Diffstat (limited to 'test/core/memory_usage/server.c')
| -rw-r--r-- | test/core/memory_usage/server.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/core/memory_usage/server.c b/test/core/memory_usage/server.c index 1cae4f4064..ab059c25b8 100644 --- a/test/core/memory_usage/server.c +++ b/test/core/memory_usage/server.c @@ -232,7 +232,7 @@ int main(int argc, char **argv) { gpr_log(GPR_INFO, "Shutting down due to SIGINT"); grpc_server_shutdown_and_notify(server, cq, tag(1000)); GPR_ASSERT(grpc_completion_queue_pluck( - cq, tag(1000), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), NULL) + cq, tag(1000), grpc_timeout_seconds_to_deadline(5), NULL) .type == GRPC_OP_COMPLETE); grpc_completion_queue_shutdown(cq); shutdown_started = 1; |