Fix log threadname lookup handling not beeing threadsafe

3 files changed, 19 insertions, 21 deletions

diff --git a/src/jthread/pthread/jmutex.cpp b/src/jthread/pthread/jmutex.cpp
index 29e0baac0..3dfad5e6c 100644
--- a/src/jthread/pthread/jmutex.cpp
+++ b/src/jthread/pthread/jmutex.cpp
@@ -29,7 +29,8 @@
 
 JMutex::JMutex()
 {
-	initialized = false;
+	pthread_mutex_init(&mutex,NULL);
+	initialized = true;
 }
 
 JMutex::~JMutex()
@@ -40,19 +41,14 @@ JMutex::~JMutex()
 
 int JMutex::Init()
 {
-	if (initialized)
-		return ERR_JMUTEX_ALREADYINIT;
-	
-	pthread_mutex_init(&mutex,NULL);
-	initialized = true;
-	return 0;	
+	return 0;
 }
 
 int JMutex::Lock()
 {
 	if (!initialized)
 		return ERR_JMUTEX_NOTINIT;
-		
+
 	pthread_mutex_lock(&mutex);
 	return 0;
 }
@@ -61,7 +57,7 @@ int JMutex::Unlock()
 {
 	if (!initialized)
 		return ERR_JMUTEX_NOTINIT;
-	
+
 	pthread_mutex_unlock(&mutex);
 	return 0;
 }
diff --git a/src/jthread/win32/jmutex.cpp b/src/jthread/win32/jmutex.cpp
index d079d448d..8a31495cd 100644
--- a/src/jthread/win32/jmutex.cpp
+++ b/src/jthread/win32/jmutex.cpp
@@ -29,7 +29,14 @@
 
 JMutex::JMutex()
 {
-	initialized = false;
+#ifdef JMUTEX_CRITICALSECTION
+	InitializeCriticalSection(&mutex);
+#else
+	mutex = CreateMutex(NULL,FALSE,NULL);
+	if (mutex == NULL)
+		return ERR_JMUTEX_CANTCREATEMUTEX;
+#endif // JMUTEX_CRITICALSECTION
+	initialized = true;
 }
 
 JMutex::~JMutex()
@@ -44,16 +51,6 @@ JMutex::~JMutex()
 
 int JMutex::Init()
 {
-	if (initialized)
-		return ERR_JMUTEX_ALREADYINIT;
-#ifdef JMUTEX_CRITICALSECTION
-	InitializeCriticalSection(&mutex);
-#else
-	mutex = CreateMutex(NULL,FALSE,NULL);
-	if (mutex == NULL)
-		return ERR_JMUTEX_CANTCREATEMUTEX;
-#endif // JMUTEX_CRITICALSECTION
-	initialized = true;
 	return 0;
 }
 
diff --git a/src/log.cpp b/src/log.cpp
index 366d83b64..527f54480 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -29,6 +29,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 std::list<ILogOutput*> log_outputs[LMT_NUM_VALUES];
 std::map<threadid_t, std::string> log_threadnames;
+JMutex                            log_threadnamemutex;
 
 void log_add_output(ILogOutput *out, enum LogMessageLevel lev)
 {
@@ -60,13 +61,17 @@ void log_remove_output(ILogOutput *out)
 void log_register_thread(const std::string &name)
 {
 	threadid_t id = get_current_thread_id();
+	log_threadnamemutex.Lock();
 	log_threadnames[id] = name;
+	log_threadnamemutex.Unlock();
 }
 
 void log_deregister_thread()
 {
 	threadid_t id = get_current_thread_id();
+	log_threadnamemutex.Lock();
 	log_threadnames.erase(id);
+	log_threadnamemutex.Unlock();
 }
 
 static std::string get_lev_string(enum LogMessageLevel lev)
@@ -144,7 +149,7 @@ public:
 		}
 		m_buf += c;
 	}
-	
+
 private:
 	enum LogMessageLevel m_lev;
 	std::string m_buf;