Removing trailing spaces

[libcds.git] / tests / unit / map2 / map_defs.h

diff --git a/tests/unit/map2/map_defs.h b/tests/unit/map2/map_defs.h
index a69562a2c33b1f1154942e070a846508781e7537..46577d8dc5f10107627aa1f881546fcbc12c42d8 100644 (file)
--- a/tests/unit/map2/map_defs.h
+++ b/tests/unit/map2/map_defs.h
@@ -40,10 +40,8 @@
 #define CDSUNIT_DECLARE_MichaelMap  \
     TEST_MAP_EXTRACT(MichaelMap_HP_cmp_stdAlloc) \
     TEST_MAP_EXTRACT(MichaelMap_HP_less_michaelAlloc) \
-    TEST_MAP_EXTRACT(MichaelMap_HRC_cmp_stdAlloc) \
-    TEST_MAP_EXTRACT(MichaelMap_HRC_less_michaelAlloc) \
-    TEST_MAP_EXTRACT(MichaelMap_PTB_cmp_stdAlloc) \
-    TEST_MAP_EXTRACT(MichaelMap_PTB_less_michaelAlloc) \
+    TEST_MAP_EXTRACT(MichaelMap_DHP_cmp_stdAlloc) \
+    TEST_MAP_EXTRACT(MichaelMap_DHP_less_michaelAlloc) \
     TEST_MAP_EXTRACT(MichaelMap_RCU_GPI_cmp_stdAlloc) \
     TEST_MAP_EXTRACT(MichaelMap_RCU_GPI_less_michaelAlloc) \
     TEST_MAP_EXTRACT(MichaelMap_RCU_GPB_cmp_stdAlloc) \
@@ -52,10 +50,8 @@
     TEST_MAP_EXTRACT(MichaelMap_RCU_GPT_less_michaelAlloc) \
     TEST_MAP_EXTRACT(MichaelMap_Lazy_HP_cmp_stdAlloc) \
     TEST_MAP_EXTRACT(MichaelMap_Lazy_HP_less_michaelAlloc) \
-    TEST_MAP_EXTRACT(MichaelMap_Lazy_HRC_cmp_stdAlloc) \
-    TEST_MAP_EXTRACT(MichaelMap_Lazy_HRC_less_michaelAlloc) \
-    TEST_MAP_EXTRACT(MichaelMap_Lazy_PTB_cmp_stdAlloc) \
-    TEST_MAP_EXTRACT(MichaelMap_Lazy_PTB_less_michaelAlloc) \
+    TEST_MAP_EXTRACT(MichaelMap_Lazy_DHP_cmp_stdAlloc) \
+    TEST_MAP_EXTRACT(MichaelMap_Lazy_DHP_less_michaelAlloc) \
     TEST_MAP_EXTRACT(MichaelMap_Lazy_RCU_GPI_cmp_stdAlloc) \
     TEST_MAP_EXTRACT(MichaelMap_Lazy_RCU_GPI_less_michaelAlloc) \
     TEST_MAP_EXTRACT(MichaelMap_Lazy_RCU_GPB_cmp_stdAlloc) \
@@ -67,10 +63,8 @@
 #define CDSUNIT_TEST_MichaelMap  \
     CPPUNIT_TEST(MichaelMap_HP_cmp_stdAlloc) \
     CPPUNIT_TEST(MichaelMap_HP_less_michaelAlloc) \
-    /*CPPUNIT_TEST(MichaelMap_HRC_cmp_stdAlloc)*/ \
-    /*CPPUNIT_TEST(MichaelMap_HRC_less_michaelAlloc)*/ \
-    CPPUNIT_TEST(MichaelMap_PTB_cmp_stdAlloc) \
-    CPPUNIT_TEST(MichaelMap_PTB_less_michaelAlloc) \
+    CPPUNIT_TEST(MichaelMap_DHP_cmp_stdAlloc) \
+    CPPUNIT_TEST(MichaelMap_DHP_less_michaelAlloc) \
     CPPUNIT_TEST(MichaelMap_RCU_GPI_cmp_stdAlloc) \
     CPPUNIT_TEST(MichaelMap_RCU_GPI_less_michaelAlloc) \
     CPPUNIT_TEST(MichaelMap_RCU_GPB_cmp_stdAlloc) \
