Runs fewer elimination stack test cases

[libcds.git] / test / stress / stack / stack_type.h

diff --git a/test/stress/stack/stack_type.h b/test/stress/stack/stack_type.h
index 5c1dff20187afdaafd085305b979f852d95aadd0..fdad1bd91f053609ccc1b3c11bd5c61bdd4fc750 100644 (file)
--- a/test/stress/stack/stack_type.h
+++ b/test/stress/stack/stack_type.h
@@ -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/
@@ -187,10 +187,7 @@ namespace stack {
         struct traits_Treiber_exp: public
             cds::container::treiber_stack::make_traits<
                 cds::opt::back_off<
-                    cds::backoff::exponential<
-                        cds::backoff::pause,
-                        cds::backoff::yield
-                    >
+                    cds::backoff::make_exponential_t<cds::backoff::pause, cds::backoff::yield >
                 >
             >::type
         {};
@@ -324,10 +321,7 @@ namespace stack {
             cds::container::treiber_stack::make_traits <
                 cds::opt::enable_elimination<true>
                 ,cds::opt::back_off<
-                    cds::backoff::exponential<
-                        cds::backoff::pause,
-                        cds::backoff::yield
-                    >
+                    cds::backoff::make_exponential_t< cds::backoff::pause, cds::backoff::yield >
                 >
             > ::type
         {};
@@ -498,70 +492,40 @@ namespace cds_test {
 
 #define CDSSTRESS_TreiberStack( test_fixture ) \
     CDSSTRESS_Stack_F( test_fixture, Treiber_HP )        \
-    CDSSTRESS_Stack_F( test_fixture, Treiber_HP_seqcst ) \
     CDSSTRESS_Stack_F( test_fixture, Treiber_HP_pause )  \
     CDSSTRESS_Stack_F( test_fixture, Treiber_HP_exp )    \
-    CDSSTRESS_Stack_F( test_fixture, Treiber_HP_stat   ) \
     CDSSTRESS_Stack_F( test_fixture, Treiber_DHP       ) \
     CDSSTRESS_Stack_F( test_fixture, Treiber_DHP_pause ) \
-    CDSSTRESS_Stack_F( test_fixture, Treiber_DHP_exp   ) \
-    CDSSTRESS_Stack_F( test_fixture, Treiber_DHP_stat  ) \
+    CDSSTRESS_Stack_F( test_fixture, Treiber_DHP_exp   )
 
 #define CDSSTRESS_EliminationStack( test_fixture ) \
     CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP        ) \
-    CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP_2ms    ) \
-    CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP_2ms_stat) \
-    CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP_5ms    ) \
-    CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP_5ms_stat) \
-    CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP_10ms    ) \
-    CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP_10ms_stat) \
-    CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP_seqcst ) \
     CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP_pause  ) \
     CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP_exp    ) \
-    CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP_stat   ) \
     CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP_dyn    ) \
-    CDSSTRESS_EliminationStack_F( test_fixture, Elimination_HP_dyn_stat) \
     CDSSTRESS_EliminationStack_F( test_fixture, Elimination_DHP       ) \
-    CDSSTRESS_EliminationStack_F( test_fixture, Elimination_DHP_2ms    ) \
-    CDSSTRESS_EliminationStack_F( test_fixture, Elimination_DHP_2ms_stat) \
-    CDSSTRESS_EliminationStack_F( test_fixture, Elimination_DHP_5ms    ) \
-    CDSSTRESS_EliminationStack_F( test_fixture, Elimination_DHP_5ms_stat) \
-    CDSSTRESS_EliminationStack_F( test_fixture, Elimination_DHP_10ms    ) \
-    CDSSTRESS_EliminationStack_F( test_fixture, Elimination_DHP_10ms_stat) \
     CDSSTRESS_EliminationStack_F( test_fixture, Elimination_DHP_pause ) \
     CDSSTRESS_EliminationStack_F( test_fixture, Elimination_DHP_exp   ) \
-    CDSSTRESS_EliminationStack_F( test_fixture, Elimination_DHP_stat  ) \
-    CDSSTRESS_EliminationStack_F( test_fixture, Elimination_DHP_dyn   ) \
-    CDSSTRESS_EliminationStack_F( test_fixture, Elimination_DHP_dyn_stat)
+    CDSSTRESS_EliminationStack_F( test_fixture, Elimination_DHP_dyn   )
 
 #define CDSSTRESS_FCStack( test_fixture ) \
     CDSSTRESS_Stack_F( test_fixture, FCStack_deque ) \
     CDSSTRESS_Stack_F( test_fixture, FCStack_deque_mutex ) \
-    CDSSTRESS_Stack_F( test_fixture, FCStack_deque_stat ) \
     CDSSTRESS_Stack_F( test_fixture, FCStack_deque_elimination ) \
-    CDSSTRESS_Stack_F( test_fixture, FCStack_deque_elimination_stat ) \
     CDSSTRESS_Stack_F( test_fixture, FCStack_vector ) \
     CDSSTRESS_Stack_F( test_fixture, FCStack_vector_mutex ) \
-    CDSSTRESS_Stack_F( test_fixture, FCStack_vector_stat ) \
     CDSSTRESS_Stack_F( test_fixture, FCStack_vector_elimination ) \
-    CDSSTRESS_Stack_F( test_fixture, FCStack_vector_elimination_stat ) \
     CDSSTRESS_Stack_F( test_fixture, FCStack_list ) \
     CDSSTRESS_Stack_F( test_fixture, FCStack_list_mutex ) \
-    CDSSTRESS_Stack_F( test_fixture, FCStack_list_stat ) \
-    CDSSTRESS_Stack_F( test_fixture, FCStack_list_elimination ) \
-    CDSSTRESS_Stack_F( test_fixture, FCStack_list_elimination_stat )
+    CDSSTRESS_Stack_F( test_fixture, FCStack_list_elimination )
 
 #define CDSSTRESS_FCDeque( test_fixture ) \
     CDSSTRESS_Stack_F( test_fixture, FCDequeL_default ) \
     CDSSTRESS_Stack_F( test_fixture, FCDequeL_mutex ) \
-    CDSSTRESS_Stack_F( test_fixture, FCDequeL_stat ) \
     CDSSTRESS_Stack_F( test_fixture, FCDequeL_elimination ) \
-    CDSSTRESS_Stack_F( test_fixture, FCDequeL_elimination_stat ) \
     CDSSTRESS_Stack_F( test_fixture, FCDequeR_default ) \
     CDSSTRESS_Stack_F( test_fixture, FCDequeR_mutex ) \
-    CDSSTRESS_Stack_F( test_fixture, FCDequeR_stat ) \
-    CDSSTRESS_Stack_F( test_fixture, FCDequeR_elimination ) \
-    CDSSTRESS_Stack_F( test_fixture, FCDequeR_elimination_stat )
+    CDSSTRESS_Stack_F( test_fixture, FCDequeR_elimination )
 
 #define CDSSTRESS_StdStack( test_fixture ) \
     CDSSTRESS_Stack_F( test_fixture, StdStack_Deque_Mutex  ) \