aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/lib/iomgr/timer_manager.cc
diff options
context:
space:
mode:
authorGravatar Craig Tiller <ctiller@google.com>2017-11-13 14:01:02 -0800
committerGravatar Craig Tiller <ctiller@google.com>2017-11-13 14:01:02 -0800
commit15ff8f35977b5f93aafd3333b8b248d3aa23ee61 (patch)
treeceda610b7292d48ba980975b72a8153141369c2d /src/core/lib/iomgr/timer_manager.cc
parent6def7103bfd7b8148f3113feaa7c6a9f2673ee6f (diff)
parent6d472b3eef62fcc15df82d5ff4bfa3ab436b5477 (diff)
Merge github.com:grpc/grpc into lfe3
Diffstat (limited to 'src/core/lib/iomgr/timer_manager.cc')
-rw-r--r--src/core/lib/iomgr/timer_manager.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/lib/iomgr/timer_manager.cc b/src/core/lib/iomgr/timer_manager.cc
index a0ed6e029e..acc40b6c9e 100644
--- a/src/core/lib/iomgr/timer_manager.cc
+++ b/src/core/lib/iomgr/timer_manager.cc
@@ -225,6 +225,11 @@ static void timer_main_loop(grpc_exec_ctx* exec_ctx) {
for (;;) {
grpc_millis next = GRPC_MILLIS_INF_FUTURE;
grpc_exec_ctx_invalidate_now(exec_ctx);
+
+ /* Calibrate g_start_time in exec_ctx.cc with a regular interval in case the
+ * system clock has changed */
+ grpc_exec_ctx_maybe_update_start_time(exec_ctx);
+
// check timer state, updates next to the next time to run a check
switch (grpc_timer_check(exec_ctx, &next)) {
case GRPC_TIMERS_FIRED: