diff options
| author |  Craig Tiller <ctiller@google.com> | 2017-07-17 14:23:46 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2017-07-17 14:23:46 -0700 |
| commit | 565d4c1e8863202fcc1d2f0c7bf56cca206e4f88 (patch) | |
| tree | 5b88f983735e59efe7b7d0a24e3f90d5d8afb62f /src/core/ext | |
| parent | fa5c6215bec5be0830e429c3321cb2db355a49c0 (diff) | |
Progress
Diffstat (limited to 'src/core/ext')
| -rw-r--r-- | src/core/ext/filters/client_channel/channel_connectivity.c | 4 | ||||
| -rw-r--r-- | src/core/ext/filters/client_channel/connector.h | 2 | ||||
| -rw-r--r-- | src/core/ext/transport/chttp2/transport/writing.c | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/core/ext/filters/client_channel/channel_connectivity.c b/src/core/ext/filters/client_channel/channel_connectivity.c index c3dca14305..39dd927d70 100644 --- a/src/core/ext/filters/client_channel/channel_connectivity.c +++ b/src/core/ext/filters/client_channel/channel_connectivity.c @@ -186,8 +186,8 @@ static void watcher_timer_init(grpc_exec_ctx *exec_ctx, void *arg, watcher_timer_init_arg *wa = (watcher_timer_init_arg *)arg; grpc_timer_init(exec_ctx, &wa->w->alarm, - gpr_convert_clock_type(wa->deadline, GPR_CLOCK_MONOTONIC), - &wa->w->on_timeout, gpr_now(GPR_CLOCK_MONOTONIC)); + grpc_timespec_to_millis(exec_ctx, wa->deadline), + &wa->w->on_timeout); gpr_free(wa); } diff --git a/src/core/ext/filters/client_channel/connector.h b/src/core/ext/filters/client_channel/connector.h index 7f3d4a1cc0..bf79f261b0 100644 --- a/src/core/ext/filters/client_channel/connector.h +++ b/src/core/ext/filters/client_channel/connector.h @@ -34,7 +34,7 @@ typedef struct { /** set of pollsets interested in this connection */ grpc_pollset_set *interested_parties; /** deadline for connection */ - gpr_timespec deadline; + grpc_millis deadline; /** channel arguments (to be passed to transport) */ const grpc_channel_args *channel_args; } grpc_connect_in_args; diff --git a/src/core/ext/transport/chttp2/transport/writing.c b/src/core/ext/transport/chttp2/transport/writing.c index 3e16fda6dc..69e8c8f062 100644 --- a/src/core/ext/transport/chttp2/transport/writing.c +++ b/src/core/ext/transport/chttp2/transport/writing.c @@ -261,8 +261,7 @@ grpc_chttp2_begin_write_result grpc_chttp2_begin_write( t->ping_state.pings_before_data_required = t->ping_policy.max_pings_without_data; if (!t->is_client) { - t->ping_recv_state.last_ping_recv_time = - gpr_inf_past(GPR_CLOCK_MONOTONIC); + t->ping_recv_state.last_ping_recv_time = 0; t->ping_recv_state.ping_strikes = 0; } } else { |