X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Frculfhash.h;h=6bb1ccf619b381e59f0f8d5098b643e569626233;hp=ed75431f9864e08b9668e29b86f10496f8110253;hb=6d5c0ca90ae4e999cdf4366ff615a6c619e7257e;hpb=3eca1b8cce5630bcbd865a8d30855c996bc021c3

diff --git a/urcu/rculfhash.h b/urcu/rculfhash.h
index ed75431..6bb1ccf 100644
--- a/urcu/rculfhash.h
+++ b/urcu/rculfhash.h
@@ -5,13 +5,13 @@
 #include <urcu-call-rcu.h>
 
 struct rcu_ht_node {
+	/* cache-hot for iteration */
 	struct rcu_ht_node *next;
-	void *key;
-	size_t key_len;
-	unsigned long hash;
 	unsigned long reverse_hash;
+	void *key;
+	unsigned int key_len;
 	unsigned int dummy;
-	void *value;
+	/* cache-cold for iteration */
 	struct rcu_head head;
 };
 
@@ -29,11 +29,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 +47,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,8 +58,13 @@ 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.
+ * Returns the node added upon success.
+ * Returns the unique node already present upon failure. If ht_add_unique fails,
+ * the node passed as parameter should be freed by the caller.
+ */
+struct rcu_ht_node *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);