proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-23 14:01:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bgp: refactor bgp_process_queue to be consistent and cleanup related event queuing

Browse Source 
Signed-off-by: Lou Berger <lberger@labn.net>
This commit is contained in:
Lou Berger 2017-08-28 18:30:09 -04:00
parent b4f816c3f0
commit cfe8d15a80
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bgpd/bgp_route.c
View File

@ -2251,8 +2251,7 @@ void bgp_process_queue_init(void)
bm->process_main_queue->spec.yield = 50 * 1000L; bm->process_main_queue->spec.yield = 50 * 1000L;
} }
static struct bgp_process_queue *bgp_process_queue_work(struct work_queue *wq, static struct bgp_process_queue *bgp_processq_alloc(struct bgp *bgp)
struct bgp *bgp)
{ {
struct bgp_process_queue *pqnode; struct bgp_process_queue *pqnode;
@ -2262,8 +2261,6 @@ static struct bgp_process_queue *bgp_process_queue_work(struct work_queue *wq,
pqnode->bgp = bgp_lock(bgp); pqnode->bgp = bgp_lock(bgp);
STAILQ_INIT(&pqnode->pqueue); STAILQ_INIT(&pqnode->pqueue);
work_queue_add(wq, pqnode);
return pqnode; return pqnode;
} }
@ -2272,6 +2269,7 @@ void bgp_process(struct bgp *bgp, struct bgp_node *rn, afi_t afi, safi_t safi)
#define ARBITRARY_PROCESS_QLEN 10000 #define ARBITRARY_PROCESS_QLEN 10000
struct work_queue *wq = bm->process_main_queue; struct work_queue *wq = bm->process_main_queue;
struct bgp_process_queue *pqnode; struct bgp_process_queue *pqnode;
int pqnode_reuse = 0;
/* already scheduled for processing? */ /* already scheduled for processing? */
if (CHECK_FLAG(rn->flags, BGP_NODE_PROCESS_SCHEDULED)) if (CHECK_FLAG(rn->flags, BGP_NODE_PROCESS_SCHEDULED))
@ -2288,10 +2286,11 @@ void bgp_process(struct bgp *bgp, struct bgp_node *rn, afi_t afi, safi_t safi)
if (CHECK_FLAG(pqnode->flags, BGP_PROCESS_QUEUE_EOIU_MARKER) || if (CHECK_FLAG(pqnode->flags, BGP_PROCESS_QUEUE_EOIU_MARKER) ||
pqnode->bgp != bgp || pqnode->queued >= ARBITRARY_PROCESS_QLEN) pqnode->bgp != bgp || pqnode->queued >= ARBITRARY_PROCESS_QLEN)
pqnode = bgp_process_queue_work(wq, bgp); pqnode = bgp_processq_alloc(bgp);
else
pqnode_reuse = 1;
} else } else
pqnode = bgp_process_queue_work(wq, bgp); pqnode = bgp_processq_alloc(bgp);
/* all unlocked in bgp_process_wq */ /* all unlocked in bgp_process_wq */
bgp_table_lock(bgp_node_table(rn)); bgp_table_lock(bgp_node_table(rn));
@ -2301,6 +2300,9 @@ void bgp_process(struct bgp *bgp, struct bgp_node *rn, afi_t afi, safi_t safi)
STAILQ_INSERT_TAIL(&pqnode->pqueue, rn, pq); STAILQ_INSERT_TAIL(&pqnode->pqueue, rn, pq);
pqnode->queued++; pqnode->queued++;
if (!pqnode_reuse)
work_queue_add(wq, pqnode);
return; return;
} }
@ -2311,9 +2313,10 @@ void bgp_add_eoiu_mark(struct bgp *bgp)
if (bm->process_main_queue == NULL) if (bm->process_main_queue == NULL)
return; return;
pqnode = bgp_process_queue_work(bm->process_main_queue, bgp); pqnode = bgp_processq_alloc(bgp);
SET_FLAG(pqnode->flags, BGP_PROCESS_QUEUE_EOIU_MARKER); SET_FLAG(pqnode->flags, BGP_PROCESS_QUEUE_EOIU_MARKER);
work_queue_add(bm->process_main_queue, pqnode);
} }
static int bgp_maximum_prefix_restart_timer(struct thread *thread) static int bgp_maximum_prefix_restart_timer(struct thread *thread)