X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=rculfhash.c;h=0b3996416c270072b069fe700764515165bc50b5;hb=e1a68f1d99b97020243da2c47a81c74705dc3381;hp=003ab0bd0236d39ee4c591c2dccec6a3266bfca9;hpb=b9e36678a644361b1043b2f20e023d6434377fb4;p=urcu.git diff --git a/rculfhash.c b/rculfhash.c index 003ab0b..0b39964 100644 --- a/rculfhash.c +++ b/rculfhash.c @@ -672,6 +672,13 @@ void _cds_lfht_gc_bucket(struct cds_lfht_node *dummy, struct cds_lfht_node *node /* We can always skip the dummy node initially */ iter = rcu_dereference(iter_prev->p.next); assert(iter_prev->p.reverse_hash <= node->p.reverse_hash); + /* + * We should never be called with dummy (start of chain) + * and logically removed node (end of path compression + * marker) being the actual same node. This would be a + * bug in the algorithm implementation. + */ + assert(dummy != node); for (;;) { if (unlikely(!clear_flag(iter))) return; @@ -895,7 +902,7 @@ void fini_table(struct cds_lfht *ht, struct rcu_table *t, * removal so gc lookups use non-logically-removed dummy * nodes. */ - t->size = (i == 1) ? 0 : 1UL << (i - 2); + t->size = 1UL << (i - 1); /* Unlink */ for (j = 0; j < len; j++) { struct cds_lfht_node *fini_node =