Normalized split-list map types in unit-map tests

[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 0e949503796bd7d2ad0bedd3c91c17e1b9ced7be..f4d8e00884392162fdbc7c30dd3207142277c6ed 100644 (file)
--- a/tests/unit/map2/map_defs.h
+++ b/tests/unit/map2/map_defs.h
@@ -98,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
@@ -139,88 +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_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_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_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_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  \