From 525b95f10edf74ef8eca9773ab9015d9723c9365 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Thu, 16 May 2019 16:10:10 +0200 Subject: [PATCH] timer: simplify computation of unit activation time --- src/core/timer.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/core/timer.c b/src/core/timer.c index 8440bb27ba8..ba74dc7aea3 100644 --- a/src/core/timer.c +++ b/src/core/timer.c @@ -430,28 +430,16 @@ static void timer_enter_waiting(Timer *t, bool time_change) { case TIMER_UNIT_ACTIVE: leave_around = true; - base = trigger->inactive_exit_timestamp.monotonic; - - if (base <= 0) - base = t->last_trigger.monotonic; - + base = MAX(trigger->inactive_exit_timestamp.monotonic, t->last_trigger.monotonic); if (base <= 0) continue; - base = MAX(base, t->last_trigger.monotonic); - break; case TIMER_UNIT_INACTIVE: leave_around = true; - base = trigger->inactive_enter_timestamp.monotonic; - - if (base <= 0) - base = t->last_trigger.monotonic; - + base = MAX(trigger->inactive_enter_timestamp.monotonic, t->last_trigger.monotonic); if (base <= 0) continue; - base = MAX(base, t->last_trigger.monotonic); - break; default: -- 2.47.3