projects / libcds.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Refactors test cases
[libcds.git] / test / stress / pqueue / push_pop.cpp
diff --git a/test/stress/pqueue/push_pop.cpp b/test/stress/pqueue/push_pop.cpp
index 3078a666605250e5ad27bdf791755b3edf8db78a..eff6abb507e3ab3b7e7c5dd59f9223322bc2dc35 100644 (file)
--- a/test/stress/pqueue/push_pop.cpp
+++ b/test/stress/pqueue/push_pop.cpp
@@ -1,7 +1,7 @@
 /*
     This file is a part of libcds - Concurrent Data Structures library
 
-    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016
+    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2017
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
@@ -86,7 +86,7 @@ namespace {
                 m_arr.reserve( nEnd - nStart );
                 for ( size_t i = nStart; i < nEnd; ++i )
                     m_arr.push_back( i );
-                shuffle( m_arr.begin(), m_arr.end() );
+                shuffle( m_arr.begin(), m_arr.end());
             }
 
         public:
@@ -121,7 +121,7 @@ namespace {
             virtual void test()
             {
                 typename PQueue::value_type val;
-                while ( s_nProducerCount.load( atomics::memory_order_relaxed ) != 0 || !m_Queue.empty() ) {
+                while ( s_nProducerCount.load( atomics::memory_order_relaxed ) != 0 || !m_Queue.empty()) {
                     if ( m_Queue.pop( val ))
                         ++m_nPopSuccess;
                     else
@@ -181,7 +181,7 @@ namespace {
                     assert( t.type() == producer_thread );
                     Producer<PQueue>& prod = static_cast<Producer<PQueue>&>(t);
                     nPushFailed += prod.m_nPushError;
-                    EXPECT_EQ( prod.m_nPushError , 0 ) << "producer " << i;
+                    EXPECT_EQ( prod.m_nPushError , 0u ) << "producer " << i;
                 }
             }
 
@@ -190,9 +190,9 @@ namespace {
                 << std::make_pair( "push_error", nPushFailed );
 
             EXPECT_EQ( nTotalPopped, s_nQueueSize );
-            EXPECT_EQ( nPushFailed, 0 );
+            EXPECT_EQ( nPushFailed, 0u );
 
-            //check_statistics( testQueue.statistics() );
+            //check_statistics( testQueue.statistics());
             propout() << q.statistics();
         }
 
@@ -205,11 +205,11 @@ namespace {
             s_nPopThreadCount = cfg.get_size_t( "PopThreadCount", s_nPopThreadCount );
             s_nQueueSize = cfg.get_size_t( "QueueSize", s_nQueueSize );
 
-            if ( s_nPushThreadCount == 0 )
+            if ( s_nPushThreadCount == 0u )
                 s_nPushThreadCount = 1;
-            if ( s_nPopThreadCount == 0 )
+            if ( s_nPopThreadCount == 0u )
                 s_nPopThreadCount = 1;
-            if ( s_nQueueSize == 0 )
+            if ( s_nQueueSize == 0u )
                 s_nQueueSize = 1000;
         }
 
@@ -224,7 +224,6 @@ namespace {
         test( pq ); \
     }
     CDSSTRESS_MSPriorityQueue( pqueue_push_pop, MSPriorityQueue_dyn_less )
-    CDSSTRESS_MSPriorityQueue( pqueue_push_pop, MSPriorityQueue_dyn_less_stat )
     CDSSTRESS_MSPriorityQueue( pqueue_push_pop, MSPriorityQueue_dyn_cmp )
     //CDSSTRESS_MSPriorityQueue( pqueue_push_pop, MSPriorityQueue_dyn_mutex ) // too slow
 
@@ -233,7 +232,7 @@ namespace {
     { \
         typedef pqueue::Types<pqueue::simple_value>::pqueue_t pqueue_type; \
         std::unique_ptr< pqueue_type > pq( new pqueue_type ); \
-        test( *pq.get() ); \
+        test( *pq.get()); \
     }
     //CDSSTRESS_MSPriorityQueue( pqueue_push_pop, MSPriorityQueue_static_less )
     //CDSSTRESS_MSPriorityQueue( pqueue_push_pop, MSPriorityQueue_static_less_stat )
@@ -248,70 +247,52 @@ namespace {
         pqueue_type pq; \
         test( pq ); \
     }
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, FCPQueue_vector )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, FCPQueue_vector_stat )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, FCPQueue_deque )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, FCPQueue_deque_stat )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, FCPQueue_boost_deque )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, FCPQueue_boost_deque_stat )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, FCPQueue_boost_stable_vector )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, FCPQueue_boost_stable_vector_stat )
 
     CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_HP_max )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_HP_max_stat )
     CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_HP_min )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_HP_min_stat )
     CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_DHP_max )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_DHP_max_stat )
     CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_DHP_min )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_DHP_min_stat )
     // CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpi_max )
     // CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpi_max_stat )
     // CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpi_min )
     // CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpi_min_stat )
     CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpb_max )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpb_max_stat )
     CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpb_min )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpb_min_stat )
     CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpt_max )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpt_max_stat )
     CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpt_min )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_gpt_min_stat )
 #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED
     CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_shb_max )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_shb_max_stat )
     CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_shb_min )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_shb_min_stat )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_sht_max )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_sht_max_stat )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_sht_min )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, EllenBinTree_RCU_sht_min_stat )
 #endif
 
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_HP_max )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_HP_max_stat )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_HP_min )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_HP_min_stat )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_DHP_max )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_DHP_max_stat )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_DHP_min )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_DHP_min_stat )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_RCU_gpi_max )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_RCU_gpi_min )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_RCU_gpb_max )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_RCU_gpb_min )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_RCU_gpt_max )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_RCU_gpt_min )
+    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_HP_max )
+    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList24_HP_max )
+    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList16_HP_max )
+    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_HP_min )
+    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList24_HP_min )
+    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList16_HP_min )
+    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_DHP_max )
+    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList24_DHP_max )
+    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList16_DHP_max )
+    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_DHP_min )
+    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList24_DHP_min )
+    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList16_DHP_min )
+    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_RCU_gpi_max )
+    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_RCU_gpi_min )
+    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_RCU_gpb_max )
+    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList24_RCU_gpb_max )
+    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList16_RCU_gpb_max )
+    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_RCU_gpb_min )
+    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList24_RCU_gpb_min )
+    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList16_RCU_gpb_min )
+    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_RCU_gpt_max )
+    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_RCU_gpt_min )
 #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_RCU_shb_max )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_RCU_shb_min )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_RCU_sht_max )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList_RCU_sht_min )
+    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_RCU_shb_max )
+    CDSSTRESS_PriorityQueue( pqueue_push_pop, SkipList32_RCU_shb_min )
 #endif
 
     CDSSTRESS_PriorityQueue( pqueue_push_pop, StdPQueue_vector_spin )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, StdPQueue_vector_mutex )
     CDSSTRESS_PriorityQueue( pqueue_push_pop, StdPQueue_deque_spin )
-    CDSSTRESS_PriorityQueue( pqueue_push_pop, StdPQueue_deque_mutex )
 
 } // namespace
Unnamed repository; edit this file 'description' to name the repository.