minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix log threadname lookup handling not beeing threadsafe

This commit is contained in:
sapier 2013-11-30 21:22:15 +01:00
parent e605d70256
commit de0cdbc01c
3 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/jthread/pthread/jmutex.cpp
View File

@ -29,7 +29,8 @@
JMutex::JMutex() JMutex::JMutex()
{ {
initialized = false; pthread_mutex_init(&mutex,NULL);
initialized = true;
} }
JMutex::~JMutex() JMutex::~JMutex()
@ -40,19 +41,14 @@ JMutex::~JMutex()
int JMutex::Init() int JMutex::Init()
{ {
if (initialized) return 0;
return ERR_JMUTEX_ALREADYINIT;
pthread_mutex_init(&mutex,NULL);
initialized = true;
return 0;
} }
int JMutex::Lock() int JMutex::Lock()
{ {
if (!initialized) if (!initialized)
return ERR_JMUTEX_NOTINIT; return ERR_JMUTEX_NOTINIT;
pthread_mutex_lock(&mutex); pthread_mutex_lock(&mutex);
return 0; return 0;
} }
@ -61,7 +57,7 @@ int JMutex::Unlock()
{ {
if (!initialized) if (!initialized)
return ERR_JMUTEX_NOTINIT; return ERR_JMUTEX_NOTINIT;
pthread_mutex_unlock(&mutex); pthread_mutex_unlock(&mutex);
return 0; return 0;
} }

19
src/jthread/win32/jmutex.cpp
View File

@ -29,7 +29,14 @@
JMutex::JMutex() 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() JMutex::~JMutex()
@ -44,16 +51,6 @@ JMutex::~JMutex()
int JMutex::Init() 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; return 0;
} }

7
src/log.cpp
View File

@ -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::list<ILogOutput*> log_outputs[LMT_NUM_VALUES];
std::map<threadid_t, std::string> log_threadnames; std::map<threadid_t, std::string> log_threadnames;
JMutex log_threadnamemutex;
void log_add_output(ILogOutput *out, enum LogMessageLevel lev) 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) void log_register_thread(const std::string &name)
{ {
threadid_t id = get_current_thread_id(); threadid_t id = get_current_thread_id();
log_threadnamemutex.Lock();
log_threadnames[id] = name; log_threadnames[id] = name;
log_threadnamemutex.Unlock();
} }
void log_deregister_thread() void log_deregister_thread()
{ {
threadid_t id = get_current_thread_id(); threadid_t id = get_current_thread_id();
log_threadnamemutex.Lock();
log_threadnames.erase(id); log_threadnames.erase(id);
log_threadnamemutex.Unlock();
} }
static std::string get_lev_string(enum LogMessageLevel lev) static std::string get_lev_string(enum LogMessageLevel lev)
@ -144,7 +149,7 @@ public:
} }
m_buf += c; m_buf += c;
} }
private: private:
enum LogMessageLevel m_lev; enum LogMessageLevel m_lev;
std::string m_buf; std::string m_buf;