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

[libcds.git] / test / unit / map / test_split_michael_rcu.h

diff --git a/test/unit/map/test_split_michael_rcu.h b/test/unit/map/test_split_michael_rcu.h
index 47713fe4b1e32032db3df266006f892b225cf7e3..c2b12533edbc37f713950f1c1d483c017b3d8dfa 100644 (file)
--- a/test/unit/map/test_split_michael_rcu.h
+++ b/test/unit/map/test_split_michael_rcu.h
@@ -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,7 +25,7 @@
     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.
 */
 #ifndef CDSUNIT_MAP_TEST_SPLIT_LIST_MICHAEL_RCU_H
 #define CDSUNIT_MAP_TEST_SPLIT_LIST_MICHAEL_RCU_H
@@ -33,6 +33,7 @@
 #include "test_map_rcu.h"
 #include <cds/container/michael_list_rcu.h>
 #include <cds/container/split_list_map_rcu.h>
+#include <cds/intrusive/free_list.h>
 
 namespace cc = cds::container;
 
@@ -208,6 +209,31 @@ TYPED_TEST_P( SplitListMichaelMap, back_off )
     this->test( m );
 }
 
+TYPED_TEST_P( SplitListMichaelMap, free_list )
+{
+    typedef typename TestFixture::rcu_type   rcu_type;
+    typedef typename TestFixture::key_type   key_type;
+    typedef typename TestFixture::value_type value_type;
+    typedef typename TestFixture::hash1      hash1;
+
+    struct map_traits: public cc::split_list::traits
+    {
+        typedef cc::michael_list_tag ordered_list;
+        typedef hash1 hash;
+        typedef cds::intrusive::FreeList free_list;
+
+        struct ordered_list_traits: public cc::michael_list::traits
+        {
+            typedef typename TestFixture::cmp compare;
+            typedef cds::backoff::pause back_off;
+        };
+    };
+    typedef cc::SplitListMap< rcu_type, key_type, value_type, map_traits > map_type;
+
+    map_type m( TestFixture::kSize, 2 );
+    this->test( m );
+}
+
 namespace {
     struct set_static_traits: public cc::split_list::traits
     {
@@ -240,8 +266,34 @@ TYPED_TEST_P( SplitListMichaelMap, static_bucket_table )
     this->test( m );
 }
 
+TYPED_TEST_P( SplitListMichaelMap, static_bucket_table_free_list )
+{
+    typedef typename TestFixture::rcu_type   rcu_type;
+    typedef typename TestFixture::key_type   key_type;
+    typedef typename TestFixture::value_type value_type;
+    typedef typename TestFixture::hash1      hash1;
+
+    struct map_traits: public set_static_traits
+    {
+        typedef cc::michael_list_tag ordered_list;
+        typedef hash1 hash;
+        typedef cds::atomicity::item_counter item_counter;
+        typedef cds::intrusive::FreeList free_list;
+
+        struct ordered_list_traits: public cc::michael_list::traits
+        {
+            typedef typename TestFixture::cmp compare;
+            typedef cds::backoff::pause back_off;
+        };
+    };
+    typedef cc::SplitListMap< rcu_type, key_type, value_type, map_traits > map_type;
+
+    map_type m( TestFixture::kSize, 4 );
+    this->test( m );
+}
+
 REGISTER_TYPED_TEST_CASE_P( SplitListMichaelMap,
-    compare, less, cmpmix, item_counting, stat, back_off, static_bucket_table
+    compare, less, cmpmix, item_counting, stat, back_off, free_list, static_bucket_table, static_bucket_table_free_list
 );