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

zebra: cleanup RIB meta queue code

Browse Source 
* zebra/zebra_rib.c
  * rib_queue_add(): indent comments and simplify debug code
  * rib_queue_init(): remove unneeded assert() calls and
    extra return statements
This commit is contained in:
Stephen Hemminger 2009-12-09 17:54:49 +03:00 committed by Denis Ovsienko
parent 1352ef32d7
commit cc2dd9280c
1 changed files with 11 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
zebra/zebra_rib.c
View File

@ -1271,49 +1271,28 @@ rib_meta_queue_add (struct meta_queue *mq, struct route_node *rn)
static void static void
rib_queue_add (struct zebra_t *zebra, struct route_node *rn) rib_queue_add (struct zebra_t *zebra, struct route_node *rn)
{ {
char buf[INET6_ADDRSTRLEN];
assert (zebra && rn);
if (IS_ZEBRA_DEBUG_RIB_Q) if (IS_ZEBRA_DEBUG_RIB_Q)
inet_ntop (rn->p.family, &rn->p.u.prefix, buf, INET6_ADDRSTRLEN);
/* Pointless to queue a route_node with no RIB entries to add or remove */
if (!rn->info)
{ {
zlog_debug ("%s: called for route_node (%p, %d) with no ribs", char buf[INET6_ADDRSTRLEN];
__func__, rn, rn->lock);
zlog_backtrace(LOG_DEBUG); zlog_info ("%s: %s/%d: work queue added", __func__,
return; inet_ntop (rn->p.family, &rn->p.u.prefix, buf, INET6_ADDRSTRLEN),
rn->p.prefixlen);
} }
if (IS_ZEBRA_DEBUG_RIB_Q) /*
zlog_info ("%s: %s/%d: work queue added", __func__, buf, rn->p.prefixlen); * The RIB queue should normally be either empty or holding the only
* work_queue_item element. In the latter case this element would
assert (zebra); * hold a pointer to the meta queue structure, which must be used to
* actually queue the route nodes to process. So create the MQ
if (zebra->ribq == NULL) * holder, if necessary, then push the work into it in any case.
{
zlog_err ("%s: work_queue does not exist!", __func__);
return;
}
/* The RIB queue should normally be either empty or holding the only work_queue_item
* element. In the latter case this element would hold a pointer to the meta queue
* structure, which must be used to actually queue the route nodes to process. So
* create the MQ holder, if necessary, then push the work into it in any case.
* This semantics was introduced after 0.99.9 release. * This semantics was introduced after 0.99.9 release.
*/ */
/* Should I invent work_queue_empty() and use it, or it's Ok to do as follows? */
if (!zebra->ribq->items->count) if (!zebra->ribq->items->count)
work_queue_add (zebra->ribq, zebra->mq); work_queue_add (zebra->ribq, zebra->mq);
rib_meta_queue_add (zebra->mq, rn); rib_meta_queue_add (zebra->mq, rn);
if (IS_ZEBRA_DEBUG_RIB_Q)
zlog_debug ("%s: %s/%d: rn %p queued", __func__, buf, rn->p.prefixlen, rn);
return;
} }
/* Create new meta queue. /* Create new meta queue.
@ -1341,8 +1320,6 @@ meta_queue_new (void)
static void static void
rib_queue_init (struct zebra_t *zebra) rib_queue_init (struct zebra_t *zebra)
{ {
assert (zebra);
if (! (zebra->ribq = work_queue_new (zebra->master, if (! (zebra->ribq = work_queue_new (zebra->master,
"route_node processing"))) "route_node processing")))
{ {
@ -1358,11 +1335,7 @@ rib_queue_init (struct zebra_t *zebra)
zebra->ribq->spec.hold = rib_process_hold_time; zebra->ribq->spec.hold = rib_process_hold_time;
if (!(zebra->mq = meta_queue_new ())) if (!(zebra->mq = meta_queue_new ()))
{
zlog_err ("%s: could not initialise meta queue!", __func__); zlog_err ("%s: could not initialise meta queue!", __func__);
return;
}
return;
} }
/* RIB updates are processed via a queue of pointers to route_nodes. /* RIB updates are processed via a queue of pointers to route_nodes.