OrgLion-ML
/
dlib
mirror of https://github.com/davisking/dlib.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Made the global mutex construction for the get_current_dir() and set_current_dir() 

routines more robust.
This commit is contained in:
Davis King 2011-06-19 14:02:31 -04:00
parent d9cd30a64f
commit 927743a162
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlib/misc_api/misc_api_kernel_1.cpp
View File

@ -33,7 +33,22 @@ 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 (
@ -41,7 +56,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());
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 + "'");