Merge pull request #12708 from donaldsharp/no_notification

[mirror_frr.git] / lib / thread.c

diff --git a/lib/thread.c b/lib/thread.c
index fd79503cc6ac5ee3affd430a7f07411938af0309..4078634f75fef55b3e41a07c7fae64ef792aff57 100644 (file)
--- a/lib/thread.c
+++ b/lib/thread.c
@@ -102,9 +102,7 @@ unsigned long cputime_threshold = CONSUMED_TIME_CHECK;
 unsigned long walltime_threshold = CONSUMED_TIME_CHECK;
 
 /* CLI start ---------------------------------------------------------------- */
-#ifndef VTYSH_EXTRACT_PL
 #include "lib/thread_clippy.c"
-#endif
 
 static unsigned int cpu_record_hash_key(const struct cpu_thread_history *a)
 {
@@ -217,7 +215,7 @@ static void cpu_record_print(struct vty *vty, uint8_t filter)
        tmp.funcname = "TOTAL";
        tmp.types = filter;
 
-       frr_with_mutex(&masters_mtx) {
+       frr_with_mutex (&masters_mtx) {
                for (ALL_LIST_ELEMENTS_RO(masters, ln, m)) {
                        const char *name = m->name ? m->name : "main";
 
@@ -283,9 +281,9 @@ static void cpu_record_clear(uint8_t filter)
        struct thread_master *m;
        struct listnode *ln;
 
-       frr_with_mutex(&masters_mtx) {
+       frr_with_mutex (&masters_mtx) {
                for (ALL_LIST_ELEMENTS_RO(masters, ln, m)) {
-                       frr_with_mutex(&m->mtx) {
+                       frr_with_mutex (&m->mtx) {
                                void *args[2] = {tmp, m->cpu_record};
                                hash_iterate(
                                        m->cpu_record,
@@ -463,7 +461,7 @@ DEFUN_NOSH (show_thread_poll,
        struct listnode *node;
        struct thread_master *m;
 
-       frr_with_mutex(&masters_mtx) {
+       frr_with_mutex (&masters_mtx) {
                for (ALL_LIST_ELEMENTS_RO(masters, node, m)) {
                        show_thread_poll_helper(vty, m);
                }
@@ -630,7 +628,7 @@ struct thread_master *thread_master_create(const char *name)
                                   sizeof(struct pollfd) * rv->handler.pfdsize);
 
        /* add to list of threadmasters */
-       frr_with_mutex(&masters_mtx) {
+       frr_with_mutex (&masters_mtx) {
                if (!masters)
                        masters = list_new();
 
@@ -642,7 +640,7 @@ struct thread_master *thread_master_create(const char *name)
 
 void thread_master_set_name(struct thread_master *master, const char *name)
 {
-       frr_with_mutex(&master->mtx) {
+       frr_with_mutex (&master->mtx) {
                XFREE(MTYPE_THREAD_MASTER, master->name);
                master->name = XSTRDUP(MTYPE_THREAD_MASTER, name);
        }
@@ -708,7 +706,7 @@ static void thread_array_free(struct thread_master *m,
  */
 void thread_master_free_unused(struct thread_master *m)
 {
-       frr_with_mutex(&m->mtx) {
+       frr_with_mutex (&m->mtx) {
                struct thread *t;
                while ((t = thread_list_pop(&m->unuse)))
                        thread_free(m, t);
@@ -720,7 +718,7 @@ void thread_master_free(struct thread_master *m)
 {
        struct thread *t;
 
-       frr_with_mutex(&masters_mtx) {
+       frr_with_mutex (&masters_mtx) {
                listnode_delete(masters, m);
                if (masters->count == 0) {
                        list_delete(&masters);
@@ -756,7 +754,10 @@ unsigned long thread_timer_remain_msec(struct thread *thread)
 {
        int64_t remain;
 
-       frr_with_mutex(&thread->mtx) {
+       if (!thread_is_scheduled(thread))
+               return 0;
+
+       frr_with_mutex (&thread->mtx) {
                remain = monotime_until(&thread->u.sands, NULL) / 1000LL;
        }
 
@@ -772,7 +773,7 @@ unsigned long thread_timer_remain_second(struct thread *thread)
 struct timeval thread_timer_remain(struct thread *thread)
 {
        struct timeval remain;
-       frr_with_mutex(&thread->mtx) {
+       frr_with_mutex (&thread->mtx) {
                monotime_until(&thread->u.sands, &remain);
        }
        return remain;
@@ -987,7 +988,7 @@ void _thread_add_read_write(const struct xref_threadsched *xref,
        if (fd >= m->fd_limit)
                assert(!"Number of FD's open is greater than FRR currently configured to handle, aborting");
 
-       frr_with_mutex(&m->mtx) {
+       frr_with_mutex (&m->mtx) {
                if (t_ptr && *t_ptr)
                        // thread is already scheduled; don't reschedule
                        break;
@@ -1030,7 +1031,7 @@ void _thread_add_read_write(const struct xref_threadsched *xref,
                        m->handler.pfdcount++;
 
                if (thread) {
-                       frr_with_mutex(&thread->mtx) {
+                       frr_with_mutex (&thread->mtx) {
                                thread->u.fd = fd;
                                thread_array[thread->u.fd] = thread;
                        }
@@ -1066,14 +1067,14 @@ static void _thread_add_timer_timeval(const struct xref_threadsched *xref,
        monotime(&t);
        timeradd(&t, time_relative, &t);
 
-       frr_with_mutex(&m->mtx) {
+       frr_with_mutex (&m->mtx) {
                if (t_ptr && *t_ptr)
                        /* thread is already scheduled; don't reschedule */
                        return;
 
                thread = thread_get(m, THREAD_TIMER, func, arg, xref);
 
-               frr_with_mutex(&thread->mtx) {
+               frr_with_mutex (&thread->mtx) {
                        thread->u.sands = t;
                        thread_timer_list_add(&m->timer, thread);
                        if (t_ptr) {
@@ -1151,13 +1152,13 @@ void _thread_add_event(const struct xref_threadsched *xref,
 
        assert(m != NULL);
 
-       frr_with_mutex(&m->mtx) {
+       frr_with_mutex (&m->mtx) {
                if (t_ptr && *t_ptr)
                        /* thread is already scheduled; don't reschedule */
                        break;
 
                thread = thread_get(m, THREAD_EVENT, func, arg, xref);
-               frr_with_mutex(&thread->mtx) {
+               frr_with_mutex (&thread->mtx) {
                        thread->u.val = val;
                        thread_list_add_tail(&m->event, thread);
                }
@@ -1351,9 +1352,9 @@ static void do_thread_cancel(struct thread_master *master)
        struct thread_list_head *list = NULL;
        struct thread **thread_array = NULL;
        struct thread *thread;
-
        struct cancel_req *cr;
        struct listnode *ln;
+
        for (ALL_LIST_ELEMENTS_RO(master->cancel_req, ln, cr)) {
                /*
                 * If this is an event object cancellation, search
@@ -1376,6 +1377,9 @@ static void do_thread_cancel(struct thread_master *master)
                if (!thread)
                        continue;
 
+               list = NULL;
+               thread_array = NULL;
+
                /* Determine the appropriate queue to cancel the thread from */
                switch (thread->type) {
                case THREAD_READ:
@@ -1438,7 +1442,7 @@ static void cancel_event_helper(struct thread_master *m, void *arg, int flags)
 
        cr->flags = flags;
 
-       frr_with_mutex(&m->mtx) {
+       frr_with_mutex (&m->mtx) {
                cr->eventobj = arg;
                listnode_add(m->cancel_req, cr);
                do_thread_cancel(m);
@@ -1496,7 +1500,7 @@ void thread_cancel(struct thread **thread)
 
        assert(master->owner == pthread_self());
 
-       frr_with_mutex(&master->mtx) {
+       frr_with_mutex (&master->mtx) {
                struct cancel_req *cr =
                        XCALLOC(MTYPE_TMP, sizeof(struct cancel_req));
                cr->thread = *thread;
@@ -1548,7 +1552,7 @@ void thread_cancel_async(struct thread_master *master, struct thread **thread,
 
        assert(master->owner != pthread_self());
 
-       frr_with_mutex(&master->mtx) {
+       frr_with_mutex (&master->mtx) {
                master->canceled = false;
 
                if (thread) {
@@ -1928,7 +1932,7 @@ unsigned long thread_consumed_time(RUSAGE_T *now, RUSAGE_T *start,
 int thread_should_yield(struct thread *thread)
 {
        int result;
-       frr_with_mutex(&thread->mtx) {
+       frr_with_mutex (&thread->mtx) {
                result = monotime_since(&thread->real, NULL)
                         > (int64_t)thread->yield;
        }
@@ -1937,7 +1941,7 @@ int thread_should_yield(struct thread *thread)
 
 void thread_set_yield_time(struct thread *thread, unsigned long yield_time)
 {
-       frr_with_mutex(&thread->mtx) {
+       frr_with_mutex (&thread->mtx) {
                thread->yield = yield_time;
        }
 }
@@ -2079,11 +2083,11 @@ void _thread_execute(const struct xref_threadsched *xref,
        struct thread *thread;
 
        /* Get or allocate new thread to execute. */
-       frr_with_mutex(&m->mtx) {
+       frr_with_mutex (&m->mtx) {
                thread = thread_get(m, THREAD_EVENT, func, arg, xref);
 
                /* Set its event value. */
-               frr_with_mutex(&thread->mtx) {
+               frr_with_mutex (&thread->mtx) {
                        thread->add_type = THREAD_EXECUTE;
                        thread->u.val = val;
                        thread->ref = &thread;