Dungeongen: Remove most hardcoded dungeon nodes (#8594)

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

diff --git a/src/log.cpp b/src/log.cpp
index 7cae8b67072a18c119a09e6b2d6fc94ff89d6989..c84a847a5073bfaffaf944a99fba3c6064a2dc0b 100644 (file)
--- a/src/log.cpp
+++ b/src/log.cpp
@@ -34,9 +34,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <cerrno>
 #include <cstring>
 
+const int BUFFER_LENGTH = 256;
+
 class StringBuffer : public std::streambuf {
 public:
-       StringBuffer() {}
+       StringBuffer() {
+               buffer_index = 0;
+       }
 
        int overflow(int c);
        virtual void flush(const std::string &buf) = 0;
@@ -44,7 +48,8 @@ public:
        void push_back(char c);
 
 private:
-       std::string buffer;
+       char buffer[BUFFER_LENGTH];
+       int buffer_index;
 };
 
 
@@ -135,7 +140,8 @@ class AndroidSystemLogOutput : public ICombinedLogOutput {
                }
                void logRaw(LogLevel lev, const std::string &line)
                {
-                       assert(ARRLEN(g_level_to_android) == LL_MAX);
+                       STATIC_ASSERT(ARRLEN(g_level_to_android) == LL_MAX,
+                               mismatch_between_android_and_internal_loglevels);
                        __android_log_print(g_level_to_android[lev],
                                PROJECT_NAME_C, "%s", line.c_str());
                }
@@ -172,7 +178,7 @@ LogLevel Logger::stringToLevel(const std::string &name)
 
 void Logger::addOutput(ILogOutput *out)
 {
-       addOutputMaxLevel(out, LL_MAX);
+       addOutputMaxLevel(out, (LogLevel)(LL_MAX - 1));
 }
 
 void Logger::addOutput(ILogOutput *out, LogLevel lev)
@@ -180,21 +186,34 @@ void Logger::addOutput(ILogOutput *out, LogLevel lev)
        m_outputs[lev].push_back(out);
 }
 
+void Logger::addOutputMasked(ILogOutput *out, LogLevelMask mask)
+{
+       for (size_t i = 0; i < LL_MAX; i++) {
+               if (mask & LOGLEVEL_TO_MASKLEVEL(i))
+                       m_outputs[i].push_back(out);
+       }
+}
+
 void Logger::addOutputMaxLevel(ILogOutput *out, LogLevel lev)
 {
+       assert(lev < LL_MAX);
        for (size_t i = 0; i <= lev; i++)
                m_outputs[i].push_back(out);
 }
 
-void Logger::removeOutput(ILogOutput *out)
+LogLevelMask Logger::removeOutput(ILogOutput *out)
 {
+       LogLevelMask ret_mask = 0;
        for (size_t i = 0; i < LL_MAX; i++) {
                std::vector<ILogOutput *>::iterator it;
 
                it = std::find(m_outputs[i].begin(), m_outputs[i].end(), out);
-               if (it != m_outputs[i].end())
+               if (it != m_outputs[i].end()) {
+                       ret_mask |= LOGLEVEL_TO_MASKLEVEL(i);
                        m_outputs[i].erase(it);
+               }
        }
+       return ret_mask;
 }
 
 void Logger::setLevelSilenced(LogLevel lev, bool silenced)
@@ -204,14 +223,14 @@ void Logger::setLevelSilenced(LogLevel lev, bool silenced)
 
 void Logger::registerThread(const std::string &name)
 {
-       threadid_t id = thr_get_current_thread_id();
+       std::thread::id id = std::this_thread::get_id();
        MutexAutoLock lock(m_mutex);
        m_thread_names[id] = name;
 }
 
 void Logger::deregisterThread()
 {
-       threadid_t id = thr_get_current_thread_id();
+       std::thread::id id = std::this_thread::get_id();
        MutexAutoLock lock(m_mutex);
        m_thread_names.erase(id);
 }
@@ -227,15 +246,18 @@ const std::string Logger::getLevelLabel(LogLevel lev)
                "VERBOSE",
        };
        assert(lev < LL_MAX && lev >= 0);
-       assert(ARRLEN(names) == LL_MAX);
+       STATIC_ASSERT(ARRLEN(names) == LL_MAX,
+               mismatch_between_loglevel_names_and_enum);
        return names[lev];
 }
 
+LogColor Logger::color_mode = LOG_COLOR_AUTO;
+
 const std::string Logger::getThreadName()
 {
-       std::map<threadid_t, std::string>::const_iterator it;
+       std::map<std::thread::id, std::string>::const_iterator it;
 
-       threadid_t id = thr_get_current_thread_id();
+       std::thread::id id = std::this_thread::get_id();
        it = m_thread_names.find(id);
        if (it != m_thread_names.end())
                return it->second;
@@ -323,11 +345,15 @@ std::streamsize StringBuffer::xsputn(const char *s, std::streamsize n)
 void StringBuffer::push_back(char c)
 {
        if (c == '\n' || c == '\r') {
-               if (!buffer.empty())
-                       flush(buffer);
-               buffer.clear();
+               if (buffer_index)
+                       flush(std::string(buffer, buffer_index));
+               buffer_index = 0;
        } else {
-               buffer.push_back(c);
+               buffer[buffer_index++] = c;
+               if (buffer_index >= BUFFER_LENGTH) {
+                       flush(std::string(buffer, buffer_index));
+                       buffer_index = 0;
+               }
        }
 }