Uses different pass count for different parallel queue test cases

[libcds.git] / cds / gc / details / retired_ptr.h

diff --git a/cds/gc/details/retired_ptr.h b/cds/gc/details/retired_ptr.h
index bf3d7da81719fb0d16e879bfa47312fc05268ea4..8f5ee4bf555e6e0adea3abd86d1f9e337d607b76 100644 (file)
--- a/cds/gc/details/retired_ptr.h
+++ b/cds/gc/details/retired_ptr.h
@@ -1,9 +1,38 @@
-//$$CDS-header$$
+/*
+    This file is a part of libcds - Concurrent Data Structures library
+
+    (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:
+
+    * 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 CDSLIB_GC_DETAILS_RETIRED_PTR_H
 #define CDSLIB_GC_DETAILS_RETIRED_PTR_H
 
 #include <cds/details/defs.h>
+#include <cds/details/static_functor.h>
 
 //@cond
 namespace cds { namespace gc {
@@ -46,11 +75,18 @@ namespace cds { namespace gc {
             {}
 
             /// Typecasting ctor
+            template <typename T>
+            retired_ptr( T* p, free_retired_ptr_func func) CDS_NOEXCEPT
+                : m_p( reinterpret_cast<pointer>(p))
+                , m_funcFree( func )
+            {}
+/*
             template <typename T>
             retired_ptr( T * p, void (* pFreeFunc)(T *)) CDS_NOEXCEPT
                 : m_p( reinterpret_cast<pointer>(p))
                 , m_funcFree( reinterpret_cast< free_retired_ptr_func >( pFreeFunc ))
             {}
+*/
 
             /// Assignment operator
             retired_ptr& operator =( retired_ptr const& s) CDS_NOEXCEPT
@@ -67,8 +103,20 @@ namespace cds { namespace gc {
                 assert( m_p );
                 m_funcFree( m_p );
 
-                CDS_STRICT_DO( m_p = nullptr );
-                CDS_STRICT_DO( m_funcFree = nullptr );
+                CDS_STRICT_DO( clear());
+            }
+
+            /// Checks if the retired pointer is not empty
+            explicit operator bool() const CDS_NOEXCEPT
+            {
+                return m_p != nullptr;
+            }
+
+            /// Clears retired pointer without \p free() call
+            void clear()
+            {
+                m_p = nullptr;
+                m_funcFree = nullptr;
             }
         };
 
@@ -87,6 +135,13 @@ namespace cds { namespace gc {
             return !(p1 == p2);
         }
     }  // namespace details
+
+    template <typename Func, typename T>
+    static inline cds::gc::details::retired_ptr make_retired_ptr( T * p )
+    {
+        return cds::gc::details::retired_ptr( p, cds::details::static_functor<Func, T>::call );
+    }
+
 }}   // namespace cds::gc
 //@endcond