X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=urcu%2Frculfhash.h;h=40fe4df6bd763f81240b4d08d8bfa7047e344ec1;hb=7f61a77fffa376ff47a2a8fb56e16d8e20787139;hp=6bb1ccf619b381e59f0f8d5098b643e569626233;hpb=18117871130163ec2b2fc73fda288b9ba26cd435;p=urcu.git

diff --git a/urcu/rculfhash.h b/urcu/rculfhash.h
index 6bb1ccf..40fe4df 100644
--- 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;
 }
 
 /*
@@ -71,4 +82,8 @@ 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 */