Commit 350c775f authored by Mukund Sivaraman's avatar Mukund Sivaraman
Browse files

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

parent 666bfa9c
......@@ -87,19 +87,29 @@ 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_(NULL)
{
// Set the mutex_ after we acquire the lock. This is because of
// exception safety. If lock() throws, it didn't work, so we must
// not unlock when we are destroyed. In such case, mutex_ is
// NULL and checked in the destructor.
mutex.lock();
if (block) {
mutex.lock();
} else {
if (!mutex.tryLock()) {
isc_throw(AlreadyLocked, "The mutex is already locked");
}
}
mutex_ = &mutex;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment