[2198] Add a block argument to Mutex::Locker's constructor

diff --git a/src/lib/util/threads/sync.h b/src/lib/util/threads/sync.h
index b6cdc8f582f78b205518496bfb5afb4b4fe97dfd..cdbd5c1b4fac15cd516594c1972ef0da8fa05c2f 100644 (file)
--- a/src/lib/util/threads/sync.h
+++ b/src/lib/util/threads/sync.h
@@ -89,15 +89,24 @@ public:
 
         /// \brief Constructor.
         ///
-        /// Locks the mutex. May block for extended period of time.
+        /// Locks the mutex. May block for extended period of time if
+        /// \c block is true.
         ///
         /// \throw isc::InvalidOperation when OS reports error. This usually
         ///     means an attempt to use the mutex in a wrong way (locking
         ///     a mutex second time from the same thread, for example).
-        Locker(Mutex& mutex) :
+        /// \throw AlreadyLocked if \c block is false and the mutex is
+        ///     already locked.
+        Locker(Mutex& mutex, bool block = true) :
             mutex_(mutex)
         {
-            mutex.lock();
+            if (block) {
+                mutex.lock();
+            } else {
+                if (!mutex.tryLock()) {
+                    isc_throw(AlreadyLocked, "The mutex is already locked");
+                }
+            }
         }
 
         /// \brief Destructor.