Support for scalable font and gui elements

[oweals/minetest.git] / src / log.cpp

diff --git a/src/log.cpp b/src/log.cpp
index cc981dadd25bf63a23bea52bd6280f9a93a654fb..97f25cc77e95a1a0cf7962b99e0af3b67557ad2a 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.
 */
@@ -22,12 +22,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <map>
 #include <list>
 #include <sstream>
+#include <algorithm>
 #include "threads.h"
 #include "debug.h"
 #include "gettime.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)
 {
@@ -46,10 +48,30 @@ void log_add_output_all_levs(ILogOutput *out)
                log_outputs[i].push_back(out);
 }
 
+void log_remove_output(ILogOutput *out)
+{
+       for(int i=0; i<LMT_NUM_VALUES; i++){
+               std::list<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_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)
@@ -71,6 +93,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());
@@ -83,8 +106,10 @@ void log_printline(enum LogMessageLevel lev, const std::string &text)
                        i != log_outputs[lev].end(); i++){
                ILogOutput *out = *i;
                out->printLog(os.str());
+               out->printLog(os.str(), lev);
                out->printLog(lev, text);
        }
+       log_threadnamemutex.Unlock();
 }
 
 class Logbuf : public std::streambuf
@@ -126,7 +151,7 @@ public:
                }
                m_buf += c;
        }
-       
+
 private:
        enum LogMessageLevel m_lev;
        std::string m_buf;
@@ -141,4 +166,5 @@ std::ostream actionstream(&actionbuf);
 std::ostream infostream(&infobuf);
 std::ostream verbosestream(&verbosebuf);
 
+bool log_trace_level_enabled = false;