Improved management of SkipList auxiliary nodes: now aux nodes are allocated from...

[libcds.git] / test / unit / set / split_michael_dhp.cpp

diff --git a/test/unit/set/split_michael_dhp.cpp b/test/unit/set/split_michael_dhp.cpp
index 4f88b2e3dd0730d0ebc3a7cc45c8b98fe7ae1498..41a950e7e53d84f757675aa1c7e2d3635444bc20 100644 (file)
--- a/test/unit/set/split_michael_dhp.cpp
+++ b/test/unit/set/split_michael_dhp.cpp
@@ -5,7 +5,7 @@
 
     Source code repo: http://github.com/khizmax/libcds/
     Download: http://sourceforge.net/projects/libcds/files/
-    
+
     Redistribution and use in source and binary forms, with or without
     modification, are permitted provided that the following conditions are met:
 
@@ -25,13 +25,14 @@
     SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
     CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
     OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.     
+    OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include "test_set_hp.h"
 
 #include <cds/container/michael_list_dhp.h>
 #include <cds/container/split_list_set.h>
+#include <cds/intrusive/free_list.h>
 
 namespace {
     namespace cc = cds::container;
@@ -79,7 +80,7 @@ namespace {
             >::type
         > set_type;
 
-        set_type s;
+        set_type s( kSize, 2 );
         test( s );
     }
 
@@ -116,7 +117,7 @@ namespace {
             >::type
         > set_type;
 
-        set_type s;
+        set_type s( kSize, 3 );
         test( s );
     }
 
@@ -137,7 +138,7 @@ namespace {
         };
         typedef cc::SplitListSet< gc_type, int_item, set_traits > set_type;
 
-        set_type s;
+        set_type s( kSize, 4 );
         test( s );
     }
 
@@ -158,7 +159,7 @@ namespace {
         };
         typedef cc::SplitListSet< gc_type, int_item, set_traits > set_type;
 
-        set_type s;
+        set_type s( kSize, 2 );
         test( s );
     }
 
@@ -180,7 +181,73 @@ namespace {
         };
         typedef cc::SplitListSet< gc_type, int_item, set_traits > set_type;
 
-        set_type s;
+        set_type s( kSize, 2 );
+        test( s );
+    }
+
+    TEST_F( SplitListMichaelSet_DHP, free_list )
+    {
+        struct set_traits: public cc::split_list::traits
+        {
+            typedef cc::michael_list_tag ordered_list;
+            typedef hash_int hash;
+            typedef cds::intrusive::FreeList free_list;
+
+            struct ordered_list_traits: public cc::michael_list::traits
+            {
+                typedef cmp compare;
+                typedef cds::backoff::pause back_off;
+            };
+        };
+        typedef cc::SplitListSet< gc_type, int_item, set_traits > set_type;
+
+        set_type s( kSize, 2 );
+        test( s );
+    }
+
+    struct set_static_traits: public cc::split_list::traits
+    {
+        static bool const dynamic_bucket_table = false;
+    };
+
+    TEST_F( SplitListMichaelSet_DHP, static_bucket_table )
+    {
+        struct set_traits: public set_static_traits
+        {
+            typedef cc::michael_list_tag ordered_list;
+            typedef hash_int hash;
+            typedef cds::atomicity::item_counter item_counter;
+
+            struct ordered_list_traits: public cc::michael_list::traits
+            {
+                typedef cmp compare;
+                typedef cds::backoff::pause back_off;
+            };
+        };
+        typedef cc::SplitListSet< gc_type, int_item, set_traits > set_type;
+
+        set_type s( kSize, 4 );
+        test( s );
+    }
+
+    TEST_F( SplitListMichaelSet_DHP, static_bucket_table_free_list )
+    {
+        struct set_traits: public set_static_traits
+        {
+            typedef cc::michael_list_tag ordered_list;
+            typedef hash_int hash;
+            typedef cds::atomicity::item_counter item_counter;
+            typedef cds::intrusive::FreeList free_list;
+
+            struct ordered_list_traits: public cc::michael_list::traits
+            {
+                typedef cmp compare;
+                typedef cds::backoff::pause back_off;
+            };
+        };
+        typedef cc::SplitListSet< gc_type, int_item, set_traits > set_type;
+
+        set_type s( kSize, 4 );
         test( s );
     }