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

Merge pull request #3464 from mjstapp/wq_event

Browse Source 
libs,zebra: support timeout for workqueue retries, use for rib
This commit is contained in:
Donald Sharp 2018-12-14 10:00:49 -05:00 committed by GitHub
commit 85c3d6005e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
lib/workqueue.c
View File

@ -91,9 +91,10 @@ struct work_queue *work_queue_new(struct thread_master *m,
new->cycles.granularity = WORK_QUEUE_MIN_GRANULARITY; 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.hold = WORK_QUEUE_DEFAULT_HOLD;
new->spec.yield = THREAD_YIELD_TIME_SLOT; new->spec.yield = THREAD_YIELD_TIME_SLOT;
new->spec.retry = WORK_QUEUE_DEFAULT_RETRY;
return new; return new;
} }
@ -133,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) if (CHECK_FLAG(wq->flags, WQ_UNPLUGGED) && (wq->thread == NULL)
&& !work_queue_empty(wq)) { && !work_queue_empty(wq)) {
wq->thread = NULL; 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 */ /* set thread yield time, if needed */
if (wq->thread && wq->spec.yield != THREAD_YIELD_TIME_SLOT) if (wq->thread && wq->spec.yield != THREAD_YIELD_TIME_SLOT)
thread_set_yield_time(wq->thread, wq->spec.yield); thread_set_yield_time(wq->thread, wq->spec.yield);
@ -234,7 +244,7 @@ int work_queue_run(struct thread *thread)
{ {
struct work_queue *wq; struct work_queue *wq;
struct work_queue_item *item, *titem; struct work_queue_item *item, *titem;
wq_item_status ret; wq_item_status ret = WQ_SUCCESS;
unsigned int cycles = 0; unsigned int cycles = 0;
char yielded = 0; char yielded = 0;
@ -376,9 +386,14 @@ stats:
#endif #endif
/* Is the queue done yet? If it is, call the completion callback. */ /* Is the queue done yet? If it is, call the completion callback. */
if (!work_queue_empty(wq)) if (!work_queue_empty(wq)) {
work_queue_schedule(wq, 0); if (ret == WQ_RETRY_LATER ||
else if (wq->spec.completion_func) 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); wq->spec.completion_func(wq);
return 0; return 0;

5
lib/workqueue.h
View File

@ -30,6 +30,9 @@ DECLARE_MTYPE(WORK_QUEUE)
/* Hold time for the initial schedule of a queue run, in millisec */ /* Hold time for the initial schedule of a queue run, in millisec */
#define WORK_QUEUE_DEFAULT_HOLD 50 #define WORK_QUEUE_DEFAULT_HOLD 50
/* Retry for queue that is 'blocked' or 'retry later' */
#define WORK_QUEUE_DEFAULT_RETRY 0
/* action value, for use by item processor and item error handlers */ /* action value, for use by item processor and item error handlers */
typedef enum { typedef enum {
WQ_SUCCESS = 0, WQ_SUCCESS = 0,
@ -90,6 +93,8 @@ struct work_queue {
unsigned long unsigned long
yield; /* yield time in us for associated thread */ yield; /* yield time in us for associated thread */
uint32_t retry; /* Optional retry timeout if queue is blocked */
} spec; } spec;
/* remaining fields should be opaque to users */ /* remaining fields should be opaque to users */

1
zebra/zebra_rib.c
View File

@ -2295,6 +2295,7 @@ static void rib_queue_init(struct zebra_t *zebra)
/* XXX: TODO: These should be runtime configurable via vty */ /* XXX: TODO: These should be runtime configurable via vty */
zebra->ribq->spec.max_retries = 3; zebra->ribq->spec.max_retries = 3;
zebra->ribq->spec.hold = ZEBRA_RIB_PROCESS_HOLD_TIME; zebra->ribq->spec.hold = ZEBRA_RIB_PROCESS_HOLD_TIME;
zebra->ribq->spec.retry = ZEBRA_RIB_PROCESS_RETRY_TIME;
if (!(zebra->mq = meta_queue_new())) { if (!(zebra->mq = meta_queue_new())) {
flog_err(EC_ZEBRA_WQ_NONEXISTENT, flog_err(EC_ZEBRA_WQ_NONEXISTENT,

1
zebra/zserv.h
View File

@ -184,6 +184,7 @@ struct zebra_t {
/* rib work queue */ /* rib work queue */
#define ZEBRA_RIB_PROCESS_HOLD_TIME 10 #define ZEBRA_RIB_PROCESS_HOLD_TIME 10
#define ZEBRA_RIB_PROCESS_RETRY_TIME 5
struct work_queue *ribq; struct work_queue *ribq;
struct meta_queue *mq; struct meta_queue *mq;