@@ -79,10 +73,8 @@
     CPPUNIT_TEST(MichaelMap_RCU_GPT_less_michaelAlloc) \
     CPPUNIT_TEST(MichaelMap_Lazy_HP_cmp_stdAlloc) \
     CPPUNIT_TEST(MichaelMap_Lazy_HP_less_michaelAlloc) \
-    /*CPPUNIT_TEST(MichaelMap_Lazy_HRC_cmp_stdAlloc)*/ \
-    /*CPPUNIT_TEST(MichaelMap_Lazy_HRC_less_michaelAlloc)*/ \
-    CPPUNIT_TEST(MichaelMap_Lazy_PTB_cmp_stdAlloc) \
-    CPPUNIT_TEST(MichaelMap_Lazy_PTB_less_michaelAlloc) \
+    CPPUNIT_TEST(MichaelMap_Lazy_DHP_cmp_stdAlloc) \
+    CPPUNIT_TEST(MichaelMap_Lazy_DHP_less_michaelAlloc) \
     CPPUNIT_TEST(MichaelMap_Lazy_RCU_GPI_cmp_stdAlloc) \
     CPPUNIT_TEST(MichaelMap_Lazy_RCU_GPI_less_michaelAlloc) \
     CPPUNIT_TEST(MichaelMap_Lazy_RCU_GPB_cmp_stdAlloc) \
@@ -106,39 +98,55 @@
 #ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED
 #   define CDSUNIT_DECLARE_SplitList_RCU_signal  \
     TEST_MAP_EXTRACT(SplitList_Michael_RCU_SHB_dyn_cmp)\
+    TEST_MAP_EXTRACT(SplitList_Michael_RCU_SHB_dyn_cmp_stat)\
     TEST_MAP_EXTRACT(SplitList_Michael_RCU_SHB_st_cmp)\
     TEST_MAP_EXTRACT(SplitList_Michael_RCU_SHB_dyn_less)\
     TEST_MAP_EXTRACT(SplitList_Michael_RCU_SHB_st_less)\
+    TEST_MAP_EXTRACT(SplitList_Michael_RCU_SHB_st_less_stat)\
     TEST_MAP_EXTRACT(SplitList_Michael_RCU_SHT_dyn_cmp)\
+    TEST_MAP_EXTRACT(SplitList_Michael_RCU_SHT_dyn_cmp_stat)\
     TEST_MAP_EXTRACT(SplitList_Michael_RCU_SHT_st_cmp)\
     TEST_MAP_EXTRACT(SplitList_Michael_RCU_SHT_dyn_less)\
     TEST_MAP_EXTRACT(SplitList_Michael_RCU_SHT_st_less)\
+    TEST_MAP_EXTRACT(SplitList_Michael_RCU_SHT_st_less_stat)\
     TEST_MAP_EXTRACT(SplitList_Lazy_RCU_SHB_dyn_cmp)\
+    TEST_MAP_EXTRACT(SplitList_Lazy_RCU_SHB_dyn_cmp_stat)\
     TEST_MAP_EXTRACT(SplitList_Lazy_RCU_SHB_st_cmp)\
     TEST_MAP_EXTRACT(SplitList_Lazy_RCU_SHB_dyn_less)\
     TEST_MAP_EXTRACT(SplitList_Lazy_RCU_SHB_st_less)\
+    TEST_MAP_EXTRACT(SplitList_Lazy_RCU_SHB_st_less_stat)\
     TEST_MAP_EXTRACT(SplitList_Lazy_RCU_SHT_dyn_cmp)\
+    TEST_MAP_EXTRACT(SplitList_Lazy_RCU_SHT_dyn_cmp_stat)\
     TEST_MAP_EXTRACT(SplitList_Lazy_RCU_SHT_st_cmp)\
     TEST_MAP_EXTRACT(SplitList_Lazy_RCU_SHT_dyn_less)\
