Made the global mutex construction for the get_current_dir() and set_…

…current_dir() routines more robust.
daben · Jun 19, 2011 · 927743a · 927743a
1 parent d9cd30a
commit 927743a
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/dlib/misc_api/misc_api_kernel_1.cpp b/dlib/misc_api/misc_api_kernel_1.cpp
@@ -33,15 +33,30 @@ namespace dlib
 
     namespace
     {
-        mutex cwd_mutex;
+        mutex& cwd_mutex()
+        {
+            static mutex m;
+            return m;
+        }
+        // Make sure the above mutex gets constructed before main() 
+        // starts.  This way we can be pretty sure it will be constructed
+        // before any threads could possibly call set_current_dir() or
+        // get_current_dir() simultaneously.
+        struct construct_cwd_mutex
+        {
+            construct_cwd_mutex()
+            {
+                cwd_mutex();
+            }
+        } oaimvweoinvwe;
     }
 
     std::string get_current_dir (
     )
     {
         // need to lock a mutex here because getting and setting the
         // current working directory is not thread safe on windows.
-        auto_mutex lock(cwd_mutex);
+        auto_mutex lock(cwd_mutex());
         char buf[1024];
         if (GetCurrentDirectoryA(sizeof(buf),buf) == 0)
         {
@@ -61,7 +76,7 @@ namespace dlib
     {
         // need to lock a mutex here because getting and setting the
         // current working directory is not thread safe on windows.
-        auto_mutex lock(cwd_mutex);
+        auto_mutex lock(cwd_mutex());
         if (SetCurrentDirectory(new_dir.c_str()) == 0)
         {
             throw set_current_dir_error("Error changing current dir to '" + new_dir + "'");