/*
-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.
*/
#include "threads.h"
#include "debug.h"
#include "gettime.h"
+#include "porting.h"
+#include "config.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)
{
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)
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());
out->printLog(os.str(), lev);
out->printLog(lev, text);
}
+ log_threadnamemutex.Unlock();
}
class Logbuf : public std::streambuf
void printbuf()
{
log_printline(m_lev, m_buf);
+#ifdef __ANDROID__
+ __android_log_print(ANDROID_LOG_ERROR, PROJECT_NAME, "%s", m_buf.c_str());
+#endif
}
void bufchar(char c)
}
m_buf += c;
}
-
+
private:
enum LogMessageLevel m_lev;
std::string m_buf;