X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=cds%2Fsync%2Finjecting_monitor.h;h=e7094dd907bc3cea6fd932a180e923b6c7b50612;hb=a09deddad8c64f9663fdfccbab67a43cf214543f;hp=7991fe2a152669e3324dc668fb643d60e71b0ed2;hpb=2da97a92417392fc25577442a7978f2fe8c421f7;p=libcds.git

diff --git a/cds/sync/injecting_monitor.h b/cds/sync/injecting_monitor.h
index 7991fe2a..e7094dd9 100644
--- a/cds/sync/injecting_monitor.h
+++ b/cds/sync/injecting_monitor.h
@@ -1,15 +1,53 @@
-//$$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_SYNC_INJECTING_MONITOR_H
 #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 +59,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
-
-            /// Makes exclusive access to the object
-            void lock() const
-            {
-                m_Lock.lock;
-            }
+        /// Node injection
+        struct node_injection {
+            mutable lock_type m_Lock;   ///< Node spin-lock
 
-            /// Unlocks the object
-            void unlock() const
+            //@cond
+            CDS_CONSTEXPR bool check_free() 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