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/iomgr/iomgr.c | |
| parent | cb954cfc2858829fe7bff785b1a5d5204bfd338f (diff) | |
s/grpc_alarm/grpc_timer && s/grpc_cq_alarm/grpc_alarm
Diffstat (limited to 'src/core/iomgr/iomgr.c')
| -rw-r--r-- | src/core/iomgr/iomgr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/iomgr/iomgr.c b/src/core/iomgr/iomgr.c index e61fc32925..212ce5534d 100644 --- a/src/core/iomgr/iomgr.c +++ b/src/core/iomgr/iomgr.c @@ -43,7 +43,7 @@ #include <grpc/support/thd.h> #include "src/core/iomgr/iomgr_internal.h" -#include "src/core/iomgr/alarm_internal.h" +#include "src/core/iomgr/timer_internal.h" #include "src/core/support/string.h" static gpr_mu g_mu; @@ -55,7 +55,7 @@ void grpc_iomgr_init(void) { g_shutdown = 0; gpr_mu_init(&g_mu); gpr_cv_init(&g_rcv); - grpc_alarm_list_init(gpr_now(GPR_CLOCK_MONOTONIC)); + grpc_timer_list_init(gpr_now(GPR_CLOCK_MONOTONIC)); g_root_object.next = g_root_object.prev = &g_root_object; g_root_object.name = "root"; grpc_iomgr_platform_init(); @@ -98,7 +98,7 @@ void grpc_iomgr_shutdown(void) { } last_warning_time = gpr_now(GPR_CLOCK_REALTIME); } - if (grpc_alarm_check(&exec_ctx, gpr_inf_future(GPR_CLOCK_MONOTONIC), + if (grpc_timer_check(&exec_ctx, gpr_inf_future(GPR_CLOCK_MONOTONIC), NULL)) { gpr_mu_unlock(&g_mu); grpc_exec_ctx_flush(&exec_ctx); @@ -124,7 +124,7 @@ void grpc_iomgr_shutdown(void) { } gpr_mu_unlock(&g_mu); - grpc_alarm_list_shutdown(&exec_ctx); + grpc_timer_list_shutdown(&exec_ctx); grpc_exec_ctx_finish(&exec_ctx); /* ensure all threads have left g_mu */ |