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

micro-op bgp_node_[get|lookup]() and route_node_[get|lookup]()

Browse Source 
Reduce indirection for values that doesn't change in the loop.

Signed-off-by: Jorge Boncompte [DTI2] <jorge@dti2.net>
[adjusted after dropping previous patch]
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
This commit is contained in:
Jorge Boncompte [DTI2] 2012-05-07 16:53:11 +00:00 committed by David Lamparter
parent f018db83a0
commit 47d3b6078a
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bgpd/bgp_table.c
View File

@ -289,16 +289,18 @@ struct bgp_node *
bgp_node_lookup (const struct bgp_table *table, struct prefix *p)
{
struct bgp_node *node;
u_char prefixlen = p->prefixlen;
const u_char *prefix = &p->u.prefix;
node = table->top;
while (node && node->p.prefixlen <= p->prefixlen &&
while (node && node->p.prefixlen <= prefixlen &&
prefix_match (&node->p, p))
{
if (node->p.prefixlen == p->prefixlen && node->info)
if (node->p.prefixlen == prefixlen && node->info)
return bgp_lock_node (node);
node = node->link[prefix_bit(&p->u.prefix, node->p.prefixlen)];
node = node->link[prefix_bit(prefix, node->p.prefixlen)];
}
return NULL;
@ -311,19 +313,21 @@ bgp_node_get (struct bgp_table *const table, struct prefix *p)
struct bgp_node *new;
struct bgp_node *node;
struct bgp_node *match;
u_char prefixlen = p->prefixlen;
const u_char *prefix = &p->u.prefix;
match = NULL;
node = table->top;
while (node && node->p.prefixlen <= p->prefixlen &&
while (node && node->p.prefixlen <= prefixlen &&
prefix_match (&node->p, p))
{
if (node->p.prefixlen == p->prefixlen)
if (node->p.prefixlen == prefixlen)
{
bgp_lock_node (node);
return node;
}
match = node;
node = node->link[prefix_bit(&p->u.prefix, node->p.prefixlen)];
node = node->link[prefix_bit(prefix, node->p.prefixlen)];
}
if (node == NULL)
@ -347,7 +351,7 @@ bgp_node_get (struct bgp_table *const table, struct prefix *p)
else
table->top = new;
if (new->p.prefixlen != p->prefixlen)
if (new->p.prefixlen != prefixlen)
{
match = new;
new = bgp_node_set (table, p);

18
lib/table.c
View File

@ -258,16 +258,18 @@ struct route_node *
route_node_lookup (struct route_table *table, struct prefix *p)
{
struct route_node *node;
u_char prefixlen = p->prefixlen;
const u_char *prefix = &p->u.prefix;
node = table->top;
while (node && node->p.prefixlen <= p->prefixlen &&
while (node && node->p.prefixlen <= prefixlen &&
prefix_match (&node->p, p))
{
if (node->p.prefixlen == p->prefixlen)
if (node->p.prefixlen == prefixlen)
return node->info ? route_lock_node (node) : NULL;
node = node->link[prefix_bit(&p->u.prefix, node->p.prefixlen)];
node = node->link[prefix_bit(prefix, node->p.prefixlen)];
}
return NULL;
@ -280,17 +282,19 @@ route_node_get (struct route_table *table, struct prefix *p)
struct route_node *new;
struct route_node *node;
struct route_node *match;
u_char prefixlen = p->prefixlen;
const u_char *prefix = &p->u.prefix;
match = NULL;
node = table->top;
while (node && node->p.prefixlen <= p->prefixlen &&
while (node && node->p.prefixlen <= prefixlen &&
prefix_match (&node->p, p))
{
if (node->p.prefixlen == p->prefixlen)
if (node->p.prefixlen == prefixlen)
return route_lock_node (node);
match = node;
node = node->link[prefix_bit(&p->u.prefix, node->p.prefixlen)];
node = node->link[prefix_bit(prefix, node->p.prefixlen)];
}
if (node == NULL)