Changeset 04552324 in mainline for kernel/generic/src/adt/cht.c

Timestamp:

2012-12-03T14:54:05Z (11 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

a440a0f

Parents:

69146b93

Message:

cht, workq: Got rid of warnings in release builds.

File:

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

kernel/generic/src/adt/cht.c

@@ -298 +298 @@
 #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. */
@@ -1755 +1761 @@
         
         cht_link_t *next = get_next(*psrc_head);
-        marked_ptr_t ret;
-        
-        ret = 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();
         
-        ret = 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();
@@ -1853 +1860 @@
         
         /* Link the dest head to the second part of the split. */
-        marked_ptr_t ret = 
+        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)));
@@ -2033 +2040 @@
         } 
         
-        marked_ptr_t ret = 
+        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)));