zebra, lib: fix the ZEBRA_INTERFACE_VRF_UPDATE zapi message

[mirror_frr.git] / lib / workqueue.c

diff --git a/lib/workqueue.c b/lib/workqueue.c
index 1af51c06c130ab06c0989a21ce088c8999c0e9a2..24ef24c7744930fb8978ad40d41112c4a0fad91c 100644 (file)
--- a/lib/workqueue.c
+++ b/lib/workqueue.c
@@ -81,9 +81,6 @@ struct work_queue *work_queue_new(struct thread_master *m,
 
        new = XCALLOC(MTYPE_WORK_QUEUE, sizeof(struct work_queue));
 
-       if (new == NULL)
-               return new;
-
        new->name = XSTRDUP(MTYPE_WORK_QUEUE_NAME, queue_name);
        new->master = m;
        SET_FLAG(new->flags, WQ_UNPLUGGED);
@@ -94,9 +91,10 @@ struct work_queue *work_queue_new(struct thread_master *m,
 
        new->cycles.granularity = WORK_QUEUE_MIN_GRANULARITY;
 
-       /* Default values, can be overriden by caller */
+       /* Default values, can be overridden by caller */
        new->spec.hold = WORK_QUEUE_DEFAULT_HOLD;
        new->spec.yield = THREAD_YIELD_TIME_SLOT;
+       new->spec.retry = WORK_QUEUE_DEFAULT_RETRY;
 
        return new;
 }
@@ -136,8 +134,17 @@ static int work_queue_schedule(struct work_queue *wq, unsigned int delay)
        if (CHECK_FLAG(wq->flags, WQ_UNPLUGGED) && (wq->thread == NULL)
            && !work_queue_empty(wq)) {
                wq->thread = NULL;
-               thread_add_timer_msec(wq->master, work_queue_run, wq, delay,
-                                     &wq->thread);
+
+               /* Schedule timer if there's a delay, otherwise just schedule
+                * as an 'event'
+                */
+               if (delay > 0)
+                       thread_add_timer_msec(wq->master, work_queue_run, wq,
+                                             delay, &wq->thread);
+               else
+                       thread_add_event(wq->master, work_queue_run, wq, 0,
+                                        &wq->thread);
+
                /* set thread yield time, if needed */
                if (wq->thread && wq->spec.yield != THREAD_YIELD_TIME_SLOT)
                        thread_set_yield_time(wq->thread, wq->spec.yield);
@@ -152,10 +159,7 @@ void work_queue_add(struct work_queue *wq, void *data)
 
        assert(wq);
 
-       if (!(item = work_queue_item_new(wq))) {
-               zlog_err("%s: unable to get new queue item", __func__);
-               return;
-       }
+       item = work_queue_item_new(wq);
 
        item->data = data;
        work_queue_item_enqueue(wq, item);
@@ -240,15 +244,16 @@ int work_queue_run(struct thread *thread)
 {
        struct work_queue *wq;
        struct work_queue_item *item, *titem;
-       wq_item_status ret;
+       wq_item_status ret = WQ_SUCCESS;
        unsigned int cycles = 0;
        char yielded = 0;
 
        wq = THREAD_ARG(thread);
-       wq->thread = NULL;
 
        assert(wq);
 
+       wq->thread = NULL;
+
        /* calculate cycle granularity:
         * list iteration == 1 run
         * listnode processing == 1 cycle
@@ -381,9 +386,14 @@ stats:
 #endif
 
        /* Is the queue done yet? If it is, call the completion callback. */
-       if (!work_queue_empty(wq))
-               work_queue_schedule(wq, 0);
-       else if (wq->spec.completion_func)
+       if (!work_queue_empty(wq)) {
+               if (ret == WQ_RETRY_LATER ||
+                   ret == WQ_QUEUE_BLOCKED)
+                       work_queue_schedule(wq, wq->spec.retry);
+               else
+                       work_queue_schedule(wq, 0);
+
+       } else if (wq->spec.completion_func)
                wq->spec.completion_func(wq);
 
        return 0;