X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=rcuja%2Frcuja-internal.h;h=73ac41b69218bb68852a7a1385b3658f503b22d2;hb=58c16c039d4f1a4c37bfb36303737e54943f7dd9;hp=eaef469b031f45387878ca63f9fbcac3db4f721c;hpb=b1a90ce30f17800630d578f32a05c2ad5eac0cae;p=userspace-rcu.git

diff --git a/rcuja/rcuja-internal.h b/rcuja/rcuja-internal.h
index eaef469..73ac41b 100644
--- a/rcuja/rcuja-internal.h
+++ b/rcuja/rcuja-internal.h
@@ -113,6 +113,16 @@ struct cds_ja_inode_flag *ja_node_flag_pool_1d(struct cds_ja_inode *node,
 	return (struct cds_ja_inode_flag *) (((unsigned long) node) | (bitsel << JA_TYPE_BITS) | type);
 }
 
+static inline
+struct cds_ja_inode_flag *ja_node_flag_pool_2d(struct cds_ja_inode *node,
+		unsigned long type, unsigned int bitsel[2])
+{
+	assert(type < (1UL << JA_TYPE_BITS));
+	assert(bitsel[0] < JA_BITS_PER_BYTE);
+	assert(bitsel[1] < JA_BITS_PER_BYTE);
+	return (struct cds_ja_inode_flag *) (((unsigned long) node) | (bitsel[0] << (JA_TYPE_BITS + JA_LOG2_BITS_PER_BYTE)) | (bitsel[1] << JA_TYPE_BITS) | type);
+}
+
 static inline
 unsigned long ja_node_pool_1d_bitsel(struct cds_ja_inode_flag *node)
 {
@@ -148,7 +158,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);
 
 /* rcuja_shadow_clear flags */
 enum {
@@ -173,6 +183,9 @@ struct cds_lfht *rcuja_create_ht(const struct rcu_flavor_struct *flavor);
 __attribute__((visibility("protected")))
 int rcuja_delete_ht(struct cds_lfht *ht);
 
+__attribute__((visibility("protected")))
+void free_cds_ja_node(struct cds_ja_inode *node);
+
 //#define DEBUG
 
 #ifdef __linux__