Migrated intrusive FeldmanHashSet unit test to gtest framework
authorkhizmax <libcds.dev@gmail.com>
Mon, 14 Mar 2016 21:31:37 +0000 (00:31 +0300)
committerkhizmax <libcds.dev@gmail.com>
Mon, 14 Mar 2016 21:31:37 +0000 (00:31 +0300)
projects/Win/vc14/gtest-set.vcxproj
projects/Win/vc14/gtest-set.vcxproj.filters
test/unit/set/CMakeLists.txt
test/unit/set/intrusive_feldman_hashset_rcu_gpb.cpp [new file with mode: 0644]
test/unit/set/intrusive_feldman_hashset_rcu_gpi.cpp [new file with mode: 0644]
test/unit/set/intrusive_feldman_hashset_rcu_gpt.cpp [new file with mode: 0644]
test/unit/set/intrusive_feldman_hashset_rcu_shb.cpp [new file with mode: 0644]
test/unit/set/intrusive_feldman_hashset_rcu_sht.cpp [new file with mode: 0644]
test/unit/set/test_intrusive_feldman_hashset.h
test/unit/set/test_intrusive_feldman_hashset_hp.h
test/unit/set/test_intrusive_feldman_hashset_rcu.h [new file with mode: 0644]

index 36ac7da7e547b6a3f59e76b03e908994cdedabaa..fb2007f782a3b18c6ddcaace8ddbdf83111f3014 100644 (file)
     <ClCompile Include="..\..\..\test\unit\main.cpp" />\r
     <ClCompile Include="..\..\..\test\unit\set\intrusive_feldman_hashset_dhp.cpp" />\r
     <ClCompile Include="..\..\..\test\unit\set\intrusive_feldman_hashset_hp.cpp" />\r
+    <ClCompile Include="..\..\..\test\unit\set\intrusive_feldman_hashset_rcu_gpb.cpp" />\r
+    <ClCompile Include="..\..\..\test\unit\set\intrusive_feldman_hashset_rcu_gpi.cpp" />\r
+    <ClCompile Include="..\..\..\test\unit\set\intrusive_feldman_hashset_rcu_gpt.cpp" />\r
+    <ClCompile Include="..\..\..\test\unit\set\intrusive_feldman_hashset_rcu_shb.cpp" />\r
+    <ClCompile Include="..\..\..\test\unit\set\intrusive_feldman_hashset_rcu_sht.cpp" />\r
     <ClCompile Include="..\..\..\test\unit\set\intrusive_michael_lazy_dhp.cpp" />\r
     <ClCompile Include="..\..\..\test\unit\set\intrusive_michael_lazy_hp.cpp" />\r
     <ClCompile Include="..\..\..\test\unit\set\intrusive_michael_lazy_nogc.cpp" />\r
   <ItemGroup>\r
     <ClInclude Include="..\..\..\test\unit\set\test_intrusive_feldman_hashset.h" />\r
     <ClInclude Include="..\..\..\test\unit\set\test_intrusive_feldman_hashset_hp.h" />\r
+    <ClInclude Include="..\..\..\test\unit\set\test_intrusive_feldman_hashset_rcu.h" />\r
     <ClInclude Include="..\..\..\test\unit\set\test_intrusive_michael_lazy_rcu.h" />\r
     <ClInclude Include="..\..\..\test\unit\set\test_intrusive_michael_michael_rcu.h" />\r
     <ClInclude Include="..\..\..\test\unit\set\test_intrusive_set.h" />\r
index 776f5fa45988690f56744708197dbb20f2dea80d..2b8ca4db38e4aa78d5ed594d37a35f816901ca56 100644 (file)
     <ClCompile Include="..\..\..\test\unit\set\intrusive_feldman_hashset_dhp.cpp">\r
       <Filter>Source Files\intrusive:FeldmanHashSet</Filter>\r
     </ClCompile>\r
