X-Git-Url: http://plrg.eecs.uci.edu/git/?p=libcds.git;a=blobdiff_plain;f=cds%2Fsync%2Fmonitor.h;h=d03ab3e570ffad96a19be80f6a96987bbb963b3d;hp=5a4b0888a3708f1772b8479a8685a761d15c0b0d;hb=HEAD;hpb=cd515d6402be81b84e2eb0c9d4cf0a1ca9e4d95a diff --git a/cds/sync/monitor.h b/cds/sync/monitor.h index 5a4b0888..d03ab3e5 100644 --- a/cds/sync/monitor.h +++ b/cds/sync/monitor.h @@ -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. */ #ifndef CDSLIB_SYNC_MONITOR_H @@ -36,7 +36,7 @@ namespace cds { namespace sync { /** @page cds_sync_monitor Synchronization monitor - A monitor is synchronization construct + A monitor is synchronization construction that allows threads to have both mutual exclusion and the ability to wait (block) for a certain condition to become true. Some blocking data structure algoritms like the trees require per-node locking. For huge trees containing millions of nodes it can be very inefficient to inject @@ -75,7 +75,7 @@ namespace cds { namespace sync { template struct node_injection: public Node { - // Monitor data to inject into container's node + // Monitor data injecting into container's node // ... }; // Locks the node @@ -89,7 +89,7 @@ namespace cds { namespace sync { using scoped_lock = monitor_scoped_lock< pool_monitor, Node >; }; \endcode - Monitor's data must be inject into container's node as \p m_SyncMonitorInjection data member: + Monitor's data must be injected into container's node as \p m_SyncMonitorInjection data member: \code template struct my_node