X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=rcuja%2Frcuja-internal.h;h=b1d7baadd229800a223a10762eafd6d7888f25a3;hb=d96bfb0d5313aeeaa28cf5a8ae2d79756deff560;hp=a5aae07dceeddf5b871772a98d0c1fa06b2390c8;hpb=5eb692c04e2089c97642bd1937343d90be04d691;p=userspace-rcu.git

diff --git a/rcuja/rcuja-internal.h b/rcuja/rcuja-internal.h
index a5aae07..b1d7baa 100644
--- a/rcuja/rcuja-internal.h
+++ b/rcuja/rcuja-internal.h
@@ -27,40 +27,54 @@
 #include <urcu/rculfhash.h>
 
 /* Never declared. Opaque type used to store flagged node pointers. */
-struct rcu_ja_node_flag;
+struct cds_ja_node_flag;
 
 /*
  * Shadow node contains mutex and call_rcu head associated with a node.
  */
-struct rcu_ja_shadow_node {
+struct cds_ja_shadow_node {
 	struct cds_lfht_node ht_node;	/* hash table node */
-	struct rcu_ja_node *node;	/* reverse mapping and hash table key */
-	pthread_mutex_t lock;		/* mutual exclusion on node */
+	struct cds_ja_node *node;	/* reverse mapping and hash table key */
+	/*
+	 * mutual exclusion on all nodes belonging to the same tree
+	 * position (e.g. both nodes before and after recompaction
+	 * use the same lock).
+	 */
+	pthread_mutex_t *lock;
+	unsigned int nr_child;		/* number of children in node */
 	struct rcu_head head;		/* for deferred node and shadow node reclaim */
-	const struct rcu_flavor_struct *flavor;	/* rcu flavor */
 };
 
-struct rcu_ja {
-	struct rcu_ja_node_flag *root;
+struct cds_ja {
+	struct cds_ja_node_flag *root;
 	/*
-	 * We use a hash table to associate nodes to their respective
-	 * shadow node. This helps reducing lookup hot path cache
-	 * footprint, especially for very small nodes.
+	 * We use a hash table to associate node keys to their
+	 * respective shadow node. This helps reducing lookup hot path
+	 * cache footprint, especially for very small nodes.
 	 */
 	struct cds_lfht *ht;
 };
 
 __attribute__((visibility("protected")))
-struct rcu_ja_shadow_node *rcuja_shadow_lookup_lock(struct cds_lfht *ht,
-		struct rcu_ja_node *node);
+struct cds_ja_shadow_node *rcuja_shadow_lookup_lock(struct cds_lfht *ht,
+		struct cds_ja_node *node);
 __attribute__((visibility("protected")))
-void rcuja_shadow_unlock(struct rcu_ja_shadow_node *shadow_node);
+void rcuja_shadow_unlock(struct cds_ja_shadow_node *shadow_node);
 __attribute__((visibility("protected")))
 int rcuja_shadow_set(struct cds_lfht *ht,
-		struct rcu_ja_node *node);
+		struct cds_ja_node *new_node,
+		struct cds_ja_shadow_node *inherit_from);
 __attribute__((visibility("protected")))
-int rcuja_shadow_clear_and_free_node(struct cds_lfht *ht,
-		struct rcu_ja_node *node);
+
+/* rcuja_shadow_clear flags */
+enum {
+	RCUJA_SHADOW_CLEAR_FREE_NODE = (1U << 0),
+	RCUJA_SHADOW_CLEAR_FREE_LOCK = (1U << 1),
+};
+
+int rcuja_shadow_clear(struct cds_lfht *ht,
+		struct cds_ja_node *node,
+		unsigned int flags);
 __attribute__((visibility("protected")))
 struct cds_lfht *rcuja_create_ht(const struct rcu_flavor_struct *flavor);
 __attribute__((visibility("protected")))