Disables running some stat analysis for benchmarks & Adds some sequential data structures

[libcds.git] / test / stress / set / iter_erase / set_iter_erase.h

diff --git a/test/stress/set/iter_erase/set_iter_erase.h b/test/stress/set/iter_erase/set_iter_erase.h
index 5ab5acfe9eeb8f30432b65dc558d76c05a66a68c..74a6cee20167c4915546103e4a645fc72dbc156c 100644 (file)
--- a/test/stress/set/iter_erase/set_iter_erase.h
+++ b/test/stress/set/iter_erase/set_iter_erase.h
@@ -29,6 +29,7 @@
 */
 
 #include "set_type.h"
 */
 
 #include "set_type.h"

+#include "../../misc/common.h"

 #include <cds/os/topology.h>
 
 namespace set {
 #include <cds/os/topology.h>
 
 namespace set {


@@ -125,10 +126,6 @@ namespace set {
         static size_t s_nInsertPassCount;
         static size_t s_nFindThreadCount;      // find thread count
 
         static size_t s_nInsertPassCount;
         static size_t s_nFindThreadCount;      // find thread count
 

-        static size_t s_nCuckooInitialSize;    // initial size for CuckooSet
-        static size_t s_nCuckooProbesetSize;   // CuckooSet probeset size (only for list-based probeset)
-        static size_t s_nCuckooProbesetThreshold; // CUckooSet probeset threshold (0 - use default)
-

         static size_t s_nFeldmanSet_HeadBits;
         static size_t s_nFeldmanSet_ArrayBits;
 
         static size_t s_nFeldmanSet_HeadBits;
         static size_t s_nFeldmanSet_ArrayBits;
 


@@ -362,12 +359,11 @@ namespace set {
             {
                 Set& rSet = m_Set;
 
             {
                 Set& rSet = m_Set;
 

-                size_t const nInsThreadCount = s_nInsThreadCount;

                 Set_Iter_Del3& fixture = pool().template fixture<Set_Iter_Del3>();
 
                 do {
                 Set_Iter_Del3& fixture = pool().template fixture<Set_Iter_Del3>();
 
                 do {

-                    auto itEnd = rSet.get_end<Iterator>();
-                    for ( auto it = rSet.get_begin<Iterator>(); it != itEnd; ++it ) {
+                    auto itEnd = rSet.template get_end<Iterator>();
+                    for ( auto it = rSet.template get_begin<Iterator>(); it != itEnd; ++it ) {

                         if ( it->key.nKey & 3 ) {
                             if ( rSet.erase_at( it ))
                                 ++m_nDeleteSuccess;
                         if ( it->key.nKey & 3 ) {
                             if ( rSet.erase_at( it ))
                                 ++m_nDeleteSuccess;


@@ -839,7 +835,7 @@ namespace set {
 
             Set  testSet( *this );
             do_test_with<Iterator>( testSet );
 
             Set  testSet( *this );
             do_test_with<Iterator>( testSet );

-            analyze( testSet );
+            DEBUG(analyze( testSet ));

         }
 
         template <class Set, typename Iterator=typename Set::iterator>
         }
 
         template <class Set, typename Iterator=typename Set::iterator>


@@ -849,14 +845,11 @@ namespace set {
 
             Set  testSet( *this );
             do_test_extract_with<Iterator>( testSet );
 
             Set  testSet( *this );
             do_test_extract_with<Iterator>( testSet );

-            analyze( testSet );
+            DEBUG(analyze( testSet ));

         }
 
         template <class Set>
         void run_feldman();
         }
 
         template <class Set>
         void run_feldman();

-
-        template <class Set>
-        void run_feldman_reverse();

     };
 
     class Set_Iter_Del3_reverse: public Set_Iter_Del3
     };
 
     class Set_Iter_Del3_reverse: public Set_Iter_Del3