-    TEST_MAP_EXTRACT(SplitList_Lazy_RCU_SHT_st_less)
+    TEST_MAP_EXTRACT(SplitList_Lazy_RCU_SHT_st_less)\
+TEST_MAP_EXTRACT(SplitList_Lazy_RCU_SHT_st_less_stat)
 
 #   define CDSUNIT_TEST_SplitList_RCU_signal \
     CPPUNIT_TEST(SplitList_Michael_RCU_SHB_dyn_cmp)\
+    CPPUNIT_TEST(SplitList_Michael_RCU_SHB_dyn_cmp_stat)\
     CPPUNIT_TEST(SplitList_Michael_RCU_SHB_st_cmp)\
     CPPUNIT_TEST(SplitList_Michael_RCU_SHB_dyn_less)\
     CPPUNIT_TEST(SplitList_Michael_RCU_SHB_st_less)\
+    CPPUNIT_TEST(SplitList_Michael_RCU_SHB_st_less_stat)\
     CPPUNIT_TEST(SplitList_Michael_RCU_SHT_dyn_cmp)\
+    CPPUNIT_TEST(SplitList_Michael_RCU_SHT_dyn_cmp_stat)\
     CPPUNIT_TEST(SplitList_Michael_RCU_SHT_st_cmp)\
     CPPUNIT_TEST(SplitList_Michael_RCU_SHT_dyn_less)\
     CPPUNIT_TEST(SplitList_Michael_RCU_SHT_st_less)\
+    CPPUNIT_TEST(SplitList_Michael_RCU_SHT_st_less_stat)\
     CPPUNIT_TEST(SplitList_Lazy_RCU_SHB_dyn_cmp)\
+    CPPUNIT_TEST(SplitList_Lazy_RCU_SHB_dyn_cmp_stat)\
     CPPUNIT_TEST(SplitList_Lazy_RCU_SHB_st_cmp)\
     CPPUNIT_TEST(SplitList_Lazy_RCU_SHB_dyn_less)\
     CPPUNIT_TEST(SplitList_Lazy_RCU_SHB_st_less)\
+    CPPUNIT_TEST(SplitList_Lazy_RCU_SHB_st_less_stat)\
     CPPUNIT_TEST(SplitList_Lazy_RCU_SHT_dyn_cmp)\
+    CPPUNIT_TEST(SplitList_Lazy_RCU_SHT_dyn_cmp_stat)\
     CPPUNIT_TEST(SplitList_Lazy_RCU_SHT_st_cmp)\
     CPPUNIT_TEST(SplitList_Lazy_RCU_SHT_dyn_less)\
-    CPPUNIT_TEST(SplitList_Lazy_RCU_SHT_st_less)
+    CPPUNIT_TEST(SplitList_Lazy_RCU_SHT_st_less)\
+    CPPUNIT_TEST(SplitList_Lazy_RCU_SHT_st_less_stat)
 
 #else
 #   define CDSUNIT_DECLARE_SplitList_RCU_signal
@@ -147,104 +155,128 @@
 
 #define CDSUNIT_DECLARE_SplitList  \
     TEST_MAP_EXTRACT(SplitList_Michael_HP_dyn_cmp)\
+    TEST_MAP_EXTRACT(SplitList_Michael_HP_dyn_cmp_stat)\
     TEST_MAP_EXTRACT(SplitList_Michael_HP_st_cmp)\
     TEST_MAP_EXTRACT(SplitList_Michael_HP_dyn_less)\
     TEST_MAP_EXTRACT(SplitList_Michael_HP_st_less)\
-    TEST_MAP_EXTRACT(SplitList_Michael_HRC_dyn_cmp)\
-    TEST_MAP_EXTRACT(SplitList_Michael_HRC_st_cmp)\
-    TEST_MAP_EXTRACT(SplitList_Michael_HRC_dyn_less)\
-    TEST_MAP_EXTRACT(SplitList_Michael_HRC_st_less)\
-    TEST_MAP_EXTRACT(SplitList_Michael_PTB_dyn_cmp)\
-    TEST_MAP_EXTRACT(SplitList_Michael_PTB_st_cmp)\
-    TEST_MAP_EXTRACT(SplitList_Michael_PTB_dyn_less)\
-    TEST_MAP_EXTRACT(SplitList_Michael_PTB_st_less)\
+    TEST_MAP_EXTRACT(SplitList_Michael_HP_st_less_stat)\
+    TEST_MAP_EXTRACT(SplitList_Michael_DHP_dyn_cmp)\
+    TEST_MAP_EXTRACT(SplitList_Michael_DHP_dyn_cmp_stat)\
+    TEST_MAP_EXTRACT(SplitList_Michael_DHP_st_cmp)\
+    TEST_MAP_EXTRACT(SplitList_Michael_DHP_dyn_less)\
+    TEST_MAP_EXTRACT(SplitList_Michael_DHP_st_less)\
+    TEST_MAP_EXTRACT(SplitList_Michael_DHP_st_less_stat)\
     TEST_MAP_EXTRACT(SplitList_Michael_RCU_GPI_dyn_cmp)\
