Changeset 04552324 in mainline

Timestamp:

2012-12-03T14:54:05Z (12 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.

Location:

kernel/generic/src

Files:

• adt/cht.c (modified) (4 diffs)
• synch/workqueue.c (modified) (5 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)));

kernel/generic/src/synch/workqueue.c

@@ -139 +139 @@
 static void cv_wait(struct work_queue *workq);
 static void nonblock_init(void);
+
+#ifdef CONFIG_DEBUG
 static bool workq_corrupted(struct work_queue *workq);
 static bool work_item_corrupted(work_t *work_item);
-
+#endif
 
 /** Creates worker thread for the system-wide worker queue. */
@@ -204 +206 @@
         irq_spinlock_lock(&workq->lock, true);
         bool stopped = workq->stopping;
+#ifdef CONFIG_DEBUG
         size_t running_workers = workq->cur_worker_cnt;
+#endif
         irq_spinlock_unlock(&workq->lock, true);
         
@@ -940 +944 @@
 }
 
+#ifdef CONFIG_DEBUG
 /** Returns true if the workq is definitely corrupted; false if not sure. 
  * 
@@ -946 +951 @@
 static bool workq_corrupted(struct work_queue *workq)
 {
-#ifdef CONFIG_DEBUG
         /* 
          * Needed to make the most current cookie value set by workq_preinit()
@@ -955 +959 @@
         memory_barrier();
         return NULL == workq || workq->cookie != WORKQ_MAGIC;
-#else
-        return false;
+}
+
+/** Returns true if the work_item is definitely corrupted; false if not sure. 
+ * 
+ * Must be used with the work queue protecting spinlock locked.
+ */
+static bool work_item_corrupted(work_t *work_item)
+{
+        return NULL == work_item || work_item->cookie != WORK_ITEM_MAGIC;
+}
 #endif
-}
-
-/** Returns true if the work_item is definitely corrupted; false if not sure. 
- * 
- * Must be used with the work queue protecting spinlock locked.
- */
-static bool work_item_corrupted(work_t *work_item)
-{
-#ifdef CONFIG_DEBUG
-        return NULL == work_item || work_item->cookie != WORK_ITEM_MAGIC;
-#else
-        return false;
-#endif
-}
 
 /** @}