Changeset bf2042f9 in mainline

Timestamp:

2018-03-27T06:48:39Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f303afc6

Parents:

e2172284

git-author:

Jiri Svoboda <jiri@…> (2018-03-26 22:28:32)

git-committer:

Jiri Svoboda <jiri@…> (2018-03-27 06:48:39)

Message:

Yet more magic.

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. */
@@ -1761 +1754 @@
         cht_link_t *next = get_next(*psrc_head);
 
-        DBG(marked_ptr_t ret = )
-                cas_link(pdest_head, &sentinel, N_INVALID, next, N_NORMAL);
+#ifdef CONFIG_DEBUG
+        marked_ptr_t ret =
+#endif
+            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();
 
-        DBG(ret = )
-                cas_link(psrc_head, next, N_CONST, next, N_INVALID);
+#ifdef CONFIG_DEBUG
+        ret =
+#endif
+            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();
@@ -1859 +1856 @@
 
         /* Link the dest head to the second part of the split. */
-        DBG(marked_ptr_t ret = )
-                cas_link(pdest_head, &sentinel, N_INVALID, wnd.cur, N_NORMAL);
+#ifdef CONFIG_DEBUG
+        marked_ptr_t ret =
+#endif
+            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();
@@ -2040 +2039 @@
         }
 
-        DBG(marked_ptr_t ret = )
-                cas_link(psrc_head, join_node, N_CONST, join_node, N_INVALID);
+#ifdef CONFIG_DEBUG
+        marked_ptr_t ret =
+            cas_link(psrc_head, join_node, N_CONST, join_node, N_INVALID);
+#endif
         assert(ret == make_link(join_node, N_CONST) || (N_INVALID == get_mark(ret)));
         cas_order_barrier();