+    TEST_MAP_EXTRACT(SplitList_Michael_RCU_GPI_dyn_cmp_stat)\
     TEST_MAP_EXTRACT(SplitList_Michael_RCU_GPI_st_cmp)\
     TEST_MAP_EXTRACT(SplitList_Michael_RCU_GPI_dyn_less)\
     TEST_MAP_EXTRACT(SplitList_Michael_RCU_GPI_st_less)\
+    TEST_MAP_EXTRACT(SplitList_Michael_RCU_GPI_st_less_stat)\
     TEST_MAP_EXTRACT(SplitList_Michael_RCU_GPB_dyn_cmp)\
+    TEST_MAP_EXTRACT(SplitList_Michael_RCU_GPB_dyn_cmp_stat)\
     TEST_MAP_EXTRACT(SplitList_Michael_RCU_GPB_st_cmp)\
     TEST_MAP_EXTRACT(SplitList_Michael_RCU_GPB_dyn_less)\
     TEST_MAP_EXTRACT(SplitList_Michael_RCU_GPB_st_less)\
+    TEST_MAP_EXTRACT(SplitList_Michael_RCU_GPB_st_less_stat)\
     TEST_MAP_EXTRACT(SplitList_Michael_RCU_GPT_dyn_cmp)\
+    TEST_MAP_EXTRACT(SplitList_Michael_RCU_GPT_dyn_cmp_stat)\
     TEST_MAP_EXTRACT(SplitList_Michael_RCU_GPT_st_cmp)\
     TEST_MAP_EXTRACT(SplitList_Michael_RCU_GPT_dyn_less)\
     TEST_MAP_EXTRACT(SplitList_Michael_RCU_GPT_st_less)\
+    TEST_MAP_EXTRACT(SplitList_Michael_RCU_GPT_st_less_stat)\
     TEST_MAP_EXTRACT(SplitList_Lazy_HP_dyn_cmp)\
+    TEST_MAP_EXTRACT(SplitList_Lazy_HP_dyn_cmp_stat)\
     TEST_MAP_EXTRACT(SplitList_Lazy_HP_st_cmp)\
     TEST_MAP_EXTRACT(SplitList_Lazy_HP_dyn_less)\
     TEST_MAP_EXTRACT(SplitList_Lazy_HP_st_less)\
-    TEST_MAP_EXTRACT(SplitList_Lazy_HRC_dyn_cmp)\
-    TEST_MAP_EXTRACT(SplitList_Lazy_HRC_st_cmp)\
-    TEST_MAP_EXTRACT(SplitList_Lazy_HRC_dyn_less)\
-    TEST_MAP_EXTRACT(SplitList_Lazy_HRC_st_less)\
-    TEST_MAP_EXTRACT(SplitList_Lazy_PTB_dyn_cmp)\
-    TEST_MAP_EXTRACT(SplitList_Lazy_PTB_st_cmp)\
-    TEST_MAP_EXTRACT(SplitList_Lazy_PTB_dyn_less)\
-    TEST_MAP_EXTRACT(SplitList_Lazy_PTB_st_less)\
+    TEST_MAP_EXTRACT(SplitList_Lazy_HP_st_less_stat)\
+    TEST_MAP_EXTRACT(SplitList_Lazy_DHP_dyn_cmp)\
+    TEST_MAP_EXTRACT(SplitList_Lazy_DHP_dyn_cmp_stat)\
+    TEST_MAP_EXTRACT(SplitList_Lazy_DHP_st_cmp)\
+    TEST_MAP_EXTRACT(SplitList_Lazy_DHP_dyn_less)\
+    TEST_MAP_EXTRACT(SplitList_Lazy_DHP_st_less)\
+    TEST_MAP_EXTRACT(SplitList_Lazy_DHP_st_less_stat)\
     TEST_MAP_EXTRACT(SplitList_Lazy_RCU_GPI_dyn_cmp)\
