X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=rculfhash.c;h=be995dfeaf5ef70795a6fd74a7bc34f4ced558c6;hb=3fb86f26cfea354e44be1099642fc88436e3edf3;hp=6e07878a1c3db3c2afac4700727491a2aa8be3ea;hpb=ae450da3b54fe3c8ea8fc92ec9a9ce2ad8f131cb;p=urcu.git diff --git a/rculfhash.c b/rculfhash.c index 6e07878..be995df 100644 --- a/rculfhash.c +++ b/rculfhash.c @@ -787,10 +787,10 @@ void _cds_lfht_gc_bucket(struct cds_lfht_node *dummy, struct cds_lfht_node *node static int _cds_lfht_replace(struct cds_lfht *ht, unsigned long size, struct cds_lfht_node *old_node, - struct cds_lfht_node *ret_next, + struct cds_lfht_node *old_next, struct cds_lfht_node *new_node) { - struct cds_lfht_node *dummy, *old_next; + struct cds_lfht_node *dummy, *ret_next; struct _cds_lfht_node *lookup; int flagged = 0; @@ -802,9 +802,8 @@ int _cds_lfht_replace(struct cds_lfht *ht, unsigned long size, assert(!is_removed(new_node)); assert(!is_dummy(new_node)); assert(new_node != old_node); - do { + for (;;) { /* Insert after node to be replaced */ - old_next = ret_next; if (is_removed(old_next)) { /* * Too late, the old node has been removed under us @@ -827,7 +826,10 @@ int _cds_lfht_replace(struct cds_lfht *ht, unsigned long size, */ ret_next = uatomic_cmpxchg(&old_node->p.next, old_next, flag_removed(new_node)); - } while (ret_next != old_next); + if (ret_next == old_next) + break; + old_next = ret_next; + } /* We performed the replacement. */ flagged = 1; @@ -887,6 +889,9 @@ struct cds_lfht_node *_cds_lfht_add(struct cds_lfht *ht, goto insert; if (likely(clear_flag(iter)->p.reverse_hash > node->p.reverse_hash)) goto insert; + /* dummy node is the first node of the identical-hash-value chain */ + if (dummy && clear_flag(iter)->p.reverse_hash == node->p.reverse_hash) + goto insert; next = rcu_dereference(clear_flag(iter)->p.next); if (unlikely(is_removed(next))) goto gc_node;