faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Enforce timeout class separation from last dispatched timeout

Browse source
This commit is contained in:
Miroslav Lichvar 2010-12-17 16:09:12 +01:00
parent 3b3ca4afdc
commit 0078705bbe
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sched.c
View file

@ -110,6 +110,9 @@ static SCH_TimeoutID next_tqe_id;
/* Pointer to head of free list */ /* Pointer to head of free list */
static TimerQueueEntry *tqe_free_list = NULL; static TimerQueueEntry *tqe_free_list = NULL;
/* Timestamp when was last timeout dispatched for each class */
static struct timeval last_class_dispatch[SCH_NumberOfClasses];
/* ================================================== */ /* ================================================== */
static int need_to_exit; static int need_to_exit;
@ -337,6 +340,7 @@ SCH_AddTimeoutInClass(double min_delay, double separation, double randomness,
double new_min_delay; double new_min_delay;
assert(initialised); assert(initialised);
assert(class < SCH_NumberOfClasses);
if (randomness > 0.0) { if (randomness > 0.0) {
r = random() % 0xffff / (0xffff - 1.0) * randomness + 1.0; r = random() % 0xffff / (0xffff - 1.0) * randomness + 1.0;
@ -347,6 +351,12 @@ SCH_AddTimeoutInClass(double min_delay, double separation, double randomness,
LCL_ReadRawTime(&now); LCL_ReadRawTime(&now);
new_min_delay = min_delay; new_min_delay = min_delay;
/* Check the separation from the last dispatched timeout */
UTI_DiffTimevalsToDouble(&diff, &now, &last_class_dispatch[class]);
if (diff < separation && diff >= 0.0 && diff + new_min_delay < separation) {
new_min_delay = separation - diff;
}
/* Scan through list for entries in the same class and increase min_delay /* Scan through list for entries in the same class and increase min_delay
if necessary to keep at least the separation away */ if necessary to keep at least the separation away */
for (ptr = timer_queue.next; ptr != &timer_queue; ptr = ptr->next) { for (ptr = timer_queue.next; ptr != &timer_queue; ptr = ptr->next) {
@ -433,6 +443,8 @@ dispatch_timeouts(struct timeval *now) {
(UTI_CompareTimevals(now, &(timer_queue.next->tv)) >= 0)) { (UTI_CompareTimevals(now, &(timer_queue.next->tv)) >= 0)) {
ptr = timer_queue.next; ptr = timer_queue.next;
last_class_dispatch[ptr->class] = *now;
handler = ptr->handler; handler = ptr->handler;
arg = ptr->arg; arg = ptr->arg;