Mgv7 mountains: Remove divide by zero code that creates vast walls

[dragonfireclient.git] / src / log.cpp

diff --git a/src/log.cpp b/src/log.cpp
index a963f4c27832b1179cf0842157ada44f29ef1f7c..b3b3f3f1b03af6c17d3d3cd1e2b0f2fc1665fe10 100644 (file)
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -1,18 +1,18 @@
 /*
-Minetest-c55
-Copyright (C) 2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
 (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GNU Lesser General Public License for more details.
 
-You should have received a copy of the GNU General Public License along
+You should have received a copy of the GNU Lesser General Public License along
 with this program; if not, write to the Free Software Foundation, Inc.,
 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
@@ -26,9 +26,21 @@ 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"
+
+#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::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)
 {
@@ -57,16 +69,35 @@ void log_remove_output(ILogOutput *out)
        }
 }
 
+void log_set_lev_silence(enum LogMessageLevel lev, bool silence)
+{
+       log_threadnamemutex.Lock();
+
+       for (std::list<ILogOutput *>::iterator
+                       it = log_outputs[lev].begin();
+                       it != log_outputs[lev].end();
+                       ++it) {
+               ILogOutput *out = *it;
+               out->silence = silence;
+       }
+
+       log_threadnamemutex.Unlock();
+}
+
 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 +119,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());
@@ -99,10 +131,14 @@ void log_printline(enum LogMessageLevel lev, const std::string &text)
        for(std::list<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);
        }
+       log_threadnamemutex.Unlock();
 }
 
 class Logbuf : public std::streambuf
@@ -132,6 +168,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 +183,7 @@ class Logbuf : public std::streambuf
                }
                m_buf += c;
        }
-       
+
 private:
        enum LogMessageLevel m_lev;
        std::string m_buf;