+    TEST_MAP_EXTRACT(SplitList_Lazy_RCU_GPI_dyn_cmp_stat)\
     TEST_MAP_EXTRACT(SplitList_Lazy_RCU_GPI_st_cmp)\
     TEST_MAP_EXTRACT(SplitList_Lazy_RCU_GPI_dyn_less)\
     TEST_MAP_EXTRACT(SplitList_Lazy_RCU_GPI_st_less)\
+    TEST_MAP_EXTRACT(SplitList_Lazy_RCU_GPI_st_less_stat)\
     TEST_MAP_EXTRACT(SplitList_Lazy_RCU_GPB_dyn_cmp)\
+    TEST_MAP_EXTRACT(SplitList_Lazy_RCU_GPB_dyn_cmp_stat)\
     TEST_MAP_EXTRACT(SplitList_Lazy_RCU_GPB_st_cmp)\
     TEST_MAP_EXTRACT(SplitList_Lazy_RCU_GPB_dyn_less)\
     TEST_MAP_EXTRACT(SplitList_Lazy_RCU_GPB_st_less)\
+    TEST_MAP_EXTRACT(SplitList_Lazy_RCU_GPB_st_less_stat)\
     TEST_MAP_EXTRACT(SplitList_Lazy_RCU_GPT_dyn_cmp)\
+    TEST_MAP_EXTRACT(SplitList_Lazy_RCU_GPT_dyn_cmp_stat)\
     TEST_MAP_EXTRACT(SplitList_Lazy_RCU_GPT_st_cmp)\
     TEST_MAP_EXTRACT(SplitList_Lazy_RCU_GPT_dyn_less)\
     TEST_MAP_EXTRACT(SplitList_Lazy_RCU_GPT_st_less)\
+    TEST_MAP_EXTRACT(SplitList_Lazy_RCU_GPT_st_less_stat)\
     CDSUNIT_DECLARE_SplitList_RCU_signal
 
 #define CDSUNIT_TEST_SplitList  \
     CPPUNIT_TEST(SplitList_Michael_HP_dyn_cmp)\
+    CPPUNIT_TEST(SplitList_Michael_HP_dyn_cmp_stat)\
     CPPUNIT_TEST(SplitList_Michael_HP_st_cmp)\
     CPPUNIT_TEST(SplitList_Michael_HP_dyn_less)\
     CPPUNIT_TEST(SplitList_Michael_HP_st_less)\
-    /*CPPUNIT_TEST(SplitList_Michael_HRC_dyn_cmp)*/\
-    /*CPPUNIT_TEST(SplitList_Michael_HRC_st_cmp)*/\
-    /*CPPUNIT_TEST(SplitList_Michael_HRC_dyn_less)*/\
-    /*CPPUNIT_TEST(SplitList_Michael_HRC_st_less)*/\
-    CPPUNIT_TEST(SplitList_Michael_PTB_dyn_cmp)\
-    CPPUNIT_TEST(SplitList_Michael_PTB_st_cmp)\
-    CPPUNIT_TEST(SplitList_Michael_PTB_dyn_less)\
-    CPPUNIT_TEST(SplitList_Michael_PTB_st_less)\
+    CPPUNIT_TEST(SplitList_Michael_HP_st_less_stat)\
+    CPPUNIT_TEST(SplitList_Michael_DHP_dyn_cmp)\
+    CPPUNIT_TEST(SplitList_Michael_DHP_dyn_cmp_stat)\
+    CPPUNIT_TEST(SplitList_Michael_DHP_st_cmp)\
+    CPPUNIT_TEST(SplitList_Michael_DHP_dyn_less)\
+    CPPUNIT_TEST(SplitList_Michael_DHP_st_less)\
+    CPPUNIT_TEST(SplitList_Michael_DHP_st_less_stat)\
     CPPUNIT_TEST(SplitList_Michael_RCU_GPI_dyn_cmp)\
