[SkipList] Added random-lvel generators for max height 32/24/16

[libcds.git] / test / stress / pqueue / push.cpp

diff --git a/test/stress/pqueue/push.cpp b/test/stress/pqueue/push.cpp
index d66fe76ee48d1a9052d46c6595a37653f808dfe6..71640a9aece7aaa70ea8e64e607a07d1aca0fb8e 100644 (file)
--- a/test/stress/pqueue/push.cpp
+++ b/test/stress/pqueue/push.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:
 
@@ -67,7 +67,7 @@ namespace pqueue {
                 typedef typename PQueue::value_type value_type;
 
                 for ( auto it = m_arr.begin(); it != m_arr.end(); ++it ) {
-                    if ( !m_Queue.push( value_type( *it ) ))
+                    if ( !m_Queue.push( value_type( *it )))
                         ++m_nPushError;
                 }
             }
@@ -77,7 +77,7 @@ namespace pqueue {
                 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:
@@ -94,7 +94,7 @@ namespace pqueue {
 
             for ( size_t i = 0; i < pool.size(); ++i ) {
                 Producer<PQueue>& prod = static_cast<Producer<PQueue>&>(pool.get( i ));
-                EXPECT_EQ( prod.m_nPushError, 0 ) << "producer=" << i;
+                EXPECT_EQ( prod.m_nPushError, 0u ) << "producer=" << i;
             }
             EXPECT_FALSE( q.empty());
 
@@ -146,17 +146,17 @@ namespace pqueue {
         }
 
     public:
-        static void SetUpTestCase()\r
-        {\r
-            cds_test::config const& cfg = get_config( "pqueue_push" );\r
-\r
+        static void SetUpTestCase()
+        {
+            cds_test::config const& cfg = get_config( "pqueue_push" );
+
             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();
@@ -169,10 +169,8 @@ namespace pqueue {
         pqueue_type pq( s_nQueueSize ); \
         test( pq ); \
     }
-    CDSSTRESS_MSPriorityQueue( pqueue_push, MSPriorityQueue_dyn_bitreverse_less )
-    CDSSTRESS_MSPriorityQueue( pqueue_push, MSPriorityQueue_dyn_bitreverse_less_stat )
-    CDSSTRESS_MSPriorityQueue( pqueue_push, MSPriorityQueue_dyn_monotonic_less )
-    CDSSTRESS_MSPriorityQueue( pqueue_push, MSPriorityQueue_dyn_monotonic_less_stat )
+    CDSSTRESS_MSPriorityQueue( pqueue_push, MSPriorityQueue_dyn_less )
+    CDSSTRESS_MSPriorityQueue( pqueue_push, MSPriorityQueue_dyn_less_stat )
     CDSSTRESS_MSPriorityQueue( pqueue_push, MSPriorityQueue_dyn_cmp )
     //CDSSTRESS_MSPriorityQueue( pqueue_push, MSPriorityQueue_dyn_mutex ) // too slow
 
@@ -181,12 +179,12 @@ namespace pqueue {
     { \
         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, MSPriorityQueue_static_less )
     //CDSSTRESS_MSPriorityQueue( pqueue_push, MSPriorityQueue_static_less_stat )
     //CDSSTRESS_MSPriorityQueue( pqueue_push, MSPriorityQueue_static_cmp )
-    //CDSSTRESS_MSPriorityQueue( pqueue_push, 1MSPriorityQueue_static_mutex )
+    //CDSSTRESS_MSPriorityQueue( pqueue_push, MSPriorityQueue_static_mutex )
 
 
 #define CDSSTRESS_PriorityQueue( fixture_t, pqueue_t ) \
@@ -230,31 +228,25 @@ namespace pqueue {
     CDSSTRESS_PriorityQueue( pqueue_push, EllenBinTree_RCU_shb_max_stat )
     CDSSTRESS_PriorityQueue( pqueue_push, EllenBinTree_RCU_shb_min )
     CDSSTRESS_PriorityQueue( pqueue_push, EllenBinTree_RCU_shb_min_stat )
-    CDSSTRESS_PriorityQueue( pqueue_push, EllenBinTree_RCU_sht_max )
-    CDSSTRESS_PriorityQueue( pqueue_push, EllenBinTree_RCU_sht_max_stat )
-    CDSSTRESS_PriorityQueue( pqueue_push, EllenBinTree_RCU_sht_min )
-    CDSSTRESS_PriorityQueue( pqueue_push, EllenBinTree_RCU_sht_min_stat )
 #endif
 
-    CDSSTRESS_PriorityQueue( pqueue_push, SkipList_HP_max )
-    CDSSTRESS_PriorityQueue( pqueue_push, SkipList_HP_max_stat )
-    CDSSTRESS_PriorityQueue( pqueue_push, SkipList_HP_min )
-    CDSSTRESS_PriorityQueue( pqueue_push, SkipList_HP_min_stat )
-    CDSSTRESS_PriorityQueue( pqueue_push, SkipList_DHP_max )
-    CDSSTRESS_PriorityQueue( pqueue_push, SkipList_DHP_max_stat )
-    CDSSTRESS_PriorityQueue( pqueue_push, SkipList_DHP_min )
-    CDSSTRESS_PriorityQueue( pqueue_push, SkipList_DHP_min_stat )
-    CDSSTRESS_PriorityQueue( pqueue_push, SkipList_RCU_gpi_max )
-    CDSSTRESS_PriorityQueue( pqueue_push, SkipList_RCU_gpi_min )
-    CDSSTRESS_PriorityQueue( pqueue_push, SkipList_RCU_gpb_max )
-    CDSSTRESS_PriorityQueue( pqueue_push, SkipList_RCU_gpb_min )
-    CDSSTRESS_PriorityQueue( pqueue_push, SkipList_RCU_gpt_max )
-    CDSSTRESS_PriorityQueue( pqueue_push, SkipList_RCU_gpt_min )
+    CDSSTRESS_PriorityQueue( pqueue_push, SkipList32_HP_max )
+    CDSSTRESS_PriorityQueue( pqueue_push, SkipList32_HP_max_stat )
+    CDSSTRESS_PriorityQueue( pqueue_push, SkipList32_HP_min )
+    CDSSTRESS_PriorityQueue( pqueue_push, SkipList32_HP_min_stat )
+    CDSSTRESS_PriorityQueue( pqueue_push, SkipList32_DHP_max )
+    CDSSTRESS_PriorityQueue( pqueue_push, SkipList32_DHP_max_stat )
+    CDSSTRESS_PriorityQueue( pqueue_push, SkipList32_DHP_min )
+    CDSSTRESS_PriorityQueue( pqueue_push, SkipList32_DHP_min_stat )
+    CDSSTRESS_PriorityQueue( pqueue_push, SkipList32_RCU_gpi_max )
+    CDSSTRESS_PriorityQueue( pqueue_push, SkipList32_RCU_gpi_min )
+    CDSSTRESS_PriorityQueue( pqueue_push, SkipList32_RCU_gpb_max )
+    CDSSTRESS_PriorityQueue( pqueue_push, SkipList32_RCU_gpb_min )
+    CDSSTRESS_PriorityQueue( pqueue_push, SkipList32_RCU_gpt_max )
+    CDSSTRESS_PriorityQueue( pqueue_push, SkipList32_RCU_gpt_min )
 #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED
-    CDSSTRESS_PriorityQueue( pqueue_push, SkipList_RCU_shb_max )
-    CDSSTRESS_PriorityQueue( pqueue_push, SkipList_RCU_shb_min )
-    CDSSTRESS_PriorityQueue( pqueue_push, SkipList_RCU_sht_max )
-    CDSSTRESS_PriorityQueue( pqueue_push, SkipList_RCU_sht_min )
+    CDSSTRESS_PriorityQueue( pqueue_push, SkipList32_RCU_shb_max )
+    CDSSTRESS_PriorityQueue( pqueue_push, SkipList32_RCU_shb_min )
 #endif
 
     CDSSTRESS_PriorityQueue( pqueue_push, StdPQueue_vector_spin )