Uses different pass count for different parallel queue test cases

[libcds.git] / test / stress / map / delodd / map_delodd.h

diff --git a/test/stress/map/delodd/map_delodd.h b/test/stress/map/delodd/map_delodd.h
index 11788366d0901e9cd198e07d3dc55e5d81385c02..ea7a7fe5c7af1824965ae42c1d09aa077f8fbaf2 100644 (file)
--- a/test/stress/map/delodd/map_delodd.h
+++ b/test/stress/map/delodd/map_delodd.h
@@ -29,6 +29,8 @@
 */
 
 #include "map_type.h"
+#include "../../misc/common.h"
+#include <cds/os/topology.h>
 
 namespace map {
 
@@ -139,13 +141,13 @@ namespace map {
         template <typename Pred>
         static void prepare_array( std::vector<size_t>& arr, Pred pred )
         {
-            arr.reserve( m_arrElements.size() );
+            arr.reserve( m_arrElements.size());
             for ( auto el : m_arrElements ) {
-                if ( pred( el ) )
+                if ( pred( el ))
                     arr.push_back( el );
             }
-            arr.resize( arr.size() );
-            shuffle( arr.begin(), arr.end() );
+            arr.resize( arr.size());
+            shuffle( arr.begin(), arr.end());
         }
 
     protected:
@@ -189,7 +191,7 @@ namespace map {
             {
                 prepare_array( m_arr, []( size_t ) -> bool { return true; } );
                 for ( size_t i = 0; i < m_arr.size(); ++i ) {
-                    if ( m_Map.insert( key_type( m_arr[i], id() ) ) )
+                    if ( m_Map.insert( key_type( m_arr[i], id())))
                         ++m_nInsertInitSuccess;
                     else
                         ++m_nInsertInitFailed;
@@ -236,7 +238,7 @@ namespace map {
                         // insert pass
                         for ( auto el : m_arr ) {
                             if ( el & 1 ) {
-                                if ( rMap.insert( key_type( el, id() )))
+                                if ( rMap.insert( key_type( el, id())))
                                     ++m_nInsertSuccess;
                                 else
                                     ++m_nInsertFailed;
@@ -249,7 +251,7 @@ namespace map {
                             if ( el & 1 ) {
                                 bool success;
                                 bool inserted;
-                                std::tie( success, inserted ) = rMap.update( key_type( el, id() ), f );
+                                std::tie( success, inserted ) = rMap.update( key_type( el, id()), f );
                                 if ( success && inserted )
                                     ++m_nInsertSuccess;
                                 else
@@ -355,7 +357,7 @@ namespace map {
                     else {
                         for ( size_t k = 0; k < nInsThreadCount; ++k ) {
                             for ( auto el: m_arr ) {
-                                if ( rMap.erase( key_type( el, k ) ) )
+                                if ( rMap.erase( key_type( el, k )))
                                     ++m_nDeleteSuccess;
                                 else
                                     ++m_nDeleteFailed;
@@ -430,7 +432,7 @@ namespace map {
                     else {
                         for ( size_t k = 0; k < nInsThreadCount; ++k ) {
                             for ( auto el: m_arr ) {
-                                gp = rMap.extract( key_type( el, k ) );
+                                gp = rMap.extract( key_type( el, k ));
                                 if ( gp )
                                     ++m_nDeleteSuccess;
                                 else
@@ -496,14 +498,14 @@ namespace map {
                             for ( auto el: m_arr ) {
                                 if ( Map::c_bExtractLockExternal ) {
                                     typename Map::rcu_lock l;
-                                    xp = rMap.extract( key_type( el, k ) );
+                                    xp = rMap.extract( key_type( el, k ));
                                     if ( xp )
                                         ++m_nDeleteSuccess;
                                     else
                                         ++m_nDeleteFailed;
                                 }
                                 else {
-                                    xp = rMap.extract( key_type( el, k ) );
+                                    xp = rMap.extract( key_type( el, k ));
                                     if ( xp )
                                         ++m_nDeleteSuccess;
                                     else
@@ -518,14 +520,14 @@ namespace map {
                             for ( size_t k = 0; k < nInsThreadCount; ++k ) {
                                 if ( Map::c_bExtractLockExternal ) {
                                     typename Map::rcu_lock l;
-                                    xp = rMap.extract( key_type( el, k ) );
+                                    xp = rMap.extract( key_type( el, k ));
                                     if ( xp )
                                         ++m_nDeleteSuccess;
                                     else
                                         ++m_nDeleteFailed;
                                 }
                                 else {
-                                    xp = rMap.extract( key_type( el, k ) );
+                                    xp = rMap.extract( key_type( el, k ));
                                     if ( xp )
                                         ++m_nDeleteSuccess;
                                     else
@@ -641,7 +643,7 @@ namespace map {
 
             for ( size_t i = 0; i < pool.size(); ++i ) {
                 cds_test::thread& thr = pool.get( i );
-                switch ( thr.type() ) {
+                switch ( thr.type()) {
                 case inserter_thread:
                     {
                         insert_thread& inserter = static_cast<insert_thread&>( thr );
@@ -690,7 +692,7 @@ namespace map {
                 << std::make_pair( "find_odd_success", nFindOddSuccess )
                 << std::make_pair( "find_odd_failed", nFindOddFailed );
 
-            analyze( testMap );
+            DEBUG(analyze( testMap ));
         }
 
         template <class Map>
@@ -799,7 +801,7 @@ namespace map {
                 << std::make_pair( "find_odd_success", nFindOddSuccess )
                 << std::make_pair( "find_odd_failed", nFindOddFailed );
 
-            analyze( testMap );
+            DEBUG(analyze( testMap ));
         }
 
         template <class Map>