Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93672292 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

[IPV4] fib_trie: compute size when needed 



Compute the number of prefixes when needed, rather than doing bookeeping.

Signed-off-by: default avatarStephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a07f5f50

net/ipv4/fib_trie.c

+13 −8
Original line number Original line Diff line number Diff line
@@ -143,12 +143,12 @@ struct trie_stat { 
	unsigned int tnodes;

	unsigned int tnodes;

	unsigned int leaves;

	unsigned int leaves;

	unsigned int nullpointers;

	unsigned int nullpointers;

	unsigned int prefixes;

	unsigned int nodesizes[MAX_STAT_DEPTH];

	unsigned int nodesizes[MAX_STAT_DEPTH];

};

};





struct trie {

struct trie {

	struct node *trie;

	struct node *trie;

	unsigned int size;

#ifdef CONFIG_IP_FIB_TRIE_STATS

#ifdef CONFIG_IP_FIB_TRIE_STATS

	struct trie_use_stats stats;

	struct trie_use_stats stats;

#endif

#endif
@@ -1292,8 +1292,6 @@ static int fn_trie_insert(struct fib_table *tb, struct fib_config *cfg) 
	list_add_tail_rcu(&new_fa->fa_list,

	list_add_tail_rcu(&new_fa->fa_list,

			  (fa ? &fa->fa_list : fa_head));

			  (fa ? &fa->fa_list : fa_head));





	t->size++;



	rt_cache_flush(-1);

	rt_cache_flush(-1);

	rtmsg_fib(RTM_NEWROUTE, htonl(key), new_fa, plen, tb->tb_id,

	rtmsg_fib(RTM_NEWROUTE, htonl(key), new_fa, plen, tb->tb_id,

		  &cfg->fc_nlinfo, 0);

		  &cfg->fc_nlinfo, 0);
@@ -1579,9 +1577,6 @@ static int trie_leaf_remove(struct trie *t, t_key key) 
	 * Key found.

	 * Key found.

	 * Remove the leaf and rebalance the tree

	 * Remove the leaf and rebalance the tree

	 */

	 */



	t->size--;



	tp = node_parent(n);

	tp = node_parent(n);

	tnode_free((struct tnode *) n);

	tnode_free((struct tnode *) n);
@@ -2114,10 +2109,17 @@ static void trie_collect_stats(struct trie *t, struct trie_stat *s) 
	for (n = fib_trie_get_first(&iter, t); n;

	for (n = fib_trie_get_first(&iter, t); n;

	     n = fib_trie_get_next(&iter)) {

	     n = fib_trie_get_next(&iter)) {

		if (IS_LEAF(n)) {

		if (IS_LEAF(n)) {

			struct leaf *l = (struct leaf *)n;

			struct leaf_info *li;

			struct hlist_node *tmp;



			s->leaves++;

			s->leaves++;

			s->totdepth += iter.depth;

			s->totdepth += iter.depth;

			if (iter.depth > s->maxdepth)

			if (iter.depth > s->maxdepth)

				s->maxdepth = iter.depth;

				s->maxdepth = iter.depth;



			hlist_for_each_entry_rcu(li, tmp, &l->list, hlist)

				++s->prefixes;

		} else {

		} else {

			const struct tnode *tn = (const struct tnode *) n;

			const struct tnode *tn = (const struct tnode *) n;

			int i;

			int i;
@@ -2151,8 +2153,11 @@ static void trie_show_stats(struct seq_file *seq, struct trie_stat *stat) 
	seq_printf(seq, "\tMax depth:      %u\n", stat->maxdepth);

	seq_printf(seq, "\tMax depth:      %u\n", stat->maxdepth);





	seq_printf(seq, "\tLeaves:         %u\n", stat->leaves);

	seq_printf(seq, "\tLeaves:         %u\n", stat->leaves);



	bytes = sizeof(struct leaf) * stat->leaves;

	bytes = sizeof(struct leaf) * stat->leaves;



	seq_printf(seq, "\tPrefixes:       %u\n", stat->prefixes);

	bytes += sizeof(struct leaf_info) * stat->prefixes;



	seq_printf(seq, "\tInternal nodes: %u\n\t", stat->tnodes);

	seq_printf(seq, "\tInternal nodes: %u\n\t", stat->tnodes);

	bytes += sizeof(struct tnode) * stat->tnodes;

	bytes += sizeof(struct tnode) * stat->tnodes;
@@ -2196,8 +2201,8 @@ static void fib_trie_show(struct seq_file *seq, const char *name, 
{

{

	struct trie_stat stat;

	struct trie_stat stat;





	seq_printf(seq, "%s: %d\n", name, trie->size);

	trie_collect_stats(trie, &stat);

	trie_collect_stats(trie, &stat);

	seq_printf(seq, "%s:\n", name);

	trie_show_stats(seq, &stat);

	trie_show_stats(seq, &stat);

#ifdef CONFIG_IP_FIB_TRIE_STATS

#ifdef CONFIG_IP_FIB_TRIE_STATS

	trie_show_usage(seq, &trie->stats);

	trie_show_usage(seq, &trie->stats);