rculfhash: wait for call_rcu quiescence before destroy

[urcu.git] / urcu / rculfhash.h

diff --git a/urcu/rculfhash.h b/urcu/rculfhash.h
index e650acdf83c91e9357beab3d224136cbf8ca3c92..c88740097c885beb07acb2f3d5ce80e7df94745f 100644 (file)
--- a/urcu/rculfhash.h
+++ b/urcu/rculfhash.h
@@ -4,13 +4,18 @@
 #include <stdint.h>
 #include <urcu-call-rcu.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 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;
+       /* cache-cold for iteration */
        struct rcu_head head;
 };
 
@@ -57,12 +62,21 @@ 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);
 
 void ht_resize(struct rcu_ht *ht, int growth);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _URCU_RCULFHASH_H */