diff options
| author |  yang-g <yangg@google.com> | 2015-08-24 15:54:07 -0700 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2015-08-24 15:54:07 -0700 |
| commit | 3e4bd9598bc8b5740317227c8a7a8e38f519dabe (patch) | |
| tree | 6b9399f3fd91ea545bb6cc4ffba3e72eda24303b /test/core/util/port_posix.c | |
| parent | 9fb35a53320a7b958739ce01ed50de087e6c5ee9 (diff) | |
| parent | 8c4549aec780e2cdeb72f028d9a44ad9fd853c33 (diff) | |
merge with head
Diffstat (limited to 'test/core/util/port_posix.c')
| -rw-r--r-- | test/core/util/port_posix.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/core/util/port_posix.c b/test/core/util/port_posix.c index cec0eebd33..836e62a541 100644 --- a/test/core/util/port_posix.c +++ b/test/core/util/port_posix.c @@ -178,7 +178,7 @@ static int pick_port_using_server(char *server) { gpr_mu_lock(GRPC_POLLSET_MU(&pr.pollset)); while (pr.port == -1) { grpc_pollset_worker worker; - grpc_pollset_work(&pr.pollset, &worker, + grpc_pollset_work(&pr.pollset, &worker, gpr_now(GPR_CLOCK_MONOTONIC), GRPC_TIMEOUT_SECONDS_TO_DEADLINE(1)); } gpr_mu_unlock(GRPC_POLLSET_MU(&pr.pollset)); |