Fix: rcuja merge fixes

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

diff --git a/rcuja/rcuja-internal.h b/rcuja/rcuja-internal.h
index 8f5f375ee9e94fd5c1c714432c4aa24b85c28f7c..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
@@ -222,6 +223,7 @@ void free_cds_ja_node(struct cds_ja *ja, struct cds_ja_inode *node);
        for (; (pos) != NULL; (pos) = (pos)->next)
 
 //#define DEBUG
+//#define DEBUG_COUNTERS
 
 #ifdef __linux__
 #include <syscall.h>
@@ -247,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 {                                                           \
@@ -258,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 */