rcuja: API change: move rcu_head to user code

[userspace-rcu.git] / rcuja / rcuja-internal.h

diff --git a/rcuja/rcuja-internal.h b/rcuja/rcuja-internal.h
index 6b8da15a1a6131b249c3f70e3d3a45b3df99716d..9b1daca61cb7541009f8db64b9014215a5ff1fe4 100644 (file)
--- a/rcuja/rcuja-internal.h
+++ b/rcuja/rcuja-internal.h
@@ -23,9 +23,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#define _GNU_SOURCE
 #include <pthread.h>
 #include <stdio.h>
 #include <inttypes.h>
+#include <unistd.h>
 #include <urcu/rculfhash.h>
 
 /*
@@ -41,6 +43,9 @@
 #define JA_LOG2_BITS_PER_BYTE  3U
 #define JA_BITS_PER_BYTE       (1U << JA_LOG2_BITS_PER_BYTE)
 
+#define JA_POOL_1D_MASK        ((JA_BITS_PER_BYTE - 1) << JA_TYPE_BITS)
+#define JA_POOL_2D_MASK        (JA_POOL_1D_MASK << JA_LOG2_BITS_PER_BYTE)
+
 #define JA_MAX_DEPTH   9       /* Maximum depth, including leafs */
 
 /*
@@ -89,6 +94,10 @@ struct cds_ja {
         */
        struct cds_lfht *ht;
        unsigned long nr_fallback;      /* Number of fallback nodes used */
+
+       /* For debugging */
+       unsigned long node_fallback_count_distribution[JA_ENTRY_PER_NODE];
+       unsigned long nr_nodes_allocated, nr_nodes_freed;
 };
 
 static inline
@@ -100,28 +109,47 @@ struct cds_ja_inode_flag *ja_node_flag(struct cds_ja_inode *node,
 }
 
 static inline
-struct cds_ja_inode *ja_node_ptr(struct cds_ja_inode_flag *node)
+struct cds_ja_inode_flag *ja_node_flag_pool_1d(struct cds_ja_inode *node,
+               unsigned long type, unsigned long bitsel)
 {
-       return (struct cds_ja_inode *) (((unsigned long) node) & JA_PTR_MASK);
+       assert(type < (1UL << JA_TYPE_BITS));
+       assert(bitsel < JA_BITS_PER_BYTE);
+       return (struct cds_ja_inode_flag *) (((unsigned long) node) | (bitsel << JA_TYPE_BITS) | type);
 }
 
 static inline
-unsigned long ja_node_type(struct cds_ja_inode_flag *node)
+struct cds_ja_inode_flag *ja_node_flag_pool_2d(struct cds_ja_inode *node,
+               unsigned long type, unsigned int bitsel[2])
 {
-       unsigned long type;
-
-       if (ja_node_ptr(node) == NULL) {
-               return NODE_INDEX_NULL;
-       }
-       type = (unsigned int) ((unsigned long) node & JA_TYPE_MASK);
        assert(type < (1UL << JA_TYPE_BITS));
-       return type;
+       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)
+{
+       return ((unsigned long) node & JA_POOL_1D_MASK) >> JA_TYPE_BITS;
 }
 
+static inline
+void ja_node_pool_2d_bitsel(struct cds_ja_inode_flag *node, unsigned long *bits)
+{
+       bits[0] = ((unsigned long) node & JA_POOL_2D_MASK) >> (JA_TYPE_BITS + JA_LOG2_BITS_PER_BYTE);
+       bits[1] = ((unsigned long) node & JA_POOL_1D_MASK) >> JA_TYPE_BITS;
+}
+
+__attribute__((visibility("protected")))
+unsigned long ja_node_type(struct cds_ja_inode_flag *node);
+
+__attribute__((visibility("protected")))
+struct cds_ja_inode *ja_node_ptr(struct cds_ja_inode_flag *node);
+
 __attribute__((visibility("protected")))
 void rcuja_free_all_children(struct cds_ja_shadow_node *shadow_node,
                struct cds_ja_inode_flag *node_flag,
-               void (*free_node_cb)(struct rcu_head *head));
+               void (*rcu_free_node)(struct cds_ja_node *node));
 
 __attribute__((visibility("protected")))
 struct cds_ja_shadow_node *rcuja_shadow_lookup_lock(struct cds_lfht *ht,
@@ -134,7 +162,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 {
@@ -151,7 +179,7 @@ int rcuja_shadow_clear(struct cds_lfht *ht,
 __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));
 
 __attribute__((visibility("protected")))
 struct cds_lfht *rcuja_create_ht(const struct rcu_flavor_struct *flavor);
@@ -159,16 +187,43 @@ 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 *ja, struct cds_ja_inode *node);
+
 //#define DEBUG
 
+#ifdef __linux__
+#include <syscall.h>
+#endif
+
+#if defined(_syscall0)
+_syscall0(pid_t, gettid)
+#elif defined(__NR_gettid)
+static inline pid_t gettid(void)
+{
+       return syscall(__NR_gettid);
+}
+#else
+#warning "use pid as tid"
+static inline pid_t gettid(void)
+{
+       return getpid();
+}
+#endif
+
 #ifdef DEBUG
-#define dbg_printf(fmt, args...)     printf("[debug rcuja] " fmt, ## args)
+#define dbg_printf(fmt, args...)                               \
+       fprintf(stderr, "[debug rcuja %lu %s()@%s:%u] " fmt,    \
+               (unsigned long) gettid(), __func__,             \
+               __FILE__, __LINE__, ## args)
 #else
 #define dbg_printf(fmt, args...)                               \
 do {                                                           \
        /* do nothing but check printf format */                \
        if (0)                                                  \
-               printf("[debug rcuja] " fmt, ## args);  \
+               fprintf(stderr, "[debug rcuja %lu %s()@%s:%u] " fmt, \
+                       (unsigned long) gettid(), __func__,     \
+                       __FILE__, __LINE__, ## args);           \
 } while (0)
 #endif