Fix: rcuja merge fixes

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

diff --git a/rcuja/rcuja-internal.h b/rcuja/rcuja-internal.h
index 2d3f131e7764c64f2e57448c72ee385043869e1b..d3793482402c85892be5effbdee0df05a557543c 100644 (file)
--- a/rcuja/rcuja-internal.h
+++ b/rcuja/rcuja-internal.h
@@ -6,7 +6,8 @@
  *
  * Userspace RCU library - RCU Judy Array Internal Header
  *
- * Copyright 2012 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2000 - 2002 Hewlett-Packard Company
+ * Copyright 2012-2013 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -173,8 +174,7 @@ unsigned long ja_node_type(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 cds_ja_node *node));
+               struct cds_ja_inode_flag *node_flag);
 
 __attribute__((visibility("protected")))
 struct cds_ja_shadow_node *rcuja_shadow_lookup_lock(struct cds_lfht *ht,
@@ -203,8 +203,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 cds_ja_node *node));
+               unsigned int flags);
 
 __attribute__((visibility("protected")))
 struct cds_lfht *rcuja_create_ht(const struct rcu_flavor_struct *flavor);
@@ -220,18 +219,11 @@ void free_cds_ja_node(struct cds_ja *ja, struct cds_ja_inode *node);
  * Receives a struct cds_ja_node * as parameter, which is used as start
  * of duplicate list and loop cursor.
  */
-#define cds_ja_for_each_duplicate(pos)                                 \
-       for (; (pos) != NULL; (pos) = (pos)->next)
-
-/*
- * Iterate through duplicates returned by cds_ja_lookup*()
- * Safe against removal of entries during traversal.
- */
-#define cds_ja_for_each_duplicate_safe(_pos, _next)                    \
-       for (; (_pos) != NULL ? ((_next) = (_pos)->next, 1) : 0;        \
-               (_pos) = (_next))
+#define cds_ja_for_each_duplicate(pos)                         \
+       for (; (pos) != NULL; (pos) = (pos)->next)
 
 //#define DEBUG
+//#define DEBUG_COUNTERS
 
 #ifdef __linux__
 #include <syscall.h>
@@ -257,6 +249,7 @@ static inline pid_t gettid(void)
        fprintf(stderr, "[debug rcuja %lu %s()@%s:%u] " fmt,    \
                (unsigned long) gettid(), __func__,             \
                __FILE__, __LINE__, ## args)
+
 #else
 #define dbg_printf(fmt, args...)                               \
 do {                                                           \
@@ -268,4 +261,18 @@ do {                                                               \
 } while (0)
 #endif
 
+#ifdef DEBUG_COUNTERS
+static inline
+int ja_debug_counters(void)
+{
+       return 1;
+}
+#else
+static inline
+int ja_debug_counters(void)
+{
+       return 0;
+}
+#endif
+
 #endif /* _URCU_RCUJA_INTERNAL_H */