Fixed minor compiler warnings

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

diff --git a/test/unit/set/michael_michael_dhp.cpp b/test/unit/set/michael_michael_dhp.cpp
index fa38663504926785bb01fd694d0cf51f0ace4c00..327082a2de64e980feba79da844db16622138cf4 100644 (file)
--- a/test/unit/set/michael_michael_dhp.cpp
+++ b/test/unit/set/michael_michael_dhp.cpp
@@ -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.
 */
 
 #include "test_set_hp.h"
@@ -47,15 +47,14 @@ namespace {
             typedef cc::MichaelList< gc_type, int_item > list_type;
             typedef cc::MichaelHashSet< gc_type, list_type >   set_type;
 
-            // +1 - for guarded_ptr
-            cds::gc::dhp::GarbageCollector::Construct( 16, set_type::c_nHazardPtrCount );
+            cds::gc::dhp::smr::construct( set_type::c_nHazardPtrCount );
             cds::threading::Manager::attachThread();
         }
 
         void TearDown()
         {
             cds::threading::Manager::detachThread();
-            cds::gc::dhp::GarbageCollector::Destruct();
+            cds::gc::dhp::smr::destruct();
         }
     };
 
@@ -67,7 +66,7 @@ namespace {
             >::type
         > list_type;
 
-        typedef cc::MichaelHashSet< gc_type, list_type, 
+        typedef cc::MichaelHashSet< gc_type, list_type,
             typename cc::michael_set::make_traits<
                 cds::opt::hash< hash_int >
             >::type
@@ -85,7 +84,7 @@ namespace {
             >::type
         > list_type;
 
-        typedef cc::MichaelHashSet< gc_type, list_type, 
+        typedef cc::MichaelHashSet< gc_type, list_type,
             typename cc::michael_set::make_traits<
                 cds::opt::hash< hash_int >
             >::type
@@ -104,7 +103,7 @@ namespace {
         };
         typedef cc::MichaelList< gc_type, int_item, list_traits > list_type;
 
-        typedef cc::MichaelHashSet< gc_type, list_type, 
+        typedef cc::MichaelHashSet< gc_type, list_type,
             typename cc::michael_set::make_traits<
                 cds::opt::hash< hash_int >
             >::type
@@ -174,4 +173,48 @@ namespace {
         test( s );
     }
 
+    TEST_F( MichaelSet_DHP, stat )
+    {
+        struct list_traits: public cc::michael_list::traits
+        {
+            typedef base_class::less less;
+            typedef cds::backoff::pause back_off;
+            typedef cc::michael_list::stat<> stat;
+        };
+        typedef cc::MichaelList< gc_type, int_item, list_traits > list_type;
+
+        struct set_traits: public cc::michael_set::traits
+        {
+            typedef hash_int hash;
+            typedef cds::atomicity::item_counter item_counter;
+        };
+        typedef cc::MichaelHashSet< gc_type, list_type, set_traits >set_type;
+
+        set_type s( kSize, 4 );
+        test( s );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
+    }
+
+    TEST_F( MichaelSet_DHP, wrapped_stat )
+    {
+        struct list_traits: public cc::michael_list::traits
+        {
+            typedef base_class::less less;
+            typedef cds::backoff::pause back_off;
+            typedef cc::michael_list::wrapped_stat<> stat;
+        };
+        typedef cc::MichaelList< gc_type, int_item, list_traits > list_type;
+
+        struct set_traits: public cc::michael_set::traits
+        {
+            typedef hash_int hash;
+            typedef cds::atomicity::item_counter item_counter;
+        };
+        typedef cc::MichaelHashSet< gc_type, list_type, set_traits >set_type;
+
+        set_type s( kSize, 4 );
+        test( s );
+        EXPECT_GE( s.statistics().m_nInsertSuccess, 0u );
+    }
+
 } // namespace