Jerry/bird
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Several simplifications of the fib iterators.

Browse source
This commit is contained in:
Martin Mares 2000-05-08 19:11:49 +00:00
parent 0bcba21e89
commit 8abbde02d4
2 changed files with 21 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
nest/route.h
View file

@ -86,12 +86,13 @@ void fit_put(struct fib_iterator *, struct fib_node *);
unsigned int count = (fib)->hash_size; \ unsigned int count = (fib)->hash_size; \
unsigned int hpos = (it)->hash; \ unsigned int hpos = (it)->hash; \
for(;;) { \ for(;;) { \
fis_again: if (!z) { \ if (!z) \
if (++hpos >= count) \ { \
break; \ if (++hpos >= count) \
z = (fib)->hash_table[hpos]; \ break; \
goto fis_again; \ z = (fib)->hash_table[hpos]; \
} continue; \
}
#define FIB_ITERATE_END(z) z = z->next; } } while(0) #define FIB_ITERATE_END(z) z = z->next; } } while(0)

28
nest/rt-fib.c
View file

@ -163,20 +163,20 @@ fib_merge_readers(struct fib_iterator *i, struct fib_node *to)
/* Fast path */ /* Fast path */
to->readers = i; to->readers = i;
i->prev = (struct fib_iterator *) to; i->prev = (struct fib_iterator *) to;
fixup:
while (i && i->node)
{
i->node = NULL;
i = i->next;
}
return;
} }
/* Really merging */ else
while (j->next) {
j = j->next; /* Really merging */
j->next = i; while (j->next)
i->prev = j; j = j->next;
goto fixup; j->next = i;
i->prev = j;
}
while (i && i->node)
{
i->node = NULL;
i = i->next;
}
} }
else /* No more nodes */ else /* No more nodes */
while (i) while (i)
@ -260,7 +260,7 @@ fit_get(struct fib *f, struct fib_iterator *i)
if (!i->prev) if (!i->prev)
{ {
/* We are at the end */ /* We are at the end */
i->hash = f->hash_size; i->hash = ~0 - 1;
return NULL; return NULL;
} }
if (!(n = i->node)) if (!(n = i->node))