Merge pull request #7194 from qlyoung/tracing

Tracing

diff --cc bgpd/bgp_io.c
Simple merge

diff --cc bgpd/bgp_route.c
Simple merge

diff --cc lib/thread.c
index 012194a47b21358041b240479561fd7778959859,9a5453b185a9cffa731ad35d9c3b81e821d206c9..1765de957304260efd3d833e5049aca8c447c234
--- 1/lib/thread.c
--- 2/lib/thread.c
+++ b/lib/thread.c
@@@ -1163,15 -1177,14 +1177,19 @@@ void thread_cancel_event(struct thread_
   *
   * @param thread task to cancel
   */
 -void thread_cancel(struct thread *thread)
 +void thread_cancel(struct thread **thread)
  {
 -      struct thread_master *master = thread->master;
 +      struct thread_master *master;
 +
 +      if (thread == NULL || *thread == NULL)
 +              return;
 +
 +      master = (*thread)->master;
  
+       frrtrace(9, frr_libfrr, thread_cancel, master, thread->funcname,
+                thread->schedfrom, thread->schedfrom_line, NULL, thread->u.fd,
+                thread->u.val, thread->arg, thread->u.sands.tv_sec);
+ 
        assert(master->owner == pthread_self());
  
        frr_with_mutex(&master->mtx) {