+    <ClCompile Include="..\..\..\test\unit\set\intrusive_feldman_hashset_rcu_gpb.cpp">\r
+      <Filter>Source Files\intrusive:FeldmanHashSet</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\..\test\unit\set\intrusive_feldman_hashset_rcu_gpi.cpp">\r
+      <Filter>Source Files\intrusive:FeldmanHashSet</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\..\test\unit\set\intrusive_feldman_hashset_rcu_gpt.cpp">\r
+      <Filter>Source Files\intrusive:FeldmanHashSet</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\..\test\unit\set\intrusive_feldman_hashset_rcu_shb.cpp">\r
+      <Filter>Source Files\intrusive:FeldmanHashSet</Filter>\r
+    </ClCompile>\r
+    <ClCompile Include="..\..\..\test\unit\set\intrusive_feldman_hashset_rcu_sht.cpp">\r
+      <Filter>Source Files\intrusive:FeldmanHashSet</Filter>\r
+    </ClCompile>\r
   </ItemGroup>\r
   <ItemGroup>\r
     <ClInclude Include="..\..\..\test\unit\set\test_intrusive_set.h">\r
     <ClInclude Include="..\..\..\test\unit\set\test_intrusive_feldman_hashset_hp.h">\r
       <Filter>Header Files</Filter>\r
     </ClInclude>\r
+    <ClInclude Include="..\..\..\test\unit\set\test_intrusive_feldman_hashset_rcu.h">\r
+      <Filter>Header Files</Filter>\r
+    </ClInclude>\r
   </ItemGroup>\r
 </Project>
