Added copyright and license

[libcds.git] / tests / test-hdr / set / hdr_splitlist_set_rcu_gpb.cpp

diff --git a/tests/test-hdr/set/hdr_splitlist_set_rcu_gpb.cpp b/tests/test-hdr/set/hdr_splitlist_set_rcu_gpb.cpp
index b3c646e10b7d2d55e69597ed53122ac4fe3bc242..9ff0d0707402a70d93ffd03565ce3292e851c6cc 100644 (file)
--- a/tests/test-hdr/set/hdr_splitlist_set_rcu_gpb.cpp
+++ b/tests/test-hdr/set/hdr_splitlist_set_rcu_gpb.cpp
@@ -1,4 +1,32 @@
-//$$CDS-header$$
+/*
+    This file is a part of libcds - Concurrent Data Structures library
+
+    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016
+
+    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:
+
+    * Redistributions of source code must retain the above copyright notice, this
+      list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+    AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+    IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+    DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+    FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+    DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+    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.     
+*/
 
 #include "set/hdr_set.h"
 #include <cds/urcu/general_buffered.h>
@@ -10,7 +38,7 @@ namespace set {
     namespace {
         typedef cds::urcu::gc< cds::urcu::general_buffered<> > rcu_type;
 
-        struct RCU_GPB_cmp_traits: public cc::split_list::type_traits
+        struct RCU_GPB_cmp_traits: public cc::split_list::traits
         {
             typedef cc::michael_list_tag                ordered_list;
             typedef HashSetHdrTest::hash_int            hash;
@@ -18,13 +46,13 @@ namespace set {
             typedef cc::opt::v::relaxed_ordering        memory_model;
             enum { dynamic_bucket_table = false };
 
-            struct ordered_list_traits: public cc::michael_list::type_traits
+            struct ordered_list_traits: public cc::michael_list::traits
             {
                 typedef HashSetHdrTest::cmp<HashSetHdrTest::item>   compare;
             };
         };
 
-        struct RCU_GPB_less_traits: public cc::split_list::type_traits
+        struct RCU_GPB_less_traits: public cc::split_list::traits
         {
             typedef cc::michael_list_tag                ordered_list;
             typedef HashSetHdrTest::hash_int            hash;
@@ -32,24 +60,30 @@ namespace set {
             typedef cc::opt::v::sequential_consistent   memory_model;
             enum { dynamic_bucket_table = false };
 
-            struct ordered_list_traits: public cc::michael_list::type_traits
+            struct ordered_list_traits: public cc::michael_list::traits
             {
                 typedef HashSetHdrTest::less<HashSetHdrTest::item>   less;
             };
         };
 
-        struct RCU_GPB_cmpmix_traits: public cc::split_list::type_traits
+        struct RCU_cmpmix_traits: public cc::split_list::traits
         {
             typedef cc::michael_list_tag                ordered_list;
             typedef HashSetHdrTest::hash_int            hash;
             typedef HashSetHdrTest::simple_item_counter item_counter;
 
-            struct ordered_list_traits: public cc::michael_list::type_traits
+            struct ordered_list_traits: public cc::michael_list::traits
             {
                 typedef HashSetHdrTest::cmp<HashSetHdrTest::item>   compare;
                 typedef HashSetHdrTest::less<HashSetHdrTest::item>   less;
             };
         };
+
+        struct RCU_cmpmix_stat_traits : public RCU_cmpmix_traits
+        {
+            typedef cc::split_list::stat<> stat;
+        };
+
     }
 
     void HashSetHdrTest::Split_RCU_GPB_cmp()
@@ -57,7 +91,7 @@ namespace set {
         // traits-based version
         typedef cc::SplitListSet< rcu_type, item, RCU_GPB_cmp_traits > set;
 
-        test_int_rcu< set >();
+        test_int_rcu_michael_list< set >();
 
         // option-based version
         typedef cc::SplitListSet< rcu_type, item,
@@ -74,7 +108,7 @@ namespace set {
                 >
             >::type
         > opt_set;
-        test_int_rcu< opt_set >();
+        test_int_rcu_michael_list< opt_set >();
     }
 
     void HashSetHdrTest::Split_RCU_GPB_less()
@@ -82,7 +116,7 @@ namespace set {
         // traits-based version
         typedef cc::SplitListSet< rcu_type, item, RCU_GPB_less_traits > set;
 
-        test_int_rcu< set >();
+        test_int_rcu_michael_list< set >();
 
         // option-based version
         typedef cc::SplitListSet< rcu_type, item,
@@ -99,14 +133,14 @@ namespace set {
                 >
             >::type
         > opt_set;
-        test_int_rcu< opt_set >();
+        test_int_rcu_michael_list< opt_set >();
     }
 
     void HashSetHdrTest::Split_RCU_GPB_cmpmix()
     {
         // traits-based version
-        typedef cc::SplitListSet< rcu_type, item, RCU_GPB_cmpmix_traits > set;
-        test_int_rcu< set >();
+        typedef cc::SplitListSet< rcu_type, item, RCU_cmpmix_traits > set;
+        test_int_rcu_michael_list< set >();
 
         // option-based version
         typedef cc::SplitListSet< rcu_type, item,
@@ -122,9 +156,32 @@ namespace set {
                 >
             >::type
         > opt_set;
-        test_int_rcu< opt_set >();
+        test_int_rcu_michael_list< opt_set >();
     }
 
+    void HashSetHdrTest::Split_RCU_GPB_cmpmix_stat()
+    {
+        // traits-based version
+        typedef cc::SplitListSet< rcu_type, item, RCU_cmpmix_stat_traits > set;
+        test_int_rcu_michael_list< set >();
+
+        // option-based version
+        typedef cc::SplitListSet< rcu_type, item,
+            cc::split_list::make_traits<
+                cc::split_list::ordered_list<cc::michael_list_tag>
+                ,cc::opt::hash< hash_int >
+                ,cc::opt::item_counter< simple_item_counter >
+                ,cc::split_list::ordered_list_traits<
+                    cc::michael_list::make_traits<
+                        cc::opt::less< less<item> >
+                        ,cc::opt::compare< cmp<item> >
+                    >::type
+                >
+                , cc::opt::stat< cc::split_list::stat<>>
+            >::type
+        > opt_set;
+        test_int_rcu_michael_list< opt_set >();
+    }
 
 } // namespace set