diff --git a/lib/event.c b/lib/event.c index fc46a11c0b46..d1b9e98b8184 100644 --- a/lib/event.c +++ b/lib/event.c @@ -1531,13 +1531,7 @@ void event_cancel_async(struct event_loop *master, struct event **thread, { assert(!(thread && eventobj) && (thread || eventobj)); - if (thread && *thread) - frrtrace(9, frr_libfrr, event_cancel_async, 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); - else + if (!thread) frrtrace(9, frr_libfrr, event_cancel_async, master, NULL, NULL, 0, NULL, 0, 0, eventobj, 0); @@ -1547,6 +1541,14 @@ void event_cancel_async(struct event_loop *master, struct event **thread, master->canceled = false; if (thread) { + if (*thread) + frrtrace(9, frr_libfrr, event_cancel_async, + 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); struct cancel_req *cr = XCALLOC(MTYPE_TMP, sizeof(struct cancel_req)); cr->threadref = thread;