dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-04 23:20:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

timer: simplify computation of unit activation time

Browse Source
This commit is contained in:
David Tardon
2019-05-16 16:10:10 +02:00
committed by Zbigniew Jędrzejewski-Szmek
parent e7b621ee1f
commit 525b95f10e
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/timer.c
View File

@@ -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: