From ba276c8153e510a6741dc8a9492f5bed2b375825 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 11 Dec 2013 23:41:21 +0100 Subject: [PATCH] sd-event: try to move each wakeup to the same spot within every 10s In addition to the same spot within every 1min, every 1s, every 250s --- src/libsystemd-bus/sd-event.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/libsystemd-bus/sd-event.c b/src/libsystemd-bus/sd-event.c index 9fceb7b13ed..462dd413e27 100644 --- a/src/libsystemd-bus/sd-event.c +++ b/src/libsystemd-bus/sd-event.c @@ -1379,8 +1379,9 @@ static usec_t sleep_between(sd_event *e, usec_t a, usec_t b) { We implement this by waking up everywhere at the same time within any given minute if we can, synchronised via the perturbation value determined from the boot ID. If we can't, - then we try to find the same spot in every 1s and then 250ms - step. Otherwise, we pick the last possible time to wake up. + then we try to find the same spot in every 10s, then 1s and + then 250ms step. Otherwise, we pick the last possible time + to wake up. */ c = (b / USEC_PER_MINUTE) * USEC_PER_MINUTE + e->perturb; @@ -1391,6 +1392,17 @@ static usec_t sleep_between(sd_event *e, usec_t a, usec_t b) { c -= USEC_PER_MINUTE; } + if (c >= a) + return c; + + c = (b / (USEC_PER_SEC*10)) * (USEC_PER_SEC*10) + (e->perturb % (USEC_PER_SEC*10)); + if (c >= b) { + if (_unlikely_(c < USEC_PER_SEC*10)) + return b; + + c -= USEC_PER_SEC*10; + } + if (c >= a) return c;