Changeset bf2042f9 in mainline
- Timestamp:
- 2018-03-27T06:48:39Z (7 years ago)
- 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)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
kernel/generic/src/adt/cht.c
re2172284 rbf2042f9 296 296 #include <atomic.h> 297 297 #include <synch/rcu.h> 298 299 #ifdef CONFIG_DEBUG300 /* Do not enclose in parentheses. */301 #define DBG(x) x302 #else303 #define DBG(x)304 #endif305 298 306 299 /* 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); 1762 1755 1763 DBG(marked_ptr_t ret = ) 1764 cas_link(pdest_head, &sentinel, N_INVALID, next, N_NORMAL); 1756 #ifdef CONFIG_DEBUG 1757 marked_ptr_t ret = 1758 #endif 1759 cas_link(pdest_head, &sentinel, N_INVALID, next, N_NORMAL); 1765 1760 assert(ret == make_link(&sentinel, N_INVALID) || (N_NORMAL == get_mark(ret))); 1766 1761 cas_order_barrier(); 1767 1762 1768 DBG(ret = ) 1769 cas_link(psrc_head, next, N_CONST, next, N_INVALID); 1763 #ifdef CONFIG_DEBUG 1764 ret = 1765 #endif 1766 cas_link(psrc_head, next, N_CONST, next, N_INVALID); 1770 1767 assert(ret == make_link(next, N_CONST) || (N_INVALID == get_mark(ret))); 1771 1768 cas_order_barrier(); … … 1859 1856 1860 1857 /* Link the dest head to the second part of the split. */ 1861 DBG(marked_ptr_t ret = ) 1862 cas_link(pdest_head, &sentinel, N_INVALID, wnd.cur, N_NORMAL); 1858 #ifdef CONFIG_DEBUG 1859 marked_ptr_t ret = 1860 #endif 1861 cas_link(pdest_head, &sentinel, N_INVALID, wnd.cur, N_NORMAL); 1863 1862 assert(ret == make_link(&sentinel, N_INVALID) || (N_NORMAL == get_mark(ret))); 1864 1863 cas_order_barrier(); … … 2040 2039 } 2041 2040 2042 DBG(marked_ptr_t ret = ) 2043 cas_link(psrc_head, join_node, N_CONST, join_node, N_INVALID); 2041 #ifdef CONFIG_DEBUG 2042 marked_ptr_t ret = 2043 cas_link(psrc_head, join_node, N_CONST, join_node, N_INVALID); 2044 #endif 2044 2045 assert(ret == make_link(join_node, N_CONST) || (N_INVALID == get_mark(ret))); 2045 2046 cas_order_barrier();
Note:
See TracChangeset
for help on using the changeset viewer.