Changes in kernel/generic/src/adt/cht.c [f303afc6:a35b458] in mainline

File:

• kernel/generic/src/adt/cht.c (modified) (4 diffs)

kernel/generic/src/adt/cht.c

@@ -296 +296 @@
 #include <atomic.h>
 #include <synch/rcu.h>
+
+#ifdef CONFIG_DEBUG
+/* Do not enclose in parentheses. */
+#define DBG(x) x
+#else
+#define DBG(x)
+#endif
 
 /* Logarithm of the min bucket count. Must be at least 3. 2^6 == 64 buckets. */
@@ -1754 +1761 @@
         cht_link_t *next = get_next(*psrc_head);
 
-#ifdef CONFIG_DEBUG
-        marked_ptr_t ret =
-#endif
-            cas_link(pdest_head, &sentinel, N_INVALID, next, N_NORMAL);
+        DBG(marked_ptr_t ret = )
+                cas_link(pdest_head, &sentinel, N_INVALID, next, N_NORMAL);
         assert(ret == make_link(&sentinel, N_INVALID) || (N_NORMAL == get_mark(ret)));
         cas_order_barrier();
 
-#ifdef CONFIG_DEBUG
-        ret =
-#endif
-            cas_link(psrc_head, next, N_CONST, next, N_INVALID);
+        DBG(ret = )
+                cas_link(psrc_head, next, N_CONST, next, N_INVALID);
         assert(ret == make_link(next, N_CONST) || (N_INVALID == get_mark(ret)));
         cas_order_barrier();
@@ -1856 +1859 @@
 
         /* Link the dest head to the second part of the split. */
-#ifdef CONFIG_DEBUG
-        marked_ptr_t ret =
-#endif
-            cas_link(pdest_head, &sentinel, N_INVALID, wnd.cur, N_NORMAL);
+        DBG(marked_ptr_t ret = )
+                cas_link(pdest_head, &sentinel, N_INVALID, wnd.cur, N_NORMAL);
         assert(ret == make_link(&sentinel, N_INVALID) || (N_NORMAL == get_mark(ret)));
         cas_order_barrier();
@@ -2039 +2040 @@
         }
 
-#ifdef CONFIG_DEBUG
-        marked_ptr_t ret =
-#endif
-            cas_link(psrc_head, join_node, N_CONST, join_node, N_INVALID);
+        DBG(marked_ptr_t ret = )
+                cas_link(psrc_head, join_node, N_CONST, join_node, N_INVALID);
         assert(ret == make_link(join_node, N_CONST) || (N_INVALID == get_mark(ret)));
         cas_order_barrier();