Merge branch 'flat_combinig_add_stress_and_unint_tests' of https://github.com/mgalimu...

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

diff --git a/test/unit/set/test_split_michael_rcu.h b/test/unit/set/test_split_michael_rcu.h
index b84bb0a386f09ce7593351b78092403a3a30d1fa..812220fbcfa53cb5ce7c0c8bcdbd5f4f838abc0e 100644 (file)
--- a/test/unit/set/test_split_michael_rcu.h
+++ b/test/unit/set/test_split_michael_rcu.h
@@ -1,11 +1,11 @@
 /*
     This file is a part of libcds - Concurrent Data Structures library
 
-    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016
+    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2017
 
     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_SET_TEST_SPLIT_LIST_MICHAEL_RCU_H
 #define CDSUNIT_SET_TEST_SPLIT_LIST_MICHAEL_RCU_H
@@ -33,6 +33,7 @@
 #include "test_set_rcu.h"
 #include <cds/container/michael_list_rcu.h>
 #include <cds/container/split_list_set_rcu.h>
+#include <cds/intrusive/free_list.h>
 
 namespace cc = cds::container;
 
@@ -65,11 +66,11 @@ TYPED_TEST_P( SplitListMichaelSet, compare )
     typedef typename TestFixture::int_item int_item;
     typedef typename TestFixture::hash_int hash_int;
 
-    typedef cc::SplitListSet< rcu_type, int_item, 
+    typedef cc::SplitListSet< rcu_type, int_item,
         typename cc::split_list::make_traits<
             cc::split_list::ordered_list< cc::michael_list_tag >
             , cds::opt::hash< hash_int >
-            , cc::split_list::ordered_list_traits< 
+            , cc::split_list::ordered_list_traits<
                 typename cc::michael_list::make_traits<
                     cds::opt::compare< typename TestFixture::cmp >
                 >::type
@@ -91,7 +92,7 @@ TYPED_TEST_P( SplitListMichaelSet, less )
         typename cc::split_list::make_traits<
             cc::split_list::ordered_list< cc::michael_list_tag >
             , cds::opt::hash< hash_int >
-            , cc::split_list::ordered_list_traits< 
+            , cc::split_list::ordered_list_traits<
                 typename cc::michael_list::make_traits<
                     cds::opt::less< typename TestFixture::less >
                 >::type
@@ -113,7 +114,7 @@ TYPED_TEST_P( SplitListMichaelSet, cmpmix )
         typename cc::split_list::make_traits<
             cc::split_list::ordered_list< cc::michael_list_tag >
             , cds::opt::hash< hash_int >
-            , cc::split_list::ordered_list_traits< 
+            , cc::split_list::ordered_list_traits<
                 typename cc::michael_list::make_traits<
                     cds::opt::less< typename TestFixture::less >
                     , cds::opt::compare< typename TestFixture::cmp >
@@ -202,6 +203,31 @@ TYPED_TEST_P( SplitListMichaelSet, back_off )
     this->test( s );
 }
 
+TYPED_TEST_P( SplitListMichaelSet, free_list )
+{
+    typedef typename TestFixture::rcu_type rcu_type;
+    typedef typename TestFixture::int_item int_item;
+    typedef typename TestFixture::hash_int hash_int;
+
+    struct set_traits: public cc::split_list::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 typename TestFixture::cmp compare;
+            typedef cds::backoff::pause back_off;
+        };
+    };
+    typedef cc::SplitListSet< rcu_type, int_item, set_traits > set_type;
+
+    set_type s( TestFixture::kSize, 2 );
+    this->test( s );
+}
+
 namespace {
     struct set_static_traits: public cc::split_list::traits
     {
@@ -233,11 +259,36 @@ TYPED_TEST_P( SplitListMichaelSet, static_bucket_table )
     this->test( s );
 }
 
+TYPED_TEST_P( SplitListMichaelSet, static_bucket_table_free_list )
+{
+    typedef typename TestFixture::rcu_type rcu_type;
+    typedef typename TestFixture::int_item int_item;
+    typedef typename TestFixture::hash_int hash_int;
+
+    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 typename TestFixture::cmp compare;
+            typedef cds::backoff::pause back_off;
+        };
+    };
+    typedef cc::SplitListSet< rcu_type, int_item, set_traits > set_type;
+
+    set_type s( TestFixture::kSize, 4 );
+    this->test( s );
+}
+
 
 // GCC 5: All this->test names should be written on single line, otherwise a runtime error will be encountered like as
 // "No this->test named <test_name> can be found in this this->test case"
 REGISTER_TYPED_TEST_CASE_P( SplitListMichaelSet,
-    compare, less, cmpmix, item_counting, stat, back_off, static_bucket_table
+    compare, less, cmpmix, item_counting, stat, back_off, static_bucket_table, free_list, static_bucket_table_free_list
 );