Fix usage of destroyed mutex

[minetest.git] / src / log.cpp

diff --git a/src/log.cpp b/src/log.cpp
index 366d83b64d30d5c826ec3cde0f0afc1b33112a02..398c89eb0bb51b346ff605239e47232de41e17ae 100644 (file)
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -24,11 +24,24 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <sstream>
 #include <algorithm>
 #include "threads.h"
+#include "jthread/jmutexautolock.h"
 #include "debug.h"
 #include "gettime.h"
-
-std::list<ILogOutput*> log_outputs[LMT_NUM_VALUES];
+#include "porting.h"
+#include "config.h"
+
+#ifdef __ANDROID__
+unsigned int android_log_level_mapping[] = {
+               /* LMT_ERROR */   ANDROID_LOG_ERROR,
+               /* LMT_ACTION */  ANDROID_LOG_WARN,
+               /* LMT_INFO */    ANDROID_LOG_INFO,
+               /* LMT_VERBOSE */ ANDROID_LOG_VERBOSE
+       };
+#endif
+
+std::vector<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)
 {
@@ -50,22 +63,37 @@ void log_add_output_all_levs(ILogOutput *out)
 void log_remove_output(ILogOutput *out)
 {
        for(int i=0; i<LMT_NUM_VALUES; i++){
-               std::list<ILogOutput*>::iterator it =
+               std::vector<ILogOutput*>::iterator it =
                                std::find(log_outputs[i].begin(), log_outputs[i].end(), out);
                if(it != log_outputs[i].end())
                        log_outputs[i].erase(it);
        }
 }
 
+void log_set_lev_silence(enum LogMessageLevel lev, bool silence)
+{
+       JMutexAutoLock lock(log_threadnamemutex);
+
+       for (std::vector<ILogOutput *>::iterator it = log_outputs[lev].begin();
+                       it != log_outputs[lev].end(); ++it) {
+               ILogOutput *out = *it;
+               out->silence = silence;
+       }
+}
+
 void log_register_thread(const std::string &name)
 {
        threadid_t id = get_current_thread_id();
+       JMutexAutoLock lock(log_threadnamemutex);
+
        log_threadnames[id] = name;
 }
 
 void log_deregister_thread()
 {
        threadid_t id = get_current_thread_id();
+       JMutexAutoLock lock(log_threadnamemutex);
+
        log_threadnames.erase(id);
 }
 
@@ -88,6 +116,7 @@ static std::string get_lev_string(enum LogMessageLevel lev)
 
 void log_printline(enum LogMessageLevel lev, const std::string &text)
 {
+       JMutexAutoLock lock(log_threadnamemutex);
        std::string threadname = "(unknown thread)";
        std::map<threadid_t, std::string>::const_iterator i;
        i = log_threadnames.find(get_current_thread_id());
@@ -95,10 +124,14 @@ void log_printline(enum LogMessageLevel lev, const std::string &text)
                threadname = i->second;
        std::string levelname = get_lev_string(lev);
        std::ostringstream os(std::ios_base::binary);
-       os<<getTimestamp()<<": "<<levelname<<"["<<threadname<<"]: "<<text;
-       for(std::list<ILogOutput*>::iterator i = log_outputs[lev].begin();
-                       i != log_outputs[lev].end(); i++){
+       os << getTimestamp() << ": " << levelname << "["<<threadname<<"]: " << text;
+
+       for(std::vector<ILogOutput*>::iterator i = log_outputs[lev].begin();
+                       i != log_outputs[lev].end(); i++) {
                ILogOutput *out = *i;
+               if (out->silence)
+                       continue;
+
                out->printLog(os.str());
                out->printLog(os.str(), lev);
                out->printLog(lev, text);
@@ -132,6 +165,9 @@ class Logbuf : public std::streambuf
        void printbuf()
        {
                log_printline(m_lev, m_buf);
+#ifdef __ANDROID__
+               __android_log_print(android_log_level_mapping[m_lev], PROJECT_NAME, "%s", m_buf.c_str());
+#endif
        }
 
        void bufchar(char c)
@@ -144,7 +180,7 @@ class Logbuf : public std::streambuf
                }
                m_buf += c;
        }
-       
+
 private:
        enum LogMessageLevel m_lev;
        std::string m_buf;