Replace CDS_DEBUG_DO with CDS_DEBUG_ONLY

diff --git a/cds/details/defs.h b/cds/details/defs.h
index 6f6baebccc65ca64178cf97ee9471efe3a0315a2..a69848ea06c5e2664a75121a26162e8df74b1637 100644 (file)
--- a/cds/details/defs.h
+++ b/cds/details/defs.h
@@ -320,10 +320,10 @@ namespace cds {}
 // CDS_VERIFY: Debug - assert(_expr); Release - _expr
 #ifdef CDS_DEBUG
 #   define CDS_VERIFY( _expr )    assert( _expr )
-#   define CDS_DEBUG_DO( _expr )        _expr
+#   define CDS_DEBUG_ONLY( _expr )        _expr
 #else
 #   define CDS_VERIFY( _expr )    _expr
-#   define CDS_DEBUG_DO( _expr )
+#   define CDS_DEBUG_ONLY( _expr )
 #endif
 
 #ifdef CDS_STRICT

diff --git a/cds/gc/hrc/details/hrc_inline.h b/cds/gc/hrc/details/hrc_inline.h
index a116582b325a64a864a7b2ed7e62e8e8acf2c46b..32df52581f2da0f7e613e917a2d69c730d76d4dc 100644 (file)
--- a/cds/gc/hrc/details/hrc_inline.h
+++ b/cds/gc/hrc/details/hrc_inline.h
@@ -31,18 +31,18 @@ namespace cds { namespace gc { namespace hrc {
         : m_bTrace( false )
         , m_bDeleted( false )
     {
-        CDS_DEBUG_DO( GarbageCollector::instance().dbgNodeConstructed() ; )
+        CDS_DEBUG_ONLY( GarbageCollector::instance().dbgNodeConstructed() ; )
     }
 
     inline ContainerNode::~ContainerNode()
     {
         assert( m_RC == 0 );
-        CDS_DEBUG_DO( GarbageCollector::instance().dbgNodeDestructed() ; )
+        CDS_DEBUG_ONLY( GarbageCollector::instance().dbgNodeDestructed() ; )
     }
 
     inline void GarbageCollector::try_retire( ThreadGC * pThreadGC )
     {
-        CDS_DEBUG_DO( unsigned int nAttempt = 0 );
+        CDS_DEBUG_ONLY( unsigned int nAttempt = 0 );
 
         do {
             pThreadGC->cleanUpLocal();

diff --git a/cds/gc/hrc/details/hrc_retired.h b/cds/gc/hrc/details/hrc_retired.h
index aa2adcd412531d46c60054cceadb5771c9ecfe33..90a3df6bc914cd529abca34ef2a0bbaf209ac7a9 100644 (file)
--- a/cds/gc/hrc/details/hrc_retired.h
+++ b/cds/gc/hrc/details/hrc_retired.h
@@ -130,7 +130,7 @@ namespace cds { namespace gc { namespace hrc {
                 size_t n = m_nFreeList;
                 assert( m_arr[n].m_pNode.load( atomics::memory_order_relaxed ) == nullptr );
                 m_nFreeList = m_arr[n].m_nNextFree;
-                CDS_DEBUG_DO( m_arr[n].m_nNextFree = m_nEndFreeList ; )
+                CDS_DEBUG_ONLY( m_arr[n].m_nNextFree = m_nEndFreeList ; )
                 m_arr[n].set( p, pFunc );
             }
 

diff --git a/cds/intrusive/optimistic_queue.h b/cds/intrusive/optimistic_queue.h
index 30e22254428f44f4fc05a68bbdaba426e2319909..e1d57948b1ed8cc1525bb10b698c38795aaf178b 100644 (file)
--- a/cds/intrusive/optimistic_queue.h
+++ b/cds/intrusive/optimistic_queue.h
@@ -490,8 +490,8 @@ namespace cds { namespace intrusive {
         {
             clear();
             node_type * pHead = m_pHead.load(memory_model::memory_order_relaxed);
-            CDS_DEBUG_DO( node_type * pTail = m_pTail.load(memory_model::memory_order_relaxed); )
-            CDS_DEBUG_DO( assert( pHead == pTail ); )
+            CDS_DEBUG_ONLY( node_type * pTail = m_pTail.load(memory_model::memory_order_relaxed); )
+            CDS_DEBUG_ONLY( assert( pHead == pTail ); )
             assert( pHead != nullptr );
 
             m_pHead.store( nullptr, memory_model::memory_order_relaxed );

diff --git a/cds/intrusive/segmented_queue.h b/cds/intrusive/segmented_queue.h
index f4182c787a6e128cdd71b2926cff6b07ca16bf90..2376e489f133c2b3aa0cded816742b896022adc4 100644 (file)
--- a/cds/intrusive/segmented_queue.h
+++ b/cds/intrusive/segmented_queue.h
@@ -462,10 +462,10 @@ namespace cds { namespace intrusive {
             ++m_ItemCounter;
 
             while ( true ) {
-                CDS_DEBUG_DO( size_t nLoopCount = 0);
+                CDS_DEBUG_ONLY( size_t nLoopCount = 0);
                 do {
                     typename permutation_generator::integer_type i = gen;
-                    CDS_DEBUG_DO( ++nLoopCount );
+                    CDS_DEBUG_ONLY( ++nLoopCount );
                     if ( pTailSegment->cells[i].load(memory_model::memory_order_relaxed).all() ) {
                         // Cell is not empty, go next
                         m_Stat.onPushPopulated();
@@ -621,10 +621,10 @@ namespace cds { namespace intrusive {
 
                 bool bHadNullValue = false;
                 cell item;
-                CDS_DEBUG_DO( size_t nLoopCount = 0 );
+                CDS_DEBUG_ONLY( size_t nLoopCount = 0 );
                 do {
                     typename permutation_generator::integer_type i = gen;
-                    CDS_DEBUG_DO( ++nLoopCount );
+                    CDS_DEBUG_ONLY( ++nLoopCount );
 
                     // Guard the item
                     // In segmented queue the cell cannot be reused

diff --git a/cds/lock/spinlock.h b/cds/lock/spinlock.h
index 0e5f457f43b5e6b550d4242a4af8c97e611fb592..1b657fc6fef6a89bacaeb3ac1635a1ec87c47c04 100644 (file)
--- a/cds/lock/spinlock.h
+++ b/cds/lock/spinlock.h
@@ -122,7 +122,7 @@ namespace cds {
                 bool bCurrent = false;
                 m_spin.compare_exchange_strong( bCurrent, true, atomics::memory_order_acquire, atomics::memory_order_relaxed );
 
-                CDS_DEBUG_DO(
+                CDS_DEBUG_ONLY(
                     if ( !bCurrent ) {
                         m_dbgOwnerId = OS::getCurrentThreadId();
                     }
@@ -175,7 +175,7 @@ namespace cds {
                 assert( m_spin.load( atomics::memory_order_relaxed ) );
 
                 assert( m_dbgOwnerId == OS::getCurrentThreadId() );
-                CDS_DEBUG_DO( m_dbgOwnerId = OS::c_NullThreadId; )
+                CDS_DEBUG_ONLY( m_dbgOwnerId = OS::c_NullThreadId; )
 
                 m_spin.store( false, atomics::memory_order_release );
             }

diff --git a/cds/urcu/details/base.h b/cds/urcu/details/base.h
index e45a862ac16ada4f71a1a913ced696bd7fb030a9..bcb7c53a1bac20b1555d9cbd2724d3ef4fdc2c88 100644 (file)
--- a/cds/urcu/details/base.h
+++ b/cds/urcu/details/base.h
@@ -383,8 +383,8 @@ namespace cds {
                 void destroy()
                 {
                     allocator_type al;
-                    CDS_DEBUG_DO( cds::OS::ThreadId const nullThreadId = cds::OS::c_NullThreadId; )
-                    CDS_DEBUG_DO( cds::OS::ThreadId const mainThreadId = cds::OS::getCurrentThreadId() ;)
+                    CDS_DEBUG_ONLY( cds::OS::ThreadId const nullThreadId = cds::OS::c_NullThreadId; )
+                    CDS_DEBUG_ONLY( cds::OS::ThreadId const mainThreadId = cds::OS::getCurrentThreadId() ;)
 
                     thread_record * p = m_pHead.exchange( nullptr, atomics::memory_order_seq_cst );
                     while ( p ) {

diff --git a/src/hzp_gc.cpp b/src/hzp_gc.cpp
index c61315646cbbc623738fb56a872346fcaef2ecda..e171fbcc03bdae21bd4fc92bea0ee62103037124 100644 (file)
--- a/src/hzp_gc.cpp
+++ b/src/hzp_gc.cpp
@@ -58,8 +58,8 @@ namespace cds { namespace gc {
 
         GarbageCollector::~GarbageCollector()
         {
-            CDS_DEBUG_DO( const cds::OS::ThreadId nullThreadId = cds::OS::c_NullThreadId; )
-            CDS_DEBUG_DO( const cds::OS::ThreadId mainThreadId = cds::OS::getCurrentThreadId() ;)
+            CDS_DEBUG_ONLY( const cds::OS::ThreadId nullThreadId = cds::OS::c_NullThreadId; )
+            CDS_DEBUG_ONLY( const cds::OS::ThreadId mainThreadId = cds::OS::getCurrentThreadId() ;)
 
             hplist_node * pHead = m_pListHead.load( atomics::memory_order_relaxed );
             m_pListHead.store( nullptr, atomics::memory_order_relaxed );