Changeset 4872 for branches/erijo-dev

Timestamp:

03/20/07 05:21:24 (21 months ago)

Author:

erijo

Message:

Lock mutex (per default) when creating a TMutexLocker

Location:

branches/erijo-dev/licq/src/utils

Files:

• mutexlocker.cpp (modified) (1 diff)
• mutexlocker.h (modified) (2 diffs)
• tests/mutexlockertest.cpp (modified) (2 diffs)

branches/erijo-dev/licq/src/utils/mutexlocker.cpp

@@ -22 +22 @@
 #include <cassert>
 
-Licq::TMutexLocker::TMutexLocker(TMutex* mutex)
+Licq::TMutexLocker::TMutexLocker(TMutex* mutex, TCreateOption option)
   : Mutex(mutex), Locked(false)
 {
-  // Empty
+  if (option == CREATE_LOCKED)
+    lock();
 }
 

branches/erijo-dev/licq/src/utils/mutexlocker.h

@@ -48 +48 @@
       {
         TMutexLocker locker(&Mutex);
-        locker.lock();
         return Counter++;
       }
@@ -61 +60 @@
 
 public:
+  enum TCreateOption { CREATE_LOCKED, CREATE_UNLOCKED };
   /** \brief Create a new TMutexLocker.
 
-      Does \b not lock \a mutex.
-
       \param[in] mutex Must be a mutex \b not locked by this thread.
+      \param[in] option Lock the mutex if option is CREATE_LOCKED.
   */
-  TMutexLocker(TMutex* mutex);
+  TMutexLocker(TMutex* mutex, TCreateOption option = CREATE_LOCKED);
 
   /// Unlock the mutex if it was previous locked in lock() or tryLock().

branches/erijo-dev/licq/src/utils/tests/mutexlockertest.cpp

@@ -33 +33 @@
   {
     TMutexLocker locker(&mutex);
+    BOOST_CHECK_EQUAL(mutex.isLocked(), true);
+  }
+
+  BOOST_CHECK_EQUAL(mutex.isLocked(), false);
+
+  {
+    TMutexLocker locker(&mutex, TMutexLocker::CREATE_UNLOCKED);
     BOOST_CHECK_EQUAL(mutex.isLocked(), false);
 
@@ -49 +56 @@
   // This test requires that TMutex is built with DEBUG (and __USE_GNU) defined.
   {
-    TMutexLocker locker(&mutex);
+    TMutexLocker locker(&mutex, TMutexLocker::CREATE_UNLOCKED);
     locker.lock();