diff options
| author |  Vijay Pai <vpai@google.com> | 2015-07-21 14:20:43 -0700 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2015-07-21 14:20:43 -0700 |
| commit | 23a33aaef5b9400502fb1b20d25c82c7ad929a96 (patch) | |
| tree | e9acca9068c8e1c7c4fbe666fa7bb9f9740498e0 /src/core/iomgr/tcp_client_posix.c | |
| parent | 86ba41370b18fd0446c1ff70411f39b480779d1b (diff) | |
| parent | 4a6f9e08e9592c4bb07eef0e41d70b86a5dc1abc (diff) | |
Merge pull request #2529 from ctiller/prefer-gin-n-tonic
Move alarm subsystem to monotonic time
Diffstat (limited to 'src/core/iomgr/tcp_client_posix.c')
| -rw-r--r-- | src/core/iomgr/tcp_client_posix.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/iomgr/tcp_client_posix.c b/src/core/iomgr/tcp_client_posix.c index 2ae0251abb..41d8b169e0 100644 --- a/src/core/iomgr/tcp_client_posix.c +++ b/src/core/iomgr/tcp_client_posix.c @@ -253,8 +253,8 @@ void grpc_tcp_client_connect(void (*cb)(void *arg, grpc_endpoint *ep), ac->write_closure.cb_arg = ac; gpr_mu_lock(&ac->mu); - grpc_alarm_init(&ac->alarm, deadline, on_alarm, ac, - gpr_now(GPR_CLOCK_REALTIME)); + grpc_alarm_init(&ac->alarm, gpr_convert_clock_type(deadline, GPR_CLOCK_MONOTONIC), + on_alarm, ac, gpr_now(GPR_CLOCK_MONOTONIC)); grpc_fd_notify_on_write(ac->fd, &ac->write_closure); gpr_mu_unlock(&ac->mu); |