Changeset 04552324 in mainline
- Timestamp:
- 2012-12-03T14:54:05Z (12 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- a440a0f
- Parents:
- 69146b93
- Location:
- kernel/generic/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/generic/src/adt/cht.c
r69146b93 r04552324 298 298 #include <synch/rcu.h> 299 299 300 #ifdef CONFIG_DEBUG 301 /* Do not enclose in parentheses. */ 302 #define DBG(x) x 303 #else 304 #define DBG(x) 305 #endif 300 306 301 307 /* Logarithm of the min bucket count. Must be at least 3. 2^6 == 64 buckets. */ … … 1755 1761 1756 1762 cht_link_t *next = get_next(*psrc_head); 1757 marked_ptr_t ret; 1758 1759 ret =cas_link(pdest_head, &sentinel, N_INVALID, next, N_NORMAL);1763 1764 DBG(marked_ptr_t ret = ) 1765 cas_link(pdest_head, &sentinel, N_INVALID, next, N_NORMAL); 1760 1766 ASSERT(ret == make_link(&sentinel, N_INVALID) || (N_NORMAL == get_mark(ret))); 1761 1767 cas_order_barrier(); 1762 1768 1763 ret = cas_link(psrc_head, next, N_CONST, next, N_INVALID); 1769 DBG(ret = ) 1770 cas_link(psrc_head, next, N_CONST, next, N_INVALID); 1764 1771 ASSERT(ret == make_link(next, N_CONST) || (N_INVALID == get_mark(ret))); 1765 1772 cas_order_barrier(); … … 1853 1860 1854 1861 /* Link the dest head to the second part of the split. */ 1855 marked_ptr_t ret =1862 DBG(marked_ptr_t ret = ) 1856 1863 cas_link(pdest_head, &sentinel, N_INVALID, wnd.cur, N_NORMAL); 1857 1864 ASSERT(ret == make_link(&sentinel, N_INVALID) || (N_NORMAL == get_mark(ret))); … … 2033 2040 } 2034 2041 2035 marked_ptr_t ret =2042 DBG(marked_ptr_t ret = ) 2036 2043 cas_link(psrc_head, join_node, N_CONST, join_node, N_INVALID); 2037 2044 ASSERT(ret == make_link(join_node, N_CONST) || (N_INVALID == get_mark(ret))); -
kernel/generic/src/synch/workqueue.c
r69146b93 r04552324 139 139 static void cv_wait(struct work_queue *workq); 140 140 static void nonblock_init(void); 141 142 #ifdef CONFIG_DEBUG 141 143 static bool workq_corrupted(struct work_queue *workq); 142 144 static bool work_item_corrupted(work_t *work_item); 143 145 #endif 144 146 145 147 /** Creates worker thread for the system-wide worker queue. */ … … 204 206 irq_spinlock_lock(&workq->lock, true); 205 207 bool stopped = workq->stopping; 208 #ifdef CONFIG_DEBUG 206 209 size_t running_workers = workq->cur_worker_cnt; 210 #endif 207 211 irq_spinlock_unlock(&workq->lock, true); 208 212 … … 940 944 } 941 945 946 #ifdef CONFIG_DEBUG 942 947 /** Returns true if the workq is definitely corrupted; false if not sure. 943 948 * … … 946 951 static bool workq_corrupted(struct work_queue *workq) 947 952 { 948 #ifdef CONFIG_DEBUG949 953 /* 950 954 * Needed to make the most current cookie value set by workq_preinit() … … 955 959 memory_barrier(); 956 960 return NULL == workq || workq->cookie != WORKQ_MAGIC; 957 #else 958 return false; 961 } 962 963 /** Returns true if the work_item is definitely corrupted; false if not sure. 964 * 965 * Must be used with the work queue protecting spinlock locked. 966 */ 967 static bool work_item_corrupted(work_t *work_item) 968 { 969 return NULL == work_item || work_item->cookie != WORK_ITEM_MAGIC; 970 } 959 971 #endif 960 }961 962 /** Returns true if the work_item is definitely corrupted; false if not sure.963 *964 * Must be used with the work queue protecting spinlock locked.965 */966 static bool work_item_corrupted(work_t *work_item)967 {968 #ifdef CONFIG_DEBUG969 return NULL == work_item || work_item->cookie != WORK_ITEM_MAGIC;970 #else971 return false;972 #endif973 }974 972 975 973 /** @}
Note:
See TracChangeset
for help on using the changeset viewer.