X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=rcuja%2Frcuja-shadow-nodes.c;h=917c6a2038e8c11a809fb4acfd5cf69be8d57b02;hb=d8536f92244c14455fb90fdd06cb4628d65acf32;hp=983adef09a9928e9e839f7c022a7c120b99eea5c;hpb=3d8fe30760fd4fb67ce24b5aa011ab75f680a904;p=userspace-rcu.git

diff --git a/rcuja/rcuja-shadow-nodes.c b/rcuja/rcuja-shadow-nodes.c
index 983adef..917c6a2 100644
--- a/rcuja/rcuja-shadow-nodes.c
+++ b/rcuja/rcuja-shadow-nodes.c
@@ -33,7 +33,6 @@
 #include <time.h>
 
 #include "rcuja-internal.h"
-#include "bitfield.h"
 
 static unsigned long hash_seed;
 
@@ -223,7 +222,7 @@ __attribute__((visibility("protected")))
 struct cds_ja_shadow_node *rcuja_shadow_set(struct cds_lfht *ht,
 		struct cds_ja_inode_flag *new_node_flag,
 		struct cds_ja_shadow_node *inherit_from,
-		struct cds_ja *ja)
+		struct cds_ja *ja, int level)
 {
 	struct cds_ja_shadow_node *shadow_node;
 	struct cds_lfht_node *ret_node;
@@ -240,6 +239,7 @@ struct cds_ja_shadow_node *rcuja_shadow_set(struct cds_lfht *ht,
 	 */
 	if (inherit_from) {
 		shadow_node->lock = inherit_from->lock;
+		shadow_node->level = inherit_from->level;
 	} else {
 		shadow_node->lock = calloc(sizeof(*shadow_node->lock), 1);
 		if (!shadow_node->lock) {
@@ -247,6 +247,7 @@ struct cds_ja_shadow_node *rcuja_shadow_set(struct cds_lfht *ht,
 			return NULL;
 		}
 		pthread_mutex_init(shadow_node->lock, NULL);
+		shadow_node->level = level;
 	}
 
 	flavor = cds_lfht_rcu_flavor(ht);
@@ -278,7 +279,7 @@ void free_shadow_node_and_node(struct rcu_head *head)
 {
 	struct cds_ja_shadow_node *shadow_node =
 		caa_container_of(head, struct cds_ja_shadow_node, head);
-	free(ja_node_ptr(shadow_node->node_flag));
+	free_cds_ja_node(shadow_node->ja, ja_node_ptr(shadow_node->node_flag));
 	free(shadow_node);
 }
 
@@ -297,7 +298,7 @@ void free_shadow_node_and_node_and_lock(struct rcu_head *head)
 	struct cds_ja_shadow_node *shadow_node =
 		caa_container_of(head, struct cds_ja_shadow_node, head);
 	assert(shadow_node->level);
-	free(ja_node_ptr(shadow_node->node_flag));
+	free_cds_ja_node(shadow_node->ja, ja_node_ptr(shadow_node->node_flag));
 	free(shadow_node->lock);
 	free(shadow_node);
 }
@@ -376,7 +377,7 @@ rcu_unlock:
 __attribute__((visibility("protected")))
 void rcuja_shadow_prune(struct cds_lfht *ht,
 		unsigned int flags,
-		void (*free_node_cb)(struct rcu_head *head))
+		void (*rcu_free_node)(struct cds_ja_node *node))
 {
 	const struct rcu_flavor_struct *flavor;
 	struct cds_ja_shadow_node *shadow_node;
@@ -396,7 +397,7 @@ void rcuja_shadow_prune(struct cds_lfht *ht,
 				if (shadow_node->level == shadow_node->ja->tree_depth - 1) {
 					rcuja_free_all_children(shadow_node,
 							shadow_node->node_flag,
-							free_node_cb);
+							rcu_free_node);
 				}
 				if (flags & RCUJA_SHADOW_CLEAR_FREE_LOCK) {
 					flavor->update_call_rcu(&shadow_node->head,