+    CPPUNIT_TEST(SplitList_Michael_RCU_GPI_dyn_cmp_stat)\
     CPPUNIT_TEST(SplitList_Michael_RCU_GPI_st_cmp)\
     CPPUNIT_TEST(SplitList_Michael_RCU_GPI_dyn_less)\
     CPPUNIT_TEST(SplitList_Michael_RCU_GPI_st_less)\
+    CPPUNIT_TEST(SplitList_Michael_RCU_GPI_st_less_stat)\
     CPPUNIT_TEST(SplitList_Michael_RCU_GPB_dyn_cmp)\
+    CPPUNIT_TEST(SplitList_Michael_RCU_GPB_dyn_cmp_stat)\
     CPPUNIT_TEST(SplitList_Michael_RCU_GPB_st_cmp)\
     CPPUNIT_TEST(SplitList_Michael_RCU_GPB_dyn_less)\
     CPPUNIT_TEST(SplitList_Michael_RCU_GPB_st_less)\
+    CPPUNIT_TEST(SplitList_Michael_RCU_GPB_st_less_stat)\
     CPPUNIT_TEST(SplitList_Michael_RCU_GPT_dyn_cmp)\
+    CPPUNIT_TEST(SplitList_Michael_RCU_GPT_dyn_cmp_stat)\
     CPPUNIT_TEST(SplitList_Michael_RCU_GPT_st_cmp)\
     CPPUNIT_TEST(SplitList_Michael_RCU_GPT_dyn_less)\
     CPPUNIT_TEST(SplitList_Michael_RCU_GPT_st_less)\
+    CPPUNIT_TEST(SplitList_Michael_RCU_GPT_st_less_stat)\
     CPPUNIT_TEST(SplitList_Lazy_HP_dyn_cmp)\
+    CPPUNIT_TEST(SplitList_Lazy_HP_dyn_cmp_stat)\
     CPPUNIT_TEST(SplitList_Lazy_HP_st_cmp)\
     CPPUNIT_TEST(SplitList_Lazy_HP_dyn_less)\
     CPPUNIT_TEST(SplitList_Lazy_HP_st_less)\
-    /*CPPUNIT_TEST(SplitList_Lazy_HRC_dyn_cmp)*/\
-    /*CPPUNIT_TEST(SplitList_Lazy_HRC_st_cmp)*/\
-    /*CPPUNIT_TEST(SplitList_Lazy_HRC_dyn_less)*/\
-    /*CPPUNIT_TEST(SplitList_Lazy_HRC_st_less)*/\
-    CPPUNIT_TEST(SplitList_Lazy_PTB_dyn_cmp)\
-    CPPUNIT_TEST(SplitList_Lazy_PTB_st_cmp)\
-    CPPUNIT_TEST(SplitList_Lazy_PTB_dyn_less)\
-    CPPUNIT_TEST(SplitList_Lazy_PTB_st_less)\
+    CPPUNIT_TEST(SplitList_Lazy_HP_st_less_stat)\
+    CPPUNIT_TEST(SplitList_Lazy_DHP_dyn_cmp)\
+    CPPUNIT_TEST(SplitList_Lazy_DHP_dyn_cmp_stat)\
+    CPPUNIT_TEST(SplitList_Lazy_DHP_st_cmp)\
+    CPPUNIT_TEST(SplitList_Lazy_DHP_dyn_less)\
+    CPPUNIT_TEST(SplitList_Lazy_DHP_st_less)\
+    CPPUNIT_TEST(SplitList_Lazy_DHP_st_less_stat)\
     CPPUNIT_TEST(SplitList_Lazy_RCU_GPI_dyn_cmp)\
+    CPPUNIT_TEST(SplitList_Lazy_RCU_GPI_dyn_cmp_stat)\
     CPPUNIT_TEST(SplitList_Lazy_RCU_GPI_st_cmp)\
     CPPUNIT_TEST(SplitList_Lazy_RCU_GPI_dyn_less)\
     CPPUNIT_TEST(SplitList_Lazy_RCU_GPI_st_less)\
