projects / libcds.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Trims down unnecessary pqueue test cases
[libcds.git] / test / stress / pqueue / pop.cpp
diff --git a/test/stress/pqueue/pop.cpp b/test/stress/pqueue/pop.cpp
index cef5f0b370f523cc2deeb3955e84404095a838ef..3006c314c0ddda473ddde616bd6d936ee33fc3cc 100644 (file)
--- a/test/stress/pqueue/pop.cpp
+++ b/test/stress/pqueue/pop.cpp
@@ -1,11 +1,11 @@
 /*
     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/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 
@@ -124,12 +124,12 @@ namespace {
                 arr.reserve( s_nQueueSize );
                 for ( size_t i = 0; i < s_nQueueSize; ++i )
                     arr.push_back( i );
-                shuffle( arr.begin(), arr.end() );
+                shuffle( arr.begin(), arr.end());
 
                 size_t nPushError = 0;
                 typedef typename PQueue::value_type value_type;
                 for ( auto it = arr.begin(); it != arr.end(); ++it ) {
-                    if ( !q.push( value_type( *it ) ))
+                    if ( !q.push( value_type( *it )))
                         ++nPushError;
                 }
                 s_nQueueSize -= nPushError;
@@ -158,11 +158,11 @@ namespace {
                     nTotalErrorEq += cons.m_nPopErrorEq;
                     nTotalFailed  += cons.m_nPopFailed;
 
-                    if ( !cons.m_arrFailedPops.empty() ) {
+                    if ( !cons.m_arrFailedPops.empty()) {
                         std::cerr << "Priority violations, thread " << i;
                         for ( size_t k = 0; k < cons.m_arrFailedPops.size(); ++k ) {
                             std::cerr << "\n    " << "prev_key=" << cons.m_arrFailedPops[k].prev_key << " popped_key=" << cons.m_arrFailedPops[k].popped_key;
-                            if ( cons.m_arrFailedPops[k].next_key != static_cast<size_t>(-1) )
+                            if ( cons.m_arrFailedPops[k].next_key != static_cast<size_t>(-1))
                                 std::cerr << " next_key=" << cons.m_arrFailedPops[k].next_key;
                             else
                                 std::cerr << " next_key unspecified";
@@ -177,25 +177,25 @@ namespace {
                     << std::make_pair( "error_priority_violation", nTotalError );
 
                 EXPECT_EQ( nTotalPopped, s_nQueueSize );
-                EXPECT_EQ( nTotalError, 0 ) << "priority violations";
-                EXPECT_EQ( nTotalErrorEq, 0 ) << "double key";
+                EXPECT_EQ( nTotalError, 0u ) << "priority violations";
+                EXPECT_EQ( nTotalErrorEq, 0u ) << "double key";
             }
 
             propout() << q.statistics();
         }
 
     public:
-        static void SetUpTestCase()\r
-        {\r
-            cds_test::config const& cfg = get_config( "pqueue_pop" );\r
-\r
+        static void SetUpTestCase()
+        {
+            cds_test::config const& cfg = get_config( "pqueue_pop" );
+
             s_nThreadCount = cfg.get_size_t( "ThreadCount", s_nThreadCount );
             s_nQueueSize = cfg.get_size_t( "QueueSize", s_nQueueSize );
 
-            if ( s_nThreadCount == 0 )
+            if ( s_nThreadCount == 0u )
                 s_nThreadCount = 1;
-            if ( s_nQueueSize == 0 )
-                s_nQueueSize = 1000;\r
+            if ( s_nQueueSize == 0u )
+                s_nQueueSize = 1000;
         }
 
         //static void TearDownTestCase();
@@ -209,7 +209,6 @@ namespace {
         test( pq ); \
     }
     CDSSTRESS_MSPriorityQueue( pqueue_pop, MSPriorityQueue_dyn_less )
-    CDSSTRESS_MSPriorityQueue( pqueue_pop, MSPriorityQueue_dyn_less_stat )
     CDSSTRESS_MSPriorityQueue( pqueue_pop, MSPriorityQueue_dyn_cmp )
     //CDSSTRESS_MSPriorityQueue( pqueue_pop, MSPriorityQueue_dyn_mutex ) // too slow
 
@@ -218,7 +217,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_pop, MSPriorityQueue_static_less )
     //CDSSTRESS_MSPriorityQueue( pqueue_pop, MSPriorityQueue_static_less_stat )
@@ -233,70 +232,39 @@ namespace {
         pqueue_type pq; \
         test( pq ); \
     }
-    CDSSTRESS_PriorityQueue( pqueue_pop, FCPQueue_vector )
-    CDSSTRESS_PriorityQueue( pqueue_pop, FCPQueue_vector_stat )
-    CDSSTRESS_PriorityQueue( pqueue_pop, FCPQueue_deque )
-    CDSSTRESS_PriorityQueue( pqueue_pop, FCPQueue_deque_stat )
-    CDSSTRESS_PriorityQueue( pqueue_pop, FCPQueue_boost_deque )
-    CDSSTRESS_PriorityQueue( pqueue_pop, FCPQueue_boost_deque_stat )
-    CDSSTRESS_PriorityQueue( pqueue_pop, FCPQueue_boost_stable_vector )
-    CDSSTRESS_PriorityQueue( pqueue_pop, FCPQueue_boost_stable_vector_stat )
-
     CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_HP_max )
-    CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_HP_max_stat )
     CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_HP_min )
-    CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_HP_min_stat )
     CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_DHP_max )
-    CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_DHP_max_stat )
     CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_DHP_min )
-    CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_DHP_min_stat )
     // CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_gpi_max )
     // CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_gpi_max_stat )
     // CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_gpi_min )
     // CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_gpi_min_stat )
     CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_gpb_max )
-    CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_gpb_max_stat )
     CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_gpb_min )
-    CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_gpb_min_stat )
     CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_gpt_max )
-    CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_gpt_max_stat )
     CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_gpt_min )
-    CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_gpt_min_stat )
 #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED
     CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_shb_max )
-    CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_shb_max_stat )
     CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_shb_min )
-    CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_shb_min_stat )
-    CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_sht_max )
-    CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_sht_max_stat )
-    CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_sht_min )
-    CDSSTRESS_PriorityQueue( pqueue_pop, EllenBinTree_RCU_sht_min_stat )
 #endif
 
-    CDSSTRESS_PriorityQueue( pqueue_pop, SkipList_HP_max )
-    CDSSTRESS_PriorityQueue( pqueue_pop, SkipList_HP_max_stat )
-    CDSSTRESS_PriorityQueue( pqueue_pop, SkipList_HP_min )
-    CDSSTRESS_PriorityQueue( pqueue_pop, SkipList_HP_min_stat )
-    CDSSTRESS_PriorityQueue( pqueue_pop, SkipList_DHP_max )
-    CDSSTRESS_PriorityQueue( pqueue_pop, SkipList_DHP_max_stat )
-    CDSSTRESS_PriorityQueue( pqueue_pop, SkipList_DHP_min )
-    CDSSTRESS_PriorityQueue( pqueue_pop, SkipList_DHP_min_stat )
-    CDSSTRESS_PriorityQueue( pqueue_pop, SkipList_RCU_gpi_max )
-    CDSSTRESS_PriorityQueue( pqueue_pop, SkipList_RCU_gpi_min )
-    CDSSTRESS_PriorityQueue( pqueue_pop, SkipList_RCU_gpb_max )
-    CDSSTRESS_PriorityQueue( pqueue_pop, SkipList_RCU_gpb_min )
-    CDSSTRESS_PriorityQueue( pqueue_pop, SkipList_RCU_gpt_max )
-    CDSSTRESS_PriorityQueue( pqueue_pop, SkipList_RCU_gpt_min )
+    CDSSTRESS_PriorityQueue( pqueue_pop, SkipList32_HP_max )
+    CDSSTRESS_PriorityQueue( pqueue_pop, SkipList32_HP_min )
+    CDSSTRESS_PriorityQueue( pqueue_pop, SkipList32_DHP_max )
+    CDSSTRESS_PriorityQueue( pqueue_pop, SkipList32_DHP_min )
+    CDSSTRESS_PriorityQueue( pqueue_pop, SkipList32_RCU_gpi_max )
+    CDSSTRESS_PriorityQueue( pqueue_pop, SkipList32_RCU_gpi_min )
+    CDSSTRESS_PriorityQueue( pqueue_pop, SkipList32_RCU_gpb_max )
+    CDSSTRESS_PriorityQueue( pqueue_pop, SkipList32_RCU_gpb_min )
+    CDSSTRESS_PriorityQueue( pqueue_pop, SkipList32_RCU_gpt_max )
+    CDSSTRESS_PriorityQueue( pqueue_pop, SkipList32_RCU_gpt_min )
 #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED
-    CDSSTRESS_PriorityQueue( pqueue_pop, SkipList_RCU_shb_max )
-    CDSSTRESS_PriorityQueue( pqueue_pop, SkipList_RCU_shb_min )
-    CDSSTRESS_PriorityQueue( pqueue_pop, SkipList_RCU_sht_max )
-    CDSSTRESS_PriorityQueue( pqueue_pop, SkipList_RCU_sht_min )
+    CDSSTRESS_PriorityQueue( pqueue_pop, SkipList32_RCU_shb_max )
+    CDSSTRESS_PriorityQueue( pqueue_pop, SkipList32_RCU_shb_min )
 #endif
 
     CDSSTRESS_PriorityQueue( pqueue_pop, StdPQueue_vector_spin )
-    CDSSTRESS_PriorityQueue( pqueue_pop, StdPQueue_vector_mutex )
     CDSSTRESS_PriorityQueue( pqueue_pop, StdPQueue_deque_spin )
-    CDSSTRESS_PriorityQueue( pqueue_pop, StdPQueue_deque_mutex )
 
 } // namespace
Unnamed repository; edit this file 'description' to name the repository.