Adds parameter for both RCU and HP based map test cases

diff --git a/test/stress/sequential/sequential-map/insdelfind/map_insdelfind.cpp b/test/stress/sequential/sequential-map/insdelfind/map_insdelfind.cpp
index 63fe8762258a064df5b5d90d3de1cd127e5374a9..50ff406fbf414788a6f0201b0f1fbc8325a7a298 100644 (file)
--- a/test/stress/sequential/sequential-map/insdelfind/map_insdelfind.cpp
+++ b/test/stress/sequential/sequential-map/insdelfind/map_insdelfind.cpp
@@ -36,12 +36,19 @@ namespace map {
     size_t Map_InsDelFind::s_nThreadCount = 8;
 
     size_t Map_InsDelFind::s_nPassCount = 100;
-    size_t Map_InsDelFind::s_nFeldmanPassCount = 100;
     size_t Map_InsDelFind::s_nBronsonAVLTreeMapPassCount = 100;
-    size_t Map_InsDelFind::s_nEllenBinTreeMapPassCount = 100;
-    size_t Map_InsDelFind::s_nMichaelMapPassCount = 100;
-    size_t Map_InsDelFind::s_nSkipListMapPassCount = 100;
-    size_t Map_InsDelFind::s_nSplitListMapPassCount = 100;
+
+    size_t Map_InsDelFind::s_nHpFeldmanPassCount = 100;
+    size_t Map_InsDelFind::s_nHpEllenBinTreeMapPassCount = 100;
+    size_t Map_InsDelFind::s_nHpMichaelMapPassCount = 100;
+    size_t Map_InsDelFind::s_nHpSkipListMapPassCount = 100;
+    size_t Map_InsDelFind::s_nHpSplitListMapPassCount = 100;
+
+    size_t Map_InsDelFind::s_nRcuFeldmanPassCount = 100;
+    size_t Map_InsDelFind::s_nRcuEllenBinTreeMapPassCount = 100;
+    size_t Map_InsDelFind::s_nRcuMichaelMapPassCount = 100;
+    size_t Map_InsDelFind::s_nRcuSkipListMapPassCount = 100;
+    size_t Map_InsDelFind::s_nRcuSplitListMapPassCount = 100;
 
     size_t Map_InsDelFind::s_nMaxLoadFactor = 8;
     unsigned int Map_InsDelFind::s_nInsertPercentage = 5;
@@ -76,35 +83,60 @@ namespace map {
         if (s_nPassCount == 0)
           s_nPassCount = 500;
 
-        s_nFeldmanPassCount =
-            cfg.get_size_t("FeldmanPassCount", s_nFeldmanPassCount);
-        if (s_nFeldmanPassCount == 0)
-          s_nFeldmanPassCount = 500;
-
         s_nBronsonAVLTreeMapPassCount = cfg.get_size_t(
             "BronsonAVLTreeMapPassCount", s_nBronsonAVLTreeMapPassCount);
         if (s_nBronsonAVLTreeMapPassCount == 0)
           s_nBronsonAVLTreeMapPassCount = 500;
 
-        s_nEllenBinTreeMapPassCount = cfg.get_size_t(
-            "EllenBinTreeMapPassCount", s_nEllenBinTreeMapPassCount);
-        if (s_nEllenBinTreeMapPassCount == 0)
-          s_nEllenBinTreeMapPassCount = 500;
-
-        s_nMichaelMapPassCount =
-            cfg.get_size_t("MichaelMapPassCount", s_nMichaelMapPassCount);
-        if (s_nMichaelMapPassCount == 0)
-          s_nMichaelMapPassCount = 500;
-
-        s_nSkipListMapPassCount =
-            cfg.get_size_t("SkipListMapPassCount", s_nSkipListMapPassCount);
-        if (s_nSkipListMapPassCount == 0)
-          s_nSkipListMapPassCount = 500;
-
-        s_nSplitListMapPassCount =
-            cfg.get_size_t("SplitListMapPassCount", s_nSplitListMapPassCount);
-        if (s_nSplitListMapPassCount == 0)
-          s_nSplitListMapPassCount = 500;
+        s_nHpFeldmanPassCount =
+            cfg.get_size_t("HpFeldmanPassCount", s_nHpFeldmanPassCount);
+        if (s_nHpFeldmanPassCount == 0)
+          s_nHpFeldmanPassCount = 500;
+
+        s_nRcuFeldmanPassCount =
+            cfg.get_size_t("RcuFeldmanPassCount", s_nRcuFeldmanPassCount);
+        if (s_nRcuFeldmanPassCount == 0)
+          s_nRcuFeldmanPassCount = 500;
+
+        s_nHpEllenBinTreeMapPassCount = cfg.get_size_t(
+            "HpEllenBinTreeMapPassCount", s_nHpEllenBinTreeMapPassCount);
+        if (s_nHpEllenBinTreeMapPassCount == 0)
+          s_nHpEllenBinTreeMapPassCount = 500;
+
+        s_nRcuEllenBinTreeMapPassCount = cfg.get_size_t(
+            "RcuEllenBinTreeMapPassCount", s_nRcuEllenBinTreeMapPassCount);
+        if (s_nRcuEllenBinTreeMapPassCount == 0)
+          s_nRcuEllenBinTreeMapPassCount = 500;
+
+        s_nHpMichaelMapPassCount =
+            cfg.get_size_t("HpMichaelMapPassCount", s_nHpMichaelMapPassCount);
+        if (s_nHpMichaelMapPassCount == 0)
+          s_nHpMichaelMapPassCount = 500;
+
+        s_nRcuMichaelMapPassCount =
+            cfg.get_size_t("RcuMichaelMapPassCount", s_nRcuMichaelMapPassCount);
+        if (s_nRcuMichaelMapPassCount == 0)
+          s_nRcuMichaelMapPassCount = 500;
+
+        s_nHpSkipListMapPassCount =
+            cfg.get_size_t("HpSkipListMapPassCount", s_nHpSkipListMapPassCount);
+        if (s_nHpSkipListMapPassCount == 0)
+          s_nHpSkipListMapPassCount = 500;
+
+        s_nRcuSkipListMapPassCount =
+            cfg.get_size_t("RcuSkipListMapPassCount", s_nRcuSkipListMapPassCount);
+        if (s_nRcuSkipListMapPassCount == 0)
+          s_nRcuSkipListMapPassCount = 500;
+
+        s_nHpSplitListMapPassCount =
+            cfg.get_size_t("HpSplitListMapPassCount", s_nHpSplitListMapPassCount);
+        if (s_nHpSplitListMapPassCount == 0)
+          s_nHpSplitListMapPassCount = 500;
+
+        s_nRcuSplitListMapPassCount =
+            cfg.get_size_t("RcuSplitListMapPassCount", s_nRcuSplitListMapPassCount);
+        if (s_nRcuSplitListMapPassCount == 0)
+          s_nRcuSplitListMapPassCount = 500;
 
         s_nMaxLoadFactor = cfg.get_size_t( "MaxLoadFactor", s_nMaxLoadFactor );
         if ( s_nMaxLoadFactor == 0 )

diff --git a/test/stress/sequential/sequential-map/insdelfind/map_insdelfind.h b/test/stress/sequential/sequential-map/insdelfind/map_insdelfind.h
index 3eeaa53249d1c2a20051b52cb1ca18a4c68591dd..165a1d1480a21efed0a55bac4af7d35a25cbe217 100644 (file)
--- a/test/stress/sequential/sequential-map/insdelfind/map_insdelfind.h
+++ b/test/stress/sequential/sequential-map/insdelfind/map_insdelfind.h
@@ -40,11 +40,19 @@ namespace map {
 
         static size_t s_nPassCount;
         static size_t s_nBronsonAVLTreeMapPassCount;
-        static size_t s_nEllenBinTreeMapPassCount;
-        static size_t s_nFeldmanPassCount;
-        static size_t s_nMichaelMapPassCount;
-        static size_t s_nSkipListMapPassCount;
-        static size_t s_nSplitListMapPassCount;
+
+        static size_t s_nHpEllenBinTreeMapPassCount;
+        static size_t s_nHpFeldmanPassCount;
+        static size_t s_nHpMichaelMapPassCount;
+        static size_t s_nHpSkipListMapPassCount;
+        static size_t s_nHpSplitListMapPassCount;
+
+        static size_t s_nRcuEllenBinTreeMapPassCount;
+        static size_t s_nRcuFeldmanPassCount;
+        static size_t s_nRcuMichaelMapPassCount;
+        static size_t s_nRcuSkipListMapPassCount;
+        static size_t s_nRcuSplitListMapPassCount;
+
 
         static size_t s_nThreadCount;       // thread count
         static size_t s_nMaxLoadFactor;     // maximum load factor
@@ -211,23 +219,44 @@ namespace map {
         }
 
         template <class Map>
-        void run_ellen_bin_tree() {
+        void run_ellen_bin_tree_hp() {
+          Map_InsDelFind::s_nPassCount =
+              Map_InsDelFind::s_nHpEllenBinTreeMapPassCount;
+          run_test<Map>();
+        }
+
+        template <class Map>
+        void run_skip_list_hp() {
+          Map_InsDelFind::s_nPassCount =
+              Map_InsDelFind::s_nHpSkipListMapPassCount;
+          run_test<Map>();
+        }
+
+        template <class Map>
+        void run_feldman_hp() {
+          Map_InsDelFind::s_nPassCount =
+              Map_InsDelFind::s_nHpFeldmanPassCount;
+          run_test<Map>();
+        }
+
+        template <class Map>
+        void run_ellen_bin_tree_rcu() {
           Map_InsDelFind::s_nPassCount =
-              Map_InsDelFind::s_nEllenBinTreeMapPassCount;
+              Map_InsDelFind::s_nRcuEllenBinTreeMapPassCount;
           run_test<Map>();
         }
 
         template <class Map>
-        void run_skip_list() {
+        void run_skip_list_rcu() {
           Map_InsDelFind::s_nPassCount =
-              Map_InsDelFind::s_nSkipListMapPassCount;
+              Map_InsDelFind::s_nRcuSkipListMapPassCount;
           run_test<Map>();
         }
 
         template <class Map>
-        void run_feldman() {
+        void run_feldman_rcu() {
           Map_InsDelFind::s_nPassCount =
-              Map_InsDelFind::s_nFeldmanPassCount;
+              Map_InsDelFind::s_nRcuFeldmanPassCount;
           run_test<Map>();
         }
     };
@@ -245,16 +274,30 @@ namespace map {
         }
 
                                template <class Map>
-        void run_michael() {
+        void run_michael_hp() {
+          Map_InsDelFind::s_nPassCount =
+              Map_InsDelFind::s_nHpMichaelMapPassCount;
+          Map_InsDelFind_LF::run_test<Map>();
+        }
+
+        template <class Map>
+        void run_split_list_hp() {
+          Map_InsDelFind::s_nPassCount =
+              Map_InsDelFind::s_nHpSplitListMapPassCount;
+          Map_InsDelFind_LF::run_test<Map>();
+        }
+
+        template <class Map>
+        void run_michael_rcu() {
           Map_InsDelFind::s_nPassCount =
-              Map_InsDelFind::s_nMichaelMapPassCount;
+              Map_InsDelFind::s_nRcuMichaelMapPassCount;
           Map_InsDelFind_LF::run_test<Map>();
         }
 
         template <class Map>
-        void run_split_list() {
+        void run_split_list_rcu() {
           Map_InsDelFind::s_nPassCount =
-              Map_InsDelFind::s_nSplitListMapPassCount;
+              Map_InsDelFind::s_nRcuSplitListMapPassCount;
           Map_InsDelFind_LF::run_test<Map>();
         }
 

diff --git a/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_ellentree_hp.cpp b/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_ellentree_hp.cpp
index 7372eee5d5eb740030f18ada237c9b314bf9a159..88ba4d676126be10b55e26f1736352cb0c9814b9 100644 (file)
--- a/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_ellentree_hp.cpp
+++ b/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_ellentree_hp.cpp
@@ -33,6 +33,6 @@
 
 namespace map {
 
-    CDSSTRESS_EllenBinTreeMap_HP( Map_InsDelFind, run_ellen_bin_tree, size_t, size_t )
+    CDSSTRESS_EllenBinTreeMap_HP( Map_InsDelFind, run_ellen_bin_tree_hp, size_t, size_t )
 
 } // namespace map

diff --git a/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_ellentree_rcu.cpp b/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_ellentree_rcu.cpp
index b5db47fec8ec8918cd02471e483e6c1f798adff2..43306b5b09839328ce7003493bd8d9895b2e19f6 100644 (file)
--- a/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_ellentree_rcu.cpp
+++ b/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_ellentree_rcu.cpp
@@ -33,6 +33,6 @@
 
 namespace map {
 
-    CDSSTRESS_EllenBinTreeMap_RCU( Map_InsDelFind, run_ellen_bin_tree, size_t, size_t )
+    CDSSTRESS_EllenBinTreeMap_RCU( Map_InsDelFind, run_ellen_bin_tree_rcu, size_t, size_t )
 
 } // namespace map

diff --git a/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_feldman_hashset_hp.cpp b/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_feldman_hashset_hp.cpp
index dce3ebbefc19a621ca754a057188696805f684c8..0787b0cb8202205ba8fa3ba0fd18419602ead9e1 100644 (file)
--- a/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_feldman_hashset_hp.cpp
+++ b/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_feldman_hashset_hp.cpp
@@ -33,6 +33,6 @@
 
 namespace map {
 
-    CDSSTRESS_FeldmanHashMap_fixed_HP( Map_InsDelFind, run_feldman, size_t, size_t )
+    CDSSTRESS_FeldmanHashMap_fixed_HP( Map_InsDelFind, run_feldman_hp, size_t, size_t )
 
 } // namespace map

diff --git a/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_feldman_hashset_rcu.cpp b/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_feldman_hashset_rcu.cpp
index 0122f166e12e321ff9558a03c1e7137bc7513725..2e6ecfe5eef5d412310ca03e34b261443d0e93c8 100644 (file)
--- a/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_feldman_hashset_rcu.cpp
+++ b/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_feldman_hashset_rcu.cpp
@@ -33,6 +33,6 @@
 
 namespace map {
 
-    CDSSTRESS_FeldmanHashMap_fixed_RCU( Map_InsDelFind, run_feldman, size_t, size_t )
+    CDSSTRESS_FeldmanHashMap_fixed_RCU( Map_InsDelFind, run_feldman_rcu, size_t, size_t )
 
 } // namespace map

diff --git a/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_michael_hp.cpp b/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_michael_hp.cpp
index 4083ab6df2974b90759e9bc8dd2d0d2a86340d85..61b8bd2dcfe328106c599895c91a1507b1c57b02 100644 (file)
--- a/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_michael_hp.cpp
+++ b/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_michael_hp.cpp
@@ -33,6 +33,6 @@
 
 namespace map {
 
-    CDSSTRESS_MichaelMap_HP( Map_InsDelFind_LF, run_michael, size_t, size_t )
+    CDSSTRESS_MichaelMap_HP( Map_InsDelFind_LF, run_michael_hp, size_t, size_t )
 
 } // namespace map

diff --git a/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_michael_rcu.cpp b/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_michael_rcu.cpp
index 0874b0ab0aad3dd508e82492ffe86f27b221915d..309c1e042f96d88df5ab31a63e180edc71d78996 100644 (file)
--- a/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_michael_rcu.cpp
+++ b/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_michael_rcu.cpp
@@ -33,6 +33,6 @@
 
 namespace map {
 
-    CDSSTRESS_MichaelMap_RCU( Map_InsDelFind_LF, run_michael, size_t, size_t )
+    CDSSTRESS_MichaelMap_RCU( Map_InsDelFind_LF, run_michael_rcu, size_t, size_t )
 
 } // namespace map

diff --git a/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_skip_hp.cpp b/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_skip_hp.cpp
index a78c73f493c7f239e4f4fed9eaf7b3ed6b6f098b..329a773d923cd3552f665a0d61f5c2235e978b2c 100644 (file)
--- a/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_skip_hp.cpp
+++ b/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_skip_hp.cpp
@@ -33,6 +33,6 @@
 
 namespace map {
 
-    CDSSTRESS_SkipListMap_HP( Map_InsDelFind, run_skip_list, size_t, size_t )
+    CDSSTRESS_SkipListMap_HP( Map_InsDelFind, run_skip_list_hp, size_t, size_t )
 
 } // namespace map

diff --git a/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_skip_rcu.cpp b/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_skip_rcu.cpp
index d73fa79c14fdb630e3968df715d57db8bf3873ab..19d108503865b096cc381c8ffb0fe75b728e8a66 100644 (file)
--- a/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_skip_rcu.cpp
+++ b/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_skip_rcu.cpp
@@ -33,6 +33,6 @@
 
 namespace map {
 
-    CDSSTRESS_SkipListMap_RCU( Map_InsDelFind, run_skip_list, size_t, size_t )
+    CDSSTRESS_SkipListMap_RCU( Map_InsDelFind, run_skip_list_rcu, size_t, size_t )
 
 } // namespace map

diff --git a/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_split_hp.cpp b/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_split_hp.cpp
index 625afca4c631791a79093f4264e5a0f959481000..0c501bc90c5a82edbd7b2b251cdd1fadd3583d95 100644 (file)
--- a/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_split_hp.cpp
+++ b/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_split_hp.cpp
@@ -33,7 +33,7 @@
 
 namespace map {
 
-    CDSSTRESS_SplitListMap_HP( Map_InsDelFind_LF, run_split_list, size_t, size_t )
-    CDSSTRESS_SplitListIterableMap( Map_InsDelFind_LF, run_split_list, size_t, size_t )
+    CDSSTRESS_SplitListMap_HP( Map_InsDelFind_LF, run_split_list_hp, size_t, size_t )
+    CDSSTRESS_SplitListIterableMap( Map_InsDelFind_LF, run_split_list_hp, size_t, size_t )
 
 } // namespace map

diff --git a/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_split_rcu.cpp b/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_split_rcu.cpp
index bfa4da841287f6e24cb3dcee4957b4a8b6e88522..9da9c8a960406ade545114ba75fc084d9b74bd93 100644 (file)
--- a/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_split_rcu.cpp
+++ b/test/stress/sequential/sequential-map/insdelfind/map_insdelfind_split_rcu.cpp
@@ -33,6 +33,6 @@
 
 namespace map {
 
-    CDSSTRESS_SplitListMap_RCU( Map_InsDelFind_LF, run_split_list, size_t, size_t )
+    CDSSTRESS_SplitListMap_RCU( Map_InsDelFind_LF, run_split_list_rcu, size_t, size_t )
 
 } // namespace map