+    CPPUNIT_TEST(SplitList_Lazy_RCU_GPI_st_less_stat)\
     CPPUNIT_TEST(SplitList_Lazy_RCU_GPB_dyn_cmp)\
+    CPPUNIT_TEST(SplitList_Lazy_RCU_GPB_dyn_cmp_stat)\
     CPPUNIT_TEST(SplitList_Lazy_RCU_GPB_st_cmp)\
     CPPUNIT_TEST(SplitList_Lazy_RCU_GPB_dyn_less)\
     CPPUNIT_TEST(SplitList_Lazy_RCU_GPB_st_less)\
+    CPPUNIT_TEST(SplitList_Lazy_RCU_GPB_st_less_stat)\
     CPPUNIT_TEST(SplitList_Lazy_RCU_GPT_dyn_cmp)\
+    CPPUNIT_TEST(SplitList_Lazy_RCU_GPT_dyn_cmp_stat)\
     CPPUNIT_TEST(SplitList_Lazy_RCU_GPT_st_cmp)\
     CPPUNIT_TEST(SplitList_Lazy_RCU_GPT_dyn_less)\
     CPPUNIT_TEST(SplitList_Lazy_RCU_GPT_st_less)\
+    CPPUNIT_TEST(SplitList_Lazy_RCU_GPT_st_less_stat)\
     CDSUNIT_TEST_SplitList_RCU_signal
 
 #define CDSUNIT_DECLARE_SplitList_nogc  \
@@ -298,14 +330,10 @@
     TEST_MAP_NOLF_EXTRACT(SkipListMap_hp_cmp_pascal_stat)\
     TEST_MAP_NOLF_EXTRACT(SkipListMap_hp_less_xorshift)\
     TEST_MAP_NOLF_EXTRACT(SkipListMap_hp_cmp_xorshift_stat)\
-    TEST_MAP_NOLF_EXTRACT(SkipListMap_hrc_less_pascal)\
-    TEST_MAP_NOLF_EXTRACT(SkipListMap_hrc_cmp_pascal_stat)\
-    TEST_MAP_NOLF_EXTRACT(SkipListMap_hrc_less_xorshift)\
-    TEST_MAP_NOLF_EXTRACT(SkipListMap_hrc_cmp_xorshift_stat)\
-    TEST_MAP_NOLF_EXTRACT(SkipListMap_ptb_less_pascal)\
-    TEST_MAP_NOLF_EXTRACT(SkipListMap_ptb_cmp_pascal_stat)\
-    TEST_MAP_NOLF_EXTRACT(SkipListMap_ptb_less_xorshift)\
-    TEST_MAP_NOLF_EXTRACT(SkipListMap_ptb_cmp_xorshift_stat)\
+    TEST_MAP_NOLF_EXTRACT(SkipListMap_dhp_less_pascal)\
+    TEST_MAP_NOLF_EXTRACT(SkipListMap_dhp_cmp_pascal_stat)\
+    TEST_MAP_NOLF_EXTRACT(SkipListMap_dhp_less_xorshift)\
+    TEST_MAP_NOLF_EXTRACT(SkipListMap_dhp_cmp_xorshift_stat)\
     TEST_MAP_NOLF_EXTRACT(SkipListMap_rcu_gpi_less_pascal)\
     TEST_MAP_NOLF_EXTRACT(SkipListMap_rcu_gpi_cmp_pascal_stat)\
     TEST_MAP_NOLF_EXTRACT(SkipListMap_rcu_gpi_less_xorshift)\
@@ -326,14 +354,10 @@
     CPPUNIT_TEST(SkipListMap_hp_cmp_pascal_stat)\
     CPPUNIT_TEST(SkipListMap_hp_less_xorshift)\
     CPPUNIT_TEST(SkipListMap_hp_cmp_xorshift_stat)\
