map.cpp: Initialize NodeNeighbor, set NeighborType to u8 & cleanup

[minetest.git] / src / log.cpp

diff --git a/src/log.cpp b/src/log.cpp
index 600e715c12680653379b935551aa2e48384bbffe..3e9229e38799485c58300082c72190ef45755b8b 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 @@ class StringBuffer : public std::streambuf {
        void push_back(char c);
 
 private:
-       std::string buffer;
+       char buffer[BUFFER_LENGTH];
+       int buffer_index;
 };
 
 
@@ -218,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);
 }
@@ -248,9 +253,9 @@ const std::string Logger::getLevelLabel(LogLevel lev)
 
 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;
@@ -338,11 +343,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;
+               }
        }
 }