proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-13 16:26:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib/xref: fix frrtrace() calls in thread code

Browse Source 
This didn't exist yet when the xref code came around, and since
frrtrace() gets collapsed to nothing by the preprocessor when
tracepoints are disabled, it didn't cause any compiler errors...

Signed-off-by: David Lamparter <equinox@diac24.net>
This commit is contained in:
David Lamparter 2021-02-02 21:05:50 +01:00
parent 08a73c422d
commit 6c3aa850ea
1 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/thread.c
View File

@ -633,9 +633,6 @@ unsigned long thread_timer_remain_second(struct thread *thread)
return thread_timer_remain_msec(thread) / 1000LL;
}
#define debugargdef const char *funcname, const char *schedfrom, int fromln
#define debugargpass funcname, schedfrom, fromln
struct timeval thread_timer_remain(struct thread *thread)
{
struct timeval remain;
@ -841,11 +838,13 @@ struct thread *_thread_add_read_write(const struct xref_threadsched *xref,
struct thread **thread_array;
if (dir == THREAD_READ)
frrtrace(9, frr_libfrr, schedule_read, m, funcname, schedfrom,
fromln, t_ptr, fd, 0, arg, 0);
frrtrace(9, frr_libfrr, schedule_read, m,
xref->funcname, xref->xref.file, xref->xref.line,
t_ptr, fd, 0, arg, 0);
else
frrtrace(9, frr_libfrr, schedule_write, m, funcname, schedfrom,
fromln, t_ptr, fd, 0, arg, 0);
frrtrace(9, frr_libfrr, schedule_write, m,
xref->funcname, xref->xref.file, xref->xref.line,
t_ptr, fd, 0, arg, 0);
assert(fd >= 0 && fd < m->fd_limit);
frr_with_mutex(&m->mtx) {
@ -921,7 +920,8 @@ _thread_add_timer_timeval(const struct xref_threadsched *xref,
assert(type == THREAD_TIMER);
assert(time_relative);
frrtrace(9, frr_libfrr, schedule_timer, m, funcname, schedfrom, fromln,
frrtrace(9, frr_libfrr, schedule_timer, m,
xref->funcname, xref->xref.file, xref->xref.line,
t_ptr, 0, 0, arg, (long)time_relative->tv_sec);
frr_with_mutex(&m->mtx) {
@ -1003,7 +1003,8 @@ struct thread *_thread_add_event(const struct xref_threadsched *xref,
{
struct thread *thread = NULL;
frrtrace(9, frr_libfrr, schedule_event, m, funcname, schedfrom, fromln,
frrtrace(9, frr_libfrr, schedule_event, m,
xref->funcname, xref->xref.file, xref->xref.line,
t_ptr, 0, val, arg, 0);
assert(m != NULL);
@ -1239,8 +1240,9 @@ void thread_cancel(struct thread **thread)
master = (*thread)->master;
frrtrace(9, frr_libfrr, thread_cancel, master, (*thread)->funcname,
(*thread)->schedfrom, (*thread)->schedfrom_line, NULL, (*thread)->u.fd,
frrtrace(9, frr_libfrr, thread_cancel, master,
(*thread)->xref->funcname, (*thread)->xref->xref.file,
(*thread)->xref->xref.line, NULL, (*thread)->u.fd,
(*thread)->u.val, (*thread)->arg, (*thread)->u.sands.tv_sec);
assert(master->owner == pthread_self());
@ -1287,8 +1289,8 @@ void thread_cancel_async(struct thread_master *master, struct thread **thread,
if (thread && *thread)
frrtrace(9, frr_libfrr, thread_cancel_async, master,
(*thread)->funcname, (*thread)->schedfrom,
(*thread)->schedfrom_line, NULL, (*thread)->u.fd,
(*thread)->xref->funcname, (*thread)->xref->xref.file,
(*thread)->xref->xref.line, NULL, (*thread)->u.fd,
(*thread)->u.val, (*thread)->arg,
(*thread)->u.sands.tv_sec);
else
@ -1673,8 +1675,9 @@ void thread_call(struct thread *thread)
GETRUSAGE(&before);
thread->real = before.real;
frrtrace(9, frr_libfrr, thread_call, thread->master, thread->funcname,
thread->schedfrom, thread->schedfrom_line, NULL, thread->u.fd,
frrtrace(9, frr_libfrr, thread_call, thread->master,
thread->xref->funcname, thread->xref->xref.file,
thread->xref->xref.line, NULL, thread->u.fd,
thread->u.val, thread->arg, thread->u.sands.tv_sec);
pthread_setspecific(thread_current, thread);