-    /*CPPUNIT_TEST(SkipListMap_hrc_less_pascal)*/\
-    /*CPPUNIT_TEST(SkipListMap_hrc_cmp_pascal_stat)*/\
-    /*CPPUNIT_TEST(SkipListMap_hrc_less_xorshift)*/\
-    /*CPPUNIT_TEST(SkipListMap_hrc_cmp_xorshift_stat)*/\
-    CPPUNIT_TEST(SkipListMap_ptb_less_pascal)\
-    CPPUNIT_TEST(SkipListMap_ptb_cmp_pascal_stat)\
-    CPPUNIT_TEST(SkipListMap_ptb_less_xorshift)\
-    CPPUNIT_TEST(SkipListMap_ptb_cmp_xorshift_stat)\
+    CPPUNIT_TEST(SkipListMap_dhp_less_pascal)\
+    CPPUNIT_TEST(SkipListMap_dhp_cmp_pascal_stat)\
+    CPPUNIT_TEST(SkipListMap_dhp_less_xorshift)\
+    CPPUNIT_TEST(SkipListMap_dhp_cmp_xorshift_stat)\
     CPPUNIT_TEST(SkipListMap_rcu_gpi_less_pascal)\
     CPPUNIT_TEST(SkipListMap_rcu_gpi_cmp_pascal_stat)\
     CPPUNIT_TEST(SkipListMap_rcu_gpi_less_xorshift)\
@@ -379,12 +403,15 @@
 
 #define CDSUNIT_DECLARE_EllenBinTreeMap \
     TEST_MAP_NOLF_EXTRACT(EllenBinTreeMap_hp)\
+    TEST_MAP_NOLF_EXTRACT(EllenBinTreeMap_hp_yield)\
     TEST_MAP_NOLF_EXTRACT(EllenBinTreeMap_hp_stat)\
-    TEST_MAP_NOLF_EXTRACT(EllenBinTreeMap_ptb)\
-    TEST_MAP_NOLF_EXTRACT(EllenBinTreeMap_ptb_stat)\
+    TEST_MAP_NOLF_EXTRACT(EllenBinTreeMap_dhp)\
+    TEST_MAP_NOLF_EXTRACT(EllenBinTreeMap_dhp_yield)\
+    TEST_MAP_NOLF_EXTRACT(EllenBinTreeMap_dhp_stat)\
     TEST_MAP_NOLF_EXTRACT(EllenBinTreeMap_rcu_gpi)\
     TEST_MAP_NOLF_EXTRACT(EllenBinTreeMap_rcu_gpi_stat)\
     TEST_MAP_NOLF_EXTRACT(EllenBinTreeMap_rcu_gpb)\
+    TEST_MAP_NOLF_EXTRACT(EllenBinTreeMap_rcu_gpb_yield)\
     TEST_MAP_NOLF_EXTRACT(EllenBinTreeMap_rcu_gpb_stat)\
     TEST_MAP_NOLF_EXTRACT(EllenBinTreeMap_rcu_gpt)\
     TEST_MAP_NOLF_EXTRACT(EllenBinTreeMap_rcu_gpt_stat)\
@@ -392,12 +419,15 @@
 
 #define CDSUNIT_TEST_EllenBinTreeMap \
     CPPUNIT_TEST(EllenBinTreeMap_hp)\
+    CPPUNIT_TEST(EllenBinTreeMap_hp_yield)\
     CPPUNIT_TEST(EllenBinTreeMap_hp_stat)\
-    CPPUNIT_TEST(EllenBinTreeMap_ptb)\
-    CPPUNIT_TEST(EllenBinTreeMap_ptb_stat)\
+    CPPUNIT_TEST(EllenBinTreeMap_dhp)\
+    CPPUNIT_TEST(EllenBinTreeMap_dhp_yield)\
+    CPPUNIT_TEST(EllenBinTreeMap_dhp_stat)\
     CPPUNIT_TEST(EllenBinTreeMap_rcu_gpi)\
     CPPUNIT_TEST(EllenBinTreeMap_rcu_gpi_stat)\
     CPPUNIT_TEST(EllenBinTreeMap_rcu_gpb)\
+    CPPUNIT_TEST(EllenBinTreeMap_rcu_gpb_yield)\
     CPPUNIT_TEST(EllenBinTreeMap_rcu_gpb_stat)\
     CPPUNIT_TEST(EllenBinTreeMap_rcu_gpt)\
     CPPUNIT_TEST(EllenBinTreeMap_rcu_gpt_stat)\