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

Merge pull request #910 from opensourcerouting/isis-perf2

Browse Source 
isisd: don't validate dict integrity for regular builds
This commit is contained in:
Donald Sharp 2017-08-04 10:56:34 -04:00 committed by GitHub
commit adbbf7f92d
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
isisd/dict.c
View File

@ -174,6 +174,7 @@ static int verify_bintree(dict_t *dict)
* subtree is not red-black. * subtree is not red-black.
*/ */
#ifdef EXTREME_DICT_DEBUG
static unsigned int verify_redblack(dnode_t *nil, dnode_t *root) static unsigned int verify_redblack(dnode_t *nil, dnode_t *root)
{ {
unsigned height_left, height_right; unsigned height_left, height_right;
@ -198,6 +199,7 @@ static unsigned int verify_redblack(dnode_t *nil, dnode_t *root)
} }
return 1; return 1;
} }
#endif
/* /*
* Compute the actual count of nodes by traversing the tree and * Compute the actual count of nodes by traversing the tree and
@ -205,6 +207,7 @@ static unsigned int verify_redblack(dnode_t *nil, dnode_t *root)
* detect a mismatch. * detect a mismatch.
*/ */
#ifdef EXTREME_DICT_DEBUG
static dictcount_t verify_node_count(dnode_t *nil, dnode_t *root) static dictcount_t verify_node_count(dnode_t *nil, dnode_t *root)
{ {
if (root == nil) if (root == nil)
@ -213,6 +216,7 @@ static dictcount_t verify_node_count(dnode_t *nil, dnode_t *root)
return 1 + verify_node_count(nil, root->left) return 1 + verify_node_count(nil, root->left)
+ verify_node_count(nil, root->right); + verify_node_count(nil, root->right);
} }
#endif
/* /*
* Verify that the tree contains the given node. This is done by * Verify that the tree contains the given node. This is done by
@ -369,6 +373,7 @@ static void dict_clear(dict_t *dict)
int dict_verify(dict_t *dict) int dict_verify(dict_t *dict)
{ {
#ifdef EXTREME_DICT_DEBUG
dnode_t *nil = dict_nil(dict), *root = dict_root(dict); dnode_t *nil = dict_nil(dict), *root = dict_root(dict);
/* check that the sentinel node and root node are black */ /* check that the sentinel node and root node are black */
@ -389,6 +394,7 @@ int dict_verify(dict_t *dict)
return 0; return 0;
if (verify_node_count(nil, root) != dict_count(dict)) if (verify_node_count(nil, root) != dict_count(dict))
return 0; return 0;
#endif
return 1; return 1;
} }

2
isisd/isisd.h
View File

@ -37,7 +37,7 @@
/* uncomment if you are a developer in bug hunt */ /* uncomment if you are a developer in bug hunt */
/* #define EXTREME_DEBUG */ /* #define EXTREME_DEBUG */
/* #define EXTREME_TLV_DEBUG */ /* #define EXTREME_DICT_DEBUG */
struct isis { struct isis {
u_long process_id; u_long process_id;