History

posix-cpu-timers: Force next_expiration recalc after timer deletion

A timer deletion only dequeues the timer but it doesn't shutdown the related costly process wide cputimer counter and the tick dependency. The following code snippet keeps this overhead around for one week after the timer deletion: void trigger_process_counter(void) { timer_t id; struct itimerspec val = { }; val.it_value.tv_sec = 604800; timer_create(CLOCK_PROCESS_CPUTIME_ID, NULL, &id); timer_settime(id, 0, &val, NULL); timer_delete(id); } Make sure the next target's tick recalculates the nearest expiration and clears the process wide counter and tick dependency if necessary.

Frederic Weisbecker committed 5 years ago

Commit 175cc3a1 parent a5dec9f2 files · +35 −2Browse files

Showing the changes to kernel (1 of 2 files). Show all

Unified · Split

kernel/time/posix-cpu-timers.c+32−1
@@ -407,6 +407,37 @@ static int posix_cpu_timer_create(struct k_itimer *new_timer) · 406 unmodified lines
407 return 0;407 return 0;
408}408}
409 409
410/*
411 * Dequeue the timer and reset the base if it was its earliest expiration.
412 * It makes sure the next tick recalculates the base next expiration so we
413 * don't keep the costly process wide cputime counter around for a random
414 * amount of time, along with the tick dependency.
415 *
416 * If another timer gets queued between this and the next tick, its
417 * expiration will update the base next event if necessary on the next
418 * tick.
419 */
420static void disarm_timer(struct k_itimer *timer, struct task_struct *p)
421{
422 struct cpu_timer *ctmr = &timer->it.cpu;
423 struct posix_cputimer_base *base;
424 int clkidx;
425
426 if (!cpu_timer_dequeue(ctmr))
427 return;
428
429 clkidx = CPUCLOCK_WHICH(timer->it_clock);
430
431 if (CPUCLOCK_PERTHREAD(timer->it_clock))
432 base = p->posix_cputimers.bases + clkidx;
433 else
434 base = p->signal->posix_cputimers.bases + clkidx;
435
436 if (cpu_timer_getexpires(ctmr) == base->nextevt)
437 base->nextevt = 0;
438}
439
440
410/*441/*
411 * Clean up a CPU-clock timer that is about to be destroyed.442 * Clean up a CPU-clock timer that is about to be destroyed.
412 * This is called from timer deletion with the timer already locked.443 * This is called from timer deletion with the timer already locked.
@@ -441,7 +472,7 @@ static int posix_cpu_timer_del(struct k_itimer *timer) · 28 unmodified lines
441 if (timer->it.cpu.firing)472 if (timer->it.cpu.firing)
442 ret = TIMER_RETRY;473 ret = TIMER_RETRY;
443 else474 else
444 cpu_timer_dequeue(ctmr);475 disarm_timer(timer, p);
445 476
446 unlock_task_sighand(p, &flags);477 unlock_task_sighand(p, &flags);
447 }478 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t