X-Git-Url: http://plrg.eecs.uci.edu/git/?p=libcds.git;a=blobdiff_plain;f=test%2Fstress%2Fsequential%2Fsequential-set%2Fdelodd%2Fset_delodd.cpp;h=0b9eba4e39d8626d4dcc8dd249ca79bca86dd9ca;hp=f454f1270e6aa065014cf62a3e1f99ca3f022572;hb=907e8f3e384f7161e35dc41ddc3a78c2bb86013b;hpb=59cb651402874a22500cab3ec586565b48f76059;ds=inline diff --git a/test/stress/sequential/sequential-set/delodd/set_delodd.cpp b/test/stress/sequential/sequential-set/delodd/set_delodd.cpp index f454f127..0b9eba4e 100644 --- a/test/stress/sequential/sequential-set/delodd/set_delodd.cpp +++ b/test/stress/sequential/sequential-set/delodd/set_delodd.cpp @@ -38,7 +38,12 @@ namespace set { size_t Set_DelOdd::s_nExtractThreadCount = 4; size_t Set_DelOdd::s_nFindThreadCount = 2; size_t Set_DelOdd::s_nMaxLoadFactor = 8; - size_t Set_DelOdd::s_nInsertPassCount = 100; + + size_t Set_DelOdd::s_nPassCount = 100; + size_t Set_DelOdd::s_nFeldmanPassCount = 100; + size_t Set_DelOdd::s_nInsertPassCount = 1; + size_t Set_DelOdd::s_nDeletePassCount = 1; + size_t Set_DelOdd::s_nFindPassCount = 10; size_t Set_DelOdd::s_nCuckooInitialSize = 1024; size_t Set_DelOdd::s_nCuckooProbesetSize = 16; @@ -53,7 +58,7 @@ namespace set { void Set_DelOdd::SetUpTestCase() { - cds_test::config const& cfg = get_config( "map_delodd" ); + cds_test::config const& cfg = get_config( "sequential_map_delodd" ); s_nSetSize = cfg.get_size_t( "MapSize", s_nSetSize ); if ( s_nSetSize < 1000 ) @@ -71,9 +76,27 @@ namespace set { if ( s_nMaxLoadFactor == 0 ) s_nMaxLoadFactor = 1; - s_nInsertPassCount = cfg.get_size_t( "PassCount", s_nInsertPassCount ); + s_nPassCount = cfg.get_size_t("PassCount", s_nPassCount); + if (s_nPassCount == 0) + s_nPassCount = 100; + + s_nFeldmanPassCount = + cfg.get_size_t("FeldmanPassCount", s_nFeldmanPassCount); + if (s_nFeldmanPassCount == 0) + s_nFeldmanPassCount = 500; + + s_nInsertPassCount = cfg.get_size_t( "InsertPassCount", s_nInsertPassCount ); if ( s_nInsertPassCount == 0 ) - s_nInsertPassCount = 100; + s_nInsertPassCount = 1; + + s_nDeletePassCount = cfg.get_size_t( "DeletePassCount", s_nDeletePassCount ); + if ( s_nDeletePassCount == 0 ) + s_nDeletePassCount = 1; + + s_nFindPassCount = cfg.get_size_t( "FindPassCount", s_nFindPassCount ); + if ( s_nFindPassCount == 0 ) + s_nFindPassCount = 10; + s_nCuckooInitialSize = cfg.get_size_t( "CuckooInitialSize", s_nCuckooInitialSize ); if ( s_nCuckooInitialSize < 256 )