X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Flog.cpp;h=ff2e163333d6c85ac50c229d33ea5307e367d0b1;hb=37b7f094e3ea502339794f64e8bad22444c6fb54;hp=366d83b64d30d5c826ec3cde0f0afc1b33112a02;hpb=6d0ea26c2d62c3774ff384cf1bfc2a3372b49a3b;p=oweals%2Fminetest.git

diff --git a/src/log.cpp b/src/log.cpp
index 366d83b64..ff2e16333 100644
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -26,9 +26,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "threads.h"
 #include "debug.h"
 #include "gettime.h"
+#include "porting.h"
+#include "config.h"
 
 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 +63,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)
@@ -88,6 +95,7 @@ static std::string get_lev_string(enum LogMessageLevel lev)
 
 void log_printline(enum LogMessageLevel lev, const std::string &text)
 {
+	log_threadnamemutex.Lock();
 	std::string threadname = "(unknown thread)";
 	std::map<threadid_t, std::string>::const_iterator i;
 	i = log_threadnames.find(get_current_thread_id());
@@ -103,6 +111,7 @@ void log_printline(enum LogMessageLevel lev, const std::string &text)
 		out->printLog(os.str(), lev);
 		out->printLog(lev, text);
 	}
+	log_threadnamemutex.Unlock();
 }
 
 class Logbuf : public std::streambuf
@@ -132,6 +141,9 @@ public:
 	void printbuf()
 	{
 		log_printline(m_lev, m_buf);
+#ifdef __ANDROID__
+		__android_log_print(ANDROID_LOG_ERROR, PROJECT_NAME, "%s", m_buf.c_str());
+#endif
 	}
 
 	void bufchar(char c)
@@ -144,7 +156,7 @@ public:
 		}
 		m_buf += c;
 	}
-	
+
 private:
 	enum LogMessageLevel m_lev;
 	std::string m_buf;