proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 22:29:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: don't awaken from poll for every timer

Browse Source 
Only ask the event-loop poll() to awaken if a newly-added timer
actually might have changed the required timeout. Also compute
timer deadline outside of mutex locks.

Signed-off-by: Mark Stapp <mjs@voltanet.io>
This commit is contained in:
Mark Stapp 2021-02-18 09:37:09 -05:00
parent 4322dea7e0
commit 96fe578a64
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/thread.c
View File

@ -913,6 +913,7 @@ _thread_add_timer_timeval(const struct xref_threadsched *xref,
struct thread **t_ptr) struct thread **t_ptr)
{ {
struct thread *thread; struct thread *thread;
struct timeval t;
assert(m != NULL); assert(m != NULL);
@ -922,6 +923,10 @@ _thread_add_timer_timeval(const struct xref_threadsched *xref,
xref->funcname, xref->xref.file, xref->xref.line, xref->funcname, xref->xref.file, xref->xref.line,
t_ptr, 0, 0, arg, (long)time_relative->tv_sec); t_ptr, 0, 0, arg, (long)time_relative->tv_sec);
/* Compute expiration/deadline time. */
monotime(&t);
timeradd(&t, time_relative, &t);
frr_with_mutex(&m->mtx) { frr_with_mutex(&m->mtx) {
if (t_ptr && *t_ptr) if (t_ptr && *t_ptr)
/* thread is already scheduled; don't reschedule */ /* thread is already scheduled; don't reschedule */
@ -930,9 +935,7 @@ _thread_add_timer_timeval(const struct xref_threadsched *xref,
thread = thread_get(m, THREAD_TIMER, func, arg, xref); thread = thread_get(m, THREAD_TIMER, func, arg, xref);
frr_with_mutex(&thread->mtx) { frr_with_mutex(&thread->mtx) {
monotime(&thread->u.sands); thread->u.sands = t;
timeradd(&thread->u.sands, time_relative,
&thread->u.sands);
thread_timer_list_add(&m->timer, thread); thread_timer_list_add(&m->timer, thread);
if (t_ptr) { if (t_ptr) {
*t_ptr = thread; *t_ptr = thread;
@ -940,7 +943,12 @@ _thread_add_timer_timeval(const struct xref_threadsched *xref,
} }
} }
AWAKEN(m); /* The timer list is sorted - if this new timer
* might change the time we'll wait for, give the pthread
* a chance to re-compute.
*/
if (thread_timer_list_first(&m->timer) == thread)
AWAKEN(m);
} }
return thread; return thread;