Uses different pass count for elimination stack

[libcds.git] / test / stress / stack / push_pop.cpp

diff --git a/test/stress/stack/push_pop.cpp b/test/stress/stack/push_pop.cpp
index 4ed882d41a9e2139a41fcf995d0508cd9325628d..56917927cfa9686cf7000dceeb16a1bc0c667a04 100644 (file)
--- a/test/stress/stack/push_pop.cpp
+++ b/test/stress/stack/push_pop.cpp
@@ -29,12 +29,14 @@
 */
 
 #include "stack_type.h"
+#include "../misc/common.h"
 
 namespace {
 
     static size_t s_nPushThreadCount = 4;
     static size_t s_nPopThreadCount = 4;
     static size_t s_nStackSize = 1000000;
+    static size_t s_nEliminationStackSize = 500000;
     static size_t s_nEliminationSize = 4;
 
     static atomics::atomic<size_t>  s_nWorkingProducers( 0 );
@@ -174,6 +176,8 @@ namespace {
             s_nPushThreadCount = cfg.get_size_t( "PushThreadCount", s_nPushThreadCount );
             s_nPopThreadCount  = cfg.get_size_t( "PopThreadCount",  s_nPopThreadCount );
             s_nStackSize       = cfg.get_size_t( "StackSize",       s_nStackSize );
+            s_nEliminationStackSize =
+                cfg.get_size_t("EliminationStackSize", s_nEliminationStackSize);
             s_nEliminationSize = cfg.get_size_t( "EliminationSize", s_nEliminationSize );
 
             if ( s_nPushThreadCount == 0 )
@@ -205,7 +209,7 @@ namespace {
 
             propout() << std::make_pair( "duration", duration );
 
-            analyze( stack );
+            DEBUG(analyze( stack ));
 
             propout() << stack.statistics();
         }
@@ -278,9 +282,20 @@ namespace {
     };
 
     CDSSTRESS_TreiberStack( stack_push_pop )
+
+    #undef CDSSTRESS_EliminationStack_F
+
+    #define CDSSTRESS_EliminationStack_F( test_fixture, type_name ) \
+    TEST_F( test_fixture, type_name ) \
+    { \
+        typedef stack::Types< value_type >::type_name stack_type; \
+        s_nStackSize = s_nEliminationStackSize; \
+        stack_type stack( s_nEliminationSize ); \
+        test_elimination( stack ); \
+    }
+
     CDSSTRESS_EliminationStack( stack_push_pop )
-    CDSSTRESS_FCStack( stack_push_pop )
-    CDSSTRESS_FCDeque( stack_push_pop )
-    CDSSTRESS_StdStack( stack_push_pop )
+    //CDSSTRESS_FCStack( stack_push_pop )
+    //CDSSTRESS_FCDeque( stack_push_pop )
 
 } // namespace