X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=test%2Fstress%2Fstack%2Fintrusive_stack_type.h;h=e33506e1725fb306b1d56fad7184c0b85e301860;hb=028d57080d593fe1965d77f007816425b2267b13;hp=078dc6784826f6c78109cb1e936f4d445985cf29;hpb=305da3404a293d5e5c4e76eb6660eeda5a7d4413;p=libcds.git

diff --git a/test/stress/stack/intrusive_stack_type.h b/test/stress/stack/intrusive_stack_type.h
index 078dc678..e33506e1 100644
--- a/test/stress/stack/intrusive_stack_type.h
+++ b/test/stress/stack/intrusive_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/
@@ -74,7 +74,7 @@ namespace istack {
             T * pop()
             {
                 unique_lock l( m_Lock );
-                if ( !m_Impl.empty() ) {
+                if ( !m_Impl.empty()) {
                      T * v = m_Impl.top();
                     m_Impl.pop();
                     return v;
@@ -151,10 +151,7 @@ namespace istack {
             cds::intrusive::treiber_stack::make_traits <
                 cds::intrusive::opt::hook< base_hook<GC> >
                 ,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
         {};
@@ -302,10 +299,7 @@ namespace istack {
                 cds::intrusive::opt::hook< base_hook<GC> >
                 , 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
         {};
@@ -419,66 +413,43 @@ namespace cds_test {
 
 #define CDSSTRESS_TreiberStack_HP( 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_HP_exp    )
 
 #define CDSSTRESS_TreiberStack_DHP( test_fixture ) \
     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_HP( test_fixture ) \
     CDSSTRESS_Stack_F( test_fixture, Elimination_HP ) \
     CDSSTRESS_Stack_F( test_fixture, Elimination_HP_2ms ) \
-    CDSSTRESS_Stack_F( test_fixture, Elimination_HP_2ms_stat ) \
     CDSSTRESS_Stack_F( test_fixture, Elimination_HP_5ms ) \
-    CDSSTRESS_Stack_F( test_fixture, Elimination_HP_5ms_stat ) \
     CDSSTRESS_Stack_F( test_fixture, Elimination_HP_10ms ) \
-    CDSSTRESS_Stack_F( test_fixture, Elimination_HP_10ms_stat ) \
-    CDSSTRESS_Stack_F( test_fixture, Elimination_HP_seqcst ) \
     CDSSTRESS_Stack_F( test_fixture, Elimination_HP_pause ) \
     CDSSTRESS_Stack_F( test_fixture, Elimination_HP_exp ) \
-    CDSSTRESS_Stack_F( test_fixture, Elimination_HP_stat ) \
-    CDSSTRESS_Stack_F( test_fixture, Elimination_HP_dyn ) \
-    CDSSTRESS_Stack_F( test_fixture, Elimination_HP_dyn_stat ) \
+    CDSSTRESS_Stack_F( test_fixture, Elimination_HP_dyn )
 
 
 #define CDSSTRESS_EliminationStack_DHP( test_fixture ) \
     CDSSTRESS_Stack_F( test_fixture, Elimination_DHP ) \
-    CDSSTRESS_Stack_F( test_fixture, Elimination_DHP_seqcst ) \
     CDSSTRESS_Stack_F( test_fixture, Elimination_DHP_2ms ) \
-    CDSSTRESS_Stack_F( test_fixture, Elimination_DHP_2ms_stat ) \
     CDSSTRESS_Stack_F( test_fixture, Elimination_DHP_5ms ) \
-    CDSSTRESS_Stack_F( test_fixture, Elimination_DHP_5ms_stat ) \
     CDSSTRESS_Stack_F( test_fixture, Elimination_DHP_10ms ) \
-    CDSSTRESS_Stack_F( test_fixture, Elimination_DHP_10ms_stat ) \
     CDSSTRESS_Stack_F( test_fixture, Elimination_DHP_pause ) \
     CDSSTRESS_Stack_F( test_fixture, Elimination_DHP_exp ) \
-    CDSSTRESS_Stack_F( test_fixture, Elimination_DHP_stat ) \
-    CDSSTRESS_Stack_F( test_fixture, Elimination_DHP_dyn ) \
-    CDSSTRESS_Stack_F( test_fixture, Elimination_DHP_dyn_stat )
+    CDSSTRESS_Stack_F( test_fixture, Elimination_DHP_dyn )
 
 #define CDSSTRESS_FCStack_slist( test_fixture ) \
     CDSSTRESS_Stack_F( test_fixture, FCStack_slist ) \
-    CDSSTRESS_Stack_F( test_fixture, FCStack_slist_stat ) \
     CDSSTRESS_Stack_F( test_fixture, FCStack_slist_elimination ) \
-    CDSSTRESS_Stack_F( test_fixture, FCStack_slist_elimination_stat ) \
-    CDSSTRESS_Stack_F( test_fixture, FCStack_slist_mutex_stat ) \
-    CDSSTRESS_Stack_F( test_fixture, FCStack_slist_mutex_elimination ) \
-    CDSSTRESS_Stack_F( test_fixture, FCStack_slist_mutex_elimination_stat ) \
+    CDSSTRESS_Stack_F( test_fixture, FCStack_slist_mutex_elimination )
 
 #define CDSSTRESS_FCStack_list( test_fixture ) \
     CDSSTRESS_Stack_F( test_fixture, FCStack_list ) \
-    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_mutex_stat ) \
-    CDSSTRESS_Stack_F( test_fixture, FCStack_list_mutex_elimination ) \
-    CDSSTRESS_Stack_F( test_fixture, FCStack_list_mutex_elimination_stat )
+    CDSSTRESS_Stack_F( test_fixture, FCStack_list_mutex_elimination )
 
 #define CDSSTRESS_StdStack( test_fixture ) \
     CDSSTRESS_Stack_F( test_fixture, StdStack_Deque_Mutex  ) \