Merge branch 'dev' of github.com:khizmax/libcds into dev

[libcds.git] / cds / sync / injecting_monitor.h

diff --git a/cds/sync/injecting_monitor.h b/cds/sync/injecting_monitor.h
index 7991fe2a152669e3324dc668fb643d60e71b0ed2..1c81327d52c67843d3a6f4f9eb634735cd176a15 100644 (file)
--- a/cds/sync/injecting_monitor.h
+++ b/cds/sync/injecting_monitor.h
@@ -4,12 +4,22 @@
 #define CDSLIB_SYNC_INJECTING_MONITOR_H
 
 #include <cds/sync/monitor.h>
+#ifndef CDS_CXX11_INHERITING_CTOR
+#   include <utility> // std::forward
+#endif
 
 namespace cds { namespace sync {
 
+    //@cond
+    struct injecting_monitor_traits {
+        struct empty_stat
+        {};
+    };
+    //@endcond
+
     /// @ref cds_sync_monitor "Monitor" that injects the lock into each node
     /**
-        This monitor injects the lock object of type \p Lock into each node. 
+        This simple monitor injects the lock object of type \p Lock into each node.
         The monitor is designed for user-space locking primitives like \ref sync::spin_lock "spin-lock".
 
         Template arguments:
@@ -21,66 +31,42 @@ namespace cds { namespace sync {
     public:
         typedef Lock lock_type; ///< Lock type
 
-        /// Monitor injection into \p Node
-        template <typename Node>
-        struct node_wrapper : public Node
-        {
-            using Node::Node;
-            mutable lock_type m_Lock; ///< Node-level lock
+        /// Node injection
+        struct node_injection {
+            mutable lock_type m_Lock;   ///< Node spin-lock
 
-            /// Makes exclusive access to the object
-            void lock() const
+            //@cond
+            CDS_CONSTEXPR bool check_free() const
             {
-                m_Lock.lock;
-            }
-
-            /// Unlocks the object
-            void unlock() const
-            {
-                m_Lock.unlock();
+                return true;
             }
+            //@endcond
         };
 
         /// Makes exclusive access to node \p p
-        /**
-            \p p must have method \p lock()
-        */
         template <typename Node>
         void lock( Node const& p ) const
         {
-            p.lock();
+            p.m_SyncMonitorInjection.m_Lock.lock();
         }
 
         /// Unlocks the node \p p
-        /**
-            \p p must have method \p unlock()
-        */
         template <typename Node>
         void unlock( Node const& p ) const
         {
-            p.unlock();
+            p.m_SyncMonitorInjection.m_Lock.unlock();
         }
 
-        /// Scoped lock
-        template <typename Node>
-        class scoped_lock
+        //@cond
+        injecting_monitor_traits::empty_stat statistics() const
         {
-            Node const& m_Locked;  ///< Our locked node
-
-        public:
-            /// Makes exclusive access to node \p p
-            scoped_lock( injecting_monitor const&, Node const& p )
-                : m_Locked( p )
-            {
-                p.lock();
-            }
+            return injecting_monitor_traits::empty_stat();
+        }
+        //@endcond
 
-            /// Unlocks the node
-            ~scoped_lock()
-            {
-                p.unlock();
-            }
-        };
+        /// Scoped lock
+        template <typename Node>
+        using scoped_lock = monitor_scoped_lock< injecting_monitor, Node >;
     };
 }} // namespace cds::sync