X-Git-Url: http://plrg.eecs.uci.edu/git/?p=libcds.git;a=blobdiff_plain;f=tests%2Ftest-hdr%2Fmap%2Fhdr_multilevel_hashmap_rcu_gpb.cpp;h=15d12185521fd89fd8b2251b79d6c410b98c2b9b;hp=51c90957bcf487cbb4a4b20ce4a498e650096ac9;hb=114f82020f14578a6e1a5b3956e21c5db6afa340;hpb=d771a88adaf209268effe18e7f3df3c91fc445a8

diff --git a/tests/test-hdr/map/hdr_multilevel_hashmap_rcu_gpb.cpp b/tests/test-hdr/map/hdr_multilevel_hashmap_rcu_gpb.cpp
index 51c90957..15d12185 100644
--- a/tests/test-hdr/map/hdr_multilevel_hashmap_rcu_gpb.cpp
+++ b/tests/test-hdr/map/hdr_multilevel_hashmap_rcu_gpb.cpp
@@ -10,13 +10,23 @@ namespace map {
         typedef cds::urcu::gc< cds::urcu::general_buffered<>> rcu_type;
     } // namespace
 
-    void MultiLevelHashMapHdrTest::rcu_gpb_stdhash()
+    void MultiLevelHashMapHdrTest::rcu_gpb_nohash()
     {
         typedef cc::MultiLevelHashMap< rcu_type, size_t, Item > map_type;
 
         test_rcu<map_type>(4, 2);
     }
 
+    void MultiLevelHashMapHdrTest::rcu_gpb_stdhash()
+    {
+        struct traits : public cc::multilevel_hashmap::traits {
+            typedef std::hash<size_t> hash;
+        };
+        typedef cc::MultiLevelHashMap< rcu_type, size_t, Item, traits > map_type;
+
+        test_rcu<map_type>(4, 2);
+    }
+
     void MultiLevelHashMapHdrTest::rcu_gpb_hash128()
     {
         struct traits : public cc::multilevel_hashmap::traits {
@@ -35,9 +45,26 @@ namespace map {
         test_rcu<map_type2>(4, 2);
     }
 
+    void MultiLevelHashMapHdrTest::rcu_gpb_nohash_stat()
+    {
+        struct traits : public cc::multilevel_hashmap::traits {
+            typedef cc::multilevel_hashmap::stat<> stat;
+        };
+        typedef cc::MultiLevelHashMap< rcu_type, size_t, Item, traits > map_type;
+        test_rcu<map_type>(4, 2);
+
+        typedef cc::MultiLevelHashMap< rcu_type, size_t, Item,
+            typename cc::multilevel_hashmap::make_traits<
+            co::stat< cc::multilevel_hashmap::stat<>>
+            >::type
+        > map_type2;
+        test_rcu<map_type2>(4, 2);
+    }
+
     void MultiLevelHashMapHdrTest::rcu_gpb_stdhash_stat()
     {
         struct traits : public cc::multilevel_hashmap::traits {
+            typedef std::hash<size_t> hash;
             typedef cc::multilevel_hashmap::stat<> stat;
         };
         typedef cc::MultiLevelHashMap< rcu_type, size_t, Item, traits > map_type;
@@ -46,6 +73,7 @@ namespace map {
         typedef cc::MultiLevelHashMap< rcu_type, size_t, Item,
             typename cc::multilevel_hashmap::make_traits<
                 co::stat< cc::multilevel_hashmap::stat<>>
+                ,co::hash<std::hash<size_t>>
             >::type
         > map_type2;
         test_rcu<map_type2>(4, 2);
@@ -71,18 +99,47 @@ namespace map {
         test_rcu<map_type2>(4, 2);
     }
 
-    void MultiLevelHashMapHdrTest::rcu_gpb_stdhash_5_3()
+    void MultiLevelHashMapHdrTest::rcu_gpb_nohash_5_3()
     {
         typedef cc::MultiLevelHashMap< rcu_type, size_t, Item > map_type;
 
         test_rcu<map_type>(5, 3);
     }
 
+    void MultiLevelHashMapHdrTest::rcu_gpb_stdhash_5_3()
+    {
+        struct traits : public cc::multilevel_hashmap::traits {
+            typedef std::hash<size_t> hash;
+        };
+        typedef cc::MultiLevelHashMap< rcu_type, size_t, Item, traits > map_type;
+
+        test_rcu<map_type>(5, 3);
+    }
+
+    void MultiLevelHashMapHdrTest::rcu_gpb_nohash_5_3_stat()
+    {
+        struct traits : public cc::multilevel_hashmap::traits {
+            typedef cc::multilevel_hashmap::stat<> stat;
+            typedef cds::backoff::empty back_off;
+        };
+        typedef cc::MultiLevelHashMap< rcu_type, size_t, Item, traits > map_type;
+        test_rcu<map_type>(5, 3);
+
+        typedef cc::MultiLevelHashMap< rcu_type, size_t, Item,
+            typename cc::multilevel_hashmap::make_traits<
+            co::stat< cc::multilevel_hashmap::stat<>>
+            , co::back_off< cds::backoff::empty >
+            >::type
+        > map_type2;
+        test_rcu<map_type2>(5, 3);
+    }
+
     void MultiLevelHashMapHdrTest::rcu_gpb_stdhash_5_3_stat()
     {
         struct traits : public cc::multilevel_hashmap::traits {
             typedef cc::multilevel_hashmap::stat<> stat;
             typedef cds::backoff::empty back_off;
+            typedef std::hash<size_t> hash;
         };
         typedef cc::MultiLevelHashMap< rcu_type, size_t, Item, traits > map_type;
         test_rcu<map_type>(5, 3);
@@ -91,6 +148,7 @@ namespace map {
             typename cc::multilevel_hashmap::make_traits<
                 co::stat< cc::multilevel_hashmap::stat<>>
                 ,co::back_off< cds::backoff::empty >
+                ,co::hash< std::hash<size_t>>
             >::type
         > map_type2;
         test_rcu<map_type2>(5, 3);