diff options
| author |  David Garcia Quintas <dgq@google.com> | 2015-10-04 23:09:47 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2015-10-04 23:09:47 -0700 |
| commit | f747bbc04327c9ef02690cd7466ec6786967c4fe (patch) | |
| tree | b031152a4387370999e91d9922fef90efc86f3ac /src/core/surface/channel_connectivity.c | |
| parent | cb954cfc2858829fe7bff785b1a5d5204bfd338f (diff) | |
s/grpc_alarm/grpc_timer && s/grpc_cq_alarm/grpc_alarm
Diffstat (limited to 'src/core/surface/channel_connectivity.c')
| -rw-r--r-- | src/core/surface/channel_connectivity.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/surface/channel_connectivity.c b/src/core/surface/channel_connectivity.c index 47cbab154f..b992437d78 100644 --- a/src/core/surface/channel_connectivity.c +++ b/src/core/surface/channel_connectivity.c @@ -37,7 +37,7 @@ #include <grpc/support/log.h> #include "src/core/channel/client_channel.h" -#include "src/core/iomgr/alarm.h" +#include "src/core/iomgr/timer.h" #include "src/core/surface/completion_queue.h" grpc_connectivity_state grpc_channel_check_connectivity_state( @@ -74,7 +74,7 @@ typedef struct { int success; int removed; grpc_closure on_complete; - grpc_alarm alarm; + grpc_timer alarm; grpc_connectivity_state state; grpc_completion_queue *cq; grpc_cq_completion completion_storage; @@ -131,7 +131,7 @@ static void partly_done(grpc_exec_ctx *exec_ctx, state_watcher *w, gpr_mu_lock(&w->mu); w->success = 1; gpr_mu_unlock(&w->mu); - grpc_alarm_cancel(exec_ctx, &w->alarm); + grpc_timer_cancel(exec_ctx, &w->alarm); } gpr_mu_lock(&w->mu); @@ -187,7 +187,7 @@ void grpc_channel_watch_connectivity_state( w->tag = tag; w->channel = channel; - grpc_alarm_init(&exec_ctx, &w->alarm, + grpc_timer_init(&exec_ctx, &w->alarm, gpr_convert_clock_type(deadline, GPR_CLOCK_MONOTONIC), timeout_complete, w, gpr_now(GPR_CLOCK_MONOTONIC)); |