merged

dlib/threads/auto_mutex_extension.h

@@ -63,15 +63,29 @@ namespace dlib
             rw->lock();
         }
 
-        ~auto_mutex (
-        )
+        void unlock()
         {
             if (m != 0)
+            {
                 m->unlock();
+                m = 0;
+            }
             else if (r != 0)
+            {
                 r->unlock();
-            else
+                r = 0;
+            }
+            else if (rw != 0)
+            {
                 rw->unlock();
+                rw = 0;
+            }
+        }
+
+        ~auto_mutex (
+        )
+        {
+            unlock();
         }
 
     private:

dlib/threads/auto_mutex_extension_abstract.h

@@ -52,12 +52,21 @@ namespace dlib
                 - m will be locked via m.lock() (i.e. a write lock will be obtained)
         !*/
 
+        void unlock(
+        );
+        /*!
+            ensures
+                - if (unlock() has not already been called) then
+                    - The mutex associated with *this has been unlocked.  This is useful if
+                      you want to unlock a mutex before the auto_mutex destructor executes.
+        !*/
+
         ~auto_mutex (
         );
         /*!
             ensures
                 - all resources allocated by *this have been freed
-                - the mutex associated with *this has been unlocked
+                - calls unlock()
         !*/
 
     private:

dlib/threads/thread_pool_extension.cpp

@@ -275,7 +275,7 @@ namespace dlib
             // aren't any other worker threads free so just perform the task right
             // here
 
-            m.unlock();
+            M.unlock();
             bfp();
 
             // return a task id that is both non-zero and also one

dlib/threads/thread_pool_extension.h

@@ -182,7 +182,7 @@ namespace dlib
                 // aren't any other worker threads free so just perform the task right
                 // here
 
-                m.unlock();
+                M.unlock();
                 (obj.*funct)();
 
                 // return a task id that is both non-zero and also one
@@ -225,7 +225,7 @@ namespace dlib
                 // aren't any other worker threads free so just perform the task right
                 // here
 
-                m.unlock();
+                M.unlock();
                 (obj.*funct)(arg1);
 
                 // return a task id that is both non-zero and also one
@@ -270,7 +270,7 @@ namespace dlib
                 // aren't any other worker threads free so just perform the task right
                 // here
 
-                m.unlock();
+                M.unlock();
                 (obj.*funct)(arg1, arg2);
 
                 // return a task id that is both non-zero and also one