\ No newline at end of file
index efff233bbd446c29b41994e13f9173c38f70f787..3f13b1287b10ed0ae65b577cb2a23419fc93a9e6 100644 (file)
@@ -6,6 +6,11 @@ set(CDSGTEST_SET_SOURCES
     ../main.cpp
     intrusive_feldman_hashset_hp.cpp
     intrusive_feldman_hashset_dhp.cpp
+    intrusive_feldman_hashset_rcu_gpb.cpp
+    intrusive_feldman_hashset_rcu_gpi.cpp
+    intrusive_feldman_hashset_rcu_gpt.cpp
+    intrusive_feldman_hashset_rcu_shb.cpp
+    intrusive_feldman_hashset_rcu_sht.cpp
     intrusive_michael_lazy_hp.cpp
     intrusive_michael_lazy_dhp.cpp
     intrusive_michael_lazy_nogc.cpp
diff --git a/test/unit/set/intrusive_feldman_hashset_rcu_gpb.cpp b/test/unit/set/intrusive_feldman_hashset_rcu_gpb.cpp
new file mode 100644 (file)
index 0000000..35c432e
--- /dev/null
@@ -0,0 +1,41 @@
+/*
+    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 <cds/urcu/general_buffered.h>
+
+#include "test_intrusive_feldman_hashset_rcu.h"
+
+namespace {
+
+    typedef cds::urcu::general_buffered<> rcu_implementation;
+
+} // namespace
+
+INSTANTIATE_TYPED_TEST_CASE_P( RCU_GPB, IntrusiveFeldmanHashSet, rcu_implementation );
diff --git a/test/unit/set/intrusive_feldman_hashset_rcu_gpi.cpp b/test/unit/set/intrusive_feldman_hashset_rcu_gpi.cpp
new file mode 100644 (file)
index 0000000..e0114f8
--- /dev/null
@@ -0,0 +1,41 @@
+/*
+    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 <cds/urcu/general_instant.h>
+
+#include "test_intrusive_feldman_hashset_rcu.h"
+
+namespace {
+
+    typedef cds::urcu::general_instant<> rcu_implementation;
+
+} // namespace
+
+INSTANTIATE_TYPED_TEST_CASE_P( RCU_GPI, IntrusiveFeldmanHashSet, rcu_implementation );
diff --git a/test/unit/set/intrusive_feldman_hashset_rcu_gpt.cpp b/test/unit/set/intrusive_feldman_hashset_rcu_gpt.cpp
new file mode 100644 (file)
index 0000000..a152be5
--- /dev/null
@@ -0,0 +1,41 @@
+/*
+    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 <cds/urcu/general_threaded.h>
+
+#include "test_intrusive_feldman_hashset_rcu.h"
+
+namespace {
+
+    typedef cds::urcu::general_threaded<> rcu_implementation;
+
+} // namespace
+
+INSTANTIATE_TYPED_TEST_CASE_P( RCU_GPT, IntrusiveFeldmanHashSet, rcu_implementation );
diff --git a/test/unit/set/intrusive_feldman_hashset_rcu_shb.cpp b/test/unit/set/intrusive_feldman_hashset_rcu_shb.cpp
new file mode 100644 (file)
index 0000000..93e357d
--- /dev/null
@@ -0,0 +1,45 @@
+/*
+    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 <cds/urcu/signal_buffered.h>
+
+#ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED
+
+#include "test_intrusive_feldman_hashset_rcu.h"
+
+namespace {
+
+    typedef cds::urcu::signal_buffered<> rcu_implementation;
+
+} // namespace
+
+INSTANTIATE_TYPED_TEST_CASE_P( RCU_SHB, IntrusiveFeldmanHashSet, rcu_implementation );
+
+#endif // CDS_URCU_SIGNAL_HANDLING_ENABLED
diff --git a/test/unit/set/intrusive_feldman_hashset_rcu_sht.cpp b/test/unit/set/intrusive_feldman_hashset_rcu_sht.cpp
new file mode 100644 (file)
index 0000000..ecd281a
--- /dev/null
@@ -0,0 +1,45 @@
+/*
+    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 <cds/urcu/signal_threaded.h>
+
+#ifdef CDS_URCU_SIGNAL_HANDLING_ENABLED
+
+#include "test_intrusive_feldman_hashset_rcu.h"
+
+namespace {
+
+    typedef cds::urcu::signal_threaded<> rcu_implementation;
+
+} // namespace
+
+INSTANTIATE_TYPED_TEST_CASE_P( RCU_SHT, IntrusiveFeldmanHashSet, rcu_implementation );
+
+#endif // CDS_URCU_SIGNAL_HANDLING_ENABLED
index 3960161c0d0ac5fbd387a5f7ff746514a5e691ff..bb3ae721b3b720fc86586af4605c29dee931a5d6 100644 (file)
 
 // forward declaration
 namespace cds { namespace intrusive {}}
+namespace ci = cds::intrusive;
 
 namespace cds_test {
-
-    namespace ci = cds::intrusive;
-    namespace co = cds::opt;
-
     class intrusive_feldman_hashset: public fixture
     {
     public:
@@ -218,6 +215,13 @@ namespace cds_test {
 
             std::for_each( data.begin(), data.end(), []( value_type& v ) { v.clear_stat(); });
 
+            // get_level_statistics
+            {
+                std::vector< typename Set::level_statistics > level_stat;
+                s.get_level_statistics( level_stat );
+                EXPECT_GT( level_stat.size(), 0 );
+            }
+
             // erase
             shuffle( indices.begin(), indices.end() );
             for ( auto idx : indices ) {
@@ -260,48 +264,6 @@ namespace cds_test {
                 EXPECT_EQ( i.nDisposeCount, 1 );
             }
 
-            // erase_at( iterator )
-            for ( auto& i : data ) {
-                i.clear_stat();
-                ASSERT_TRUE( s.insert( i ) );
-            }
-            ASSERT_FALSE( s.empty() );
-            ASSERT_CONTAINER_SIZE( s, nSetSize );
-
-            for ( auto it = s.begin(); it != s.end(); ++it ) {
-                ASSERT_TRUE( s.erase_at( it ));
-                ASSERT_FALSE( s.erase_at( it ));
-            }
-            ASSERT_TRUE( s.empty() );
-            ASSERT_CONTAINER_SIZE( s, 0 );
-
-            // Force retiring cycle
-            Set::gc::force_dispose();
-            for ( auto& i : data ) {
-                EXPECT_EQ( i.nDisposeCount, 1 );
-            }
-
-            // erase_at( reverse_iterator )
-            for ( auto& i : data ) {
-                i.clear_stat();
-                ASSERT_TRUE( s.insert( i ) );
-            }
-            ASSERT_FALSE( s.empty() );
-            ASSERT_CONTAINER_SIZE( s, nSetSize );
-
-            for ( auto it = s.rbegin(); it != s.rend(); ++it ) {
-                ASSERT_TRUE( s.erase_at( it ) );
-                ASSERT_FALSE( s.erase_at( it ) );
-            }
-            ASSERT_TRUE( s.empty() );
-            ASSERT_CONTAINER_SIZE( s, 0 );
-
-            // Force retiring cycle
-            Set::gc::force_dispose();
-            for ( auto& i : data ) {
-                EXPECT_EQ( i.nDisposeCount, 1 );
-            }
-
             // clear
             for ( auto& i : data ) {
                 i.clear_stat();
index 81872c9ec586598ccf4f095069c85d65c3eace05..17dd9ec956e209e905975fb96524b992d5583ec8 100644 (file)
 
 #include "test_intrusive_feldman_hashset.h"
 
-// forward declaration
-namespace cds { namespace intrusive {}}
-
 namespace cds_test {
 
-    namespace ci = cds::intrusive;
-    namespace co = cds::opt;
-
     class intrusive_feldman_hashset_hp: public intrusive_feldman_hashset
     {
         typedef intrusive_feldman_hashset base_class;
@@ -90,13 +84,6 @@ namespace cds_test {
                 ASSERT_TRUE( s.insert( i ) );
             }
 
-            // get_level_statistics
-            {
-                std::vector< ci::feldman_hashset::level_statistics > level_stat;
-                s.get_level_statistics( level_stat );
-                EXPECT_GT( level_stat.size(), 0 );
-            }
-
             // get/extract
             for ( auto idx : indices ) {
                 auto& i = data[idx];
@@ -129,6 +116,47 @@ namespace cds_test {
                 EXPECT_EQ( i.nDisposeCount, 1 );
             }
 
+            // erase_at( iterator )
+            for ( auto& i : data ) {
+                i.clear_stat();
+                ASSERT_TRUE( s.insert( i ) );
+            }
+            ASSERT_FALSE( s.empty() );
+            ASSERT_CONTAINER_SIZE( s, nSetSize );
+
+            for ( auto it = s.begin(); it != s.end(); ++it ) {
+                ASSERT_TRUE( s.erase_at( it ) );
+                ASSERT_FALSE( s.erase_at( it ) );
+            }
+            ASSERT_TRUE( s.empty() );
+            ASSERT_CONTAINER_SIZE( s, 0 );
+
+            // Force retiring cycle
+            Set::gc::force_dispose();
+            for ( auto& i : data ) {
+                EXPECT_EQ( i.nDisposeCount, 1 );
+            }
+
+            // erase_at( reverse_iterator )
+            for ( auto& i : data ) {
+                i.clear_stat();
+                ASSERT_TRUE( s.insert( i ) );
+            }
+            ASSERT_FALSE( s.empty() );
+            ASSERT_CONTAINER_SIZE( s, nSetSize );
+
+            for ( auto it = s.rbegin(); it != s.rend(); ++it ) {
+                ASSERT_TRUE( s.erase_at( it ) );
+                ASSERT_FALSE( s.erase_at( it ) );
+            }
+            ASSERT_TRUE( s.empty() );
+            ASSERT_CONTAINER_SIZE( s, 0 );
+
+            // Force retiring cycle
+            Set::gc::force_dispose();
+            for ( auto& i : data ) {
+                EXPECT_EQ( i.nDisposeCount, 1 );
+            }
         }
     };
 
diff --git a/test/unit/set/test_intrusive_feldman_hashset_rcu.h b/test/unit/set/test_intrusive_feldman_hashset_rcu.h
new file mode 100644 (file)
index 0000000..a8db543
--- /dev/null
@@ -0,0 +1,233 @@
+/*
+    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.     
+*/
+
+#ifndef CDSUNIT_SET_TEST_INTRUSIVE_FELDMAN_HASHSET_RCU_H
+#define CDSUNIT_SET_TEST_INTRUSIVE_FELDMAN_HASHSET_RCU_H
+
+#include "test_intrusive_feldman_hashset.h"
+
+#include <cds/intrusive/feldman_hashset_rcu.h>
+
+namespace ci = cds::intrusive;
+namespace co = cds::opt;
+
+template <class RCU>
+class IntrusiveFeldmanHashSet : public cds_test::intrusive_feldman_hashset
+{
+    typedef cds_test::intrusive_feldman_hashset base_class;
+
+protected:
+    typedef cds::urcu::gc<RCU> rcu_type;
+
+    template <class Set>
+    void test( Set& s )
+    {
+        // Precondition: set is empty
+        // Postcondition: set is empty
+
+        base_class::test( s );
+
+        ASSERT_TRUE( s.empty() );
+        ASSERT_CONTAINER_SIZE( s, 0 );
+
+        typedef typename Set::value_type value_type;
+        size_t const nSetSize = std::max( s.head_size() * 2, static_cast<size_t>(100) );
+
+        std::vector< value_type > data;
+        std::vector< size_t> indices;
+        data.reserve( nSetSize );
+        indices.reserve( nSetSize );
+        for ( size_t key = 0; key < nSetSize; ++key ) {
+            data.push_back( value_type( static_cast<int>(key) ) );
+            indices.push_back( key );
+        }
+        shuffle( indices.begin(), indices.end() );
+
+        typename Set::exempt_ptr xp;
+        value_type * rp;
+        typedef typename Set::rcu_lock rcu_lock;
+
+        // get/extract from empty set
+        for ( auto idx : indices ) {
+            auto& i = data[idx];
+
+            {
+                rcu_lock l;
+                rp = s.get( i.key() );
+                ASSERT_TRUE( !rp );
+            }
+
+            xp = s.extract( i.key() );
+            ASSERT_TRUE( !xp );
+        }
+
+        // fill set
+        for ( auto& i : data ) {
+            i.nDisposeCount = 0;
+            ASSERT_TRUE( s.insert( i ) );
+        }
+
+        // get/extract
+        for ( auto idx : indices ) {
+            auto& i = data[idx];
+
+            {
+                rcu_lock l;
+                EXPECT_EQ( i.nFindCount, 0 );
+                rp = s.get( i.key() );
+                ASSERT_FALSE( !rp );
+                ++rp->nFindCount;
+                EXPECT_EQ( i.nFindCount, 1 );
+            }
+
+            EXPECT_EQ( i.nEraseCount, 0 );
+            xp = s.extract( i.key());
+            ASSERT_FALSE( !xp );
+            ++xp->nEraseCount;
+            EXPECT_EQ( i.nEraseCount, 1 );
+
+            xp = s.extract( i.key() );
+            ASSERT_TRUE( !xp );
+        }
+
+        ASSERT_TRUE( s.empty() );
+        ASSERT_CONTAINER_SIZE( s, 0 );
+
+        // Force retiring cycle
+        Set::gc::force_dispose();
+        for ( auto& i : data ) {
+            EXPECT_EQ( i.nDisposeCount, 1 );
+        }
+    }
+
+    void SetUp()
+    {
+        RCU::Construct();
+        cds::threading::Manager::attachThread();
+    }
+
+    void TearDown()
+    {
+        cds::threading::Manager::detachThread();
+        RCU::Destruct();
+    }
+};
+
+TYPED_TEST_CASE_P( IntrusiveFeldmanHashSet );
+
+TYPED_TEST_P( IntrusiveFeldmanHashSet, compare )
+{
+    typedef typename TestFixture::rcu_type rcu_type;
+
+    struct traits : public ci::feldman_hashset::traits
+    {
+        typedef typename TestFixture::hash_accessor hash_accessor;
+        typedef typename TestFixture::cmp compare;
+        typedef typename TestFixture::mock_disposer disposer;
+    };
+
+    typedef ci::FeldmanHashSet< rcu_type, typename TestFixture::int_item, traits > set_type;
+
+    set_type s;
+    this->test( s );
+}
+
+TYPED_TEST_P( IntrusiveFeldmanHashSet, less )
+{
+    typedef ci::FeldmanHashSet< typename TestFixture::rcu_type, typename TestFixture::int_item,
+        typename ci::feldman_hashset::make_traits<
+            ci::feldman_hashset::hash_accessor< typename TestFixture::hash_accessor >
+            , ci::opt::less< std::less<int>>
+            , ci::opt::disposer< typename TestFixture::mock_disposer>
+        >::type
+    > set_type;
+
+    set_type s( 5, 2 );
+    this->test( s );
+}
+
+TYPED_TEST_P( IntrusiveFeldmanHashSet, cmpmix )
+{
+    struct traits : public ci::feldman_hashset::traits
+    {
+        typedef typename TestFixture::hash_accessor hash_accessor;
+        typedef typename TestFixture::cmp compare;
+        typedef std::less<int> less;
+        typedef typename TestFixture::mock_disposer disposer;
+        typedef typename TestFixture::simple_item_counter item_counter;
+    };
+
+    typedef ci::FeldmanHashSet< typename TestFixture::rcu_type, typename TestFixture::int_item, traits > set_type;
+
+    set_type s( 3, 4 );
+    this->test( s );
+}
+
+TYPED_TEST_P( IntrusiveFeldmanHashSet, backoff )
+{
+    struct traits : public ci::feldman_hashset::traits
+    {
+        typedef typename TestFixture::hash_accessor hash_accessor;
+        typedef typename TestFixture::cmp compare;
+        typedef typename TestFixture::mock_disposer disposer;
+        typedef cds::backoff::empty back_off;
+        typedef ci::opt::v::sequential_consistent memory_model;
+    };
+
+    typedef ci::FeldmanHashSet< typename TestFixture::rcu_type, typename TestFixture::int_item, traits > set_type;
+
+    set_type s( 8, 3 );
+    this->test( s );
+}
+
+TYPED_TEST_P( IntrusiveFeldmanHashSet, stat )
+{
+    struct traits : public ci::feldman_hashset::traits
+    {
+        typedef typename TestFixture::hash_accessor hash_accessor;
+        typedef typename TestFixture::cmp compare;
+        typedef typename TestFixture::mock_disposer disposer;
+        typedef ci::feldman_hashset::stat<> stat;
+    };
+
+    typedef ci::FeldmanHashSet< typename TestFixture::rcu_type, typename TestFixture::int_item, traits > set_type;
+
+    set_type s( 8, 3 );
+    this->test( s );
+}
+
+// GCC 5: All test names should be written on single line, otherwise a runtime error will be encountered like as
+// "No test named <test_name> can be found in this test case"
+REGISTER_TYPED_TEST_CASE_P( IntrusiveFeldmanHashSet,
+    compare, less, cmpmix, backoff, stat
+    );
+
+
+#endif // #ifndef CDSUNIT_SET_TEST_INTRUSIVE_FELDMAN_HASHSET_RCU_H