rculfhash: merge node gc into add loop

[urcu.git] / urcu / rculfhash.h

diff --git a/urcu/rculfhash.h b/urcu/rculfhash.h
index 94206e363bab3f9f3c5aca02e2a37cd890b7c780..e650acdf83c91e9357beab3d224136cbf8ca3c92 100644 (file)
--- a/urcu/rculfhash.h
+++ b/urcu/rculfhash.h
@@ -11,7 +11,6 @@ struct rcu_ht_node {
        unsigned long hash;
        unsigned long reverse_hash;
        unsigned int dummy;
-       void *value;
        struct rcu_head head;
 };
 
@@ -29,11 +28,10 @@ typedef unsigned long (*ht_compare_fct)(void *key1, size_t key1_len,
 
 static inline
 void ht_node_init(struct rcu_ht_node *node, void *key,
-                 size_t key_len, void *value)
+                 size_t key_len)
 {
        node->key = key;
        node->key_len = key_len;
-       node->value = value;
        node->dummy = 0;
 }
 
@@ -48,6 +46,10 @@ struct rcu_ht *ht_new(ht_hash_fct hash_fct,
                                void (*func)(struct rcu_head *head)));
 
 int ht_destroy(struct rcu_ht *ht);
+/* Count the number of nodes in the hash table. Call with rcu_read_lock held. */
+void ht_count_nodes(struct rcu_ht *ht,
+               unsigned long *count,
+               unsigned long *removed);
 
 /* Call with rcu_read_lock held. */
 struct rcu_ht_node *ht_lookup(struct rcu_ht *ht, void *key, size_t key_len);
@@ -55,6 +57,9 @@ struct rcu_ht_node *ht_lookup(struct rcu_ht *ht, void *key, size_t key_len);
 /* Call with rcu_read_lock held. */
 void ht_add(struct rcu_ht *ht, struct rcu_ht_node *node);
 
+/* Call with rcu_read_lock held. */
+int ht_add_unique(struct rcu_ht *ht, struct rcu_ht_node *node);
+
 /* Call with rcu_read_lock held. */
 int ht_remove(struct rcu_ht *ht, struct rcu_ht_node *node);