aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2016-04-14 08:08:38 -0700
committerGravatar Craig Tiller <ctiller@google.com>2016-04-14 08:08:38 -0700
commitf3596c50747fd383998e03b3fbd2da3aa1c2510e (patch)
treee4c90698f62e44bd3ae6065ca28e97d341185759 /src/core
parentd2fd769aaeb72955910ac103bd0ec9e6e4f39d78 (diff)
Fix bugs in early triggering
Diffstat (limited to 'src/core')
-rw-r--r--src/core/lib/iomgr/timer.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/core/lib/iomgr/timer.c b/src/core/lib/iomgr/timer.c
index 5ebbbb270d..acb5b26c87 100644
--- a/src/core/lib/iomgr/timer.c
+++ b/src/core/lib/iomgr/timer.c
@@ -184,11 +184,13 @@ void grpc_timer_init(grpc_exec_ctx *exec_ctx, grpc_timer *timer,
timer->triggered = 0;
if (!g_initialized) {
+ timer->triggered = 1;
grpc_exec_ctx_enqueue(exec_ctx, &timer->closure, false, NULL);
return;
}
if (gpr_time_cmp(deadline, now) <= 0) {
+ timer->triggered = 1;
grpc_exec_ctx_enqueue(exec_ctx, &timer->closure, true, NULL);
return;
}