Merge branch 'master' into urcu/ht

[urcu.git] / urcu / rculfhash.h

diff --git a/urcu/rculfhash.h b/urcu/rculfhash.h
index bec7776c2fd6f3f2f2eb58c9c058dafd18e2d3f0..40fe4df6bd763f81240b4d08d8bfa7047e344ec1 100644 (file)
--- a/urcu/rculfhash.h
+++ b/urcu/rculfhash.h
@@ -4,13 +4,25 @@
 #include <stdint.h>
 #include <urcu-call-rcu.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/*
+ * struct rcu_ht_node and struct _rcu_ht_node should be aligned on
+ * 4-bytes boundaries because the two lower bits are used as flags.
+ */
+
+struct _rcu_ht_node {
+       struct rcu_ht_node *next;       /* ptr | DUMMY_FLAG | REMOVED_FLAG */
+       unsigned long reverse_hash;
+};
+
 struct rcu_ht_node {
        /* cache-hot for iteration */
-       struct rcu_ht_node *next;
-       unsigned long reverse_hash;
+       struct _rcu_ht_node p;          /* needs to be first field */
        void *key;
        unsigned int key_len;
-       unsigned int dummy;
        /* cache-cold for iteration */
        struct rcu_head head;
 };
@@ -33,7 +45,6 @@ void ht_node_init(struct rcu_ht_node *node, void *key,
 {
        node->key = key;
        node->key_len = key_len;
-       node->dummy = 0;
 }
 
 /*
@@ -58,12 +69,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 */