pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[base] Cleanup for logging.

Browse source
This commit is contained in:
Yuri Gorshenin 2017-06-06 16:46:44 +03:00
parent b8ad04b02e
commit b422634bab
2 changed files with 50 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
base/logging.cpp
View file

@ -1,51 +1,60 @@
#include "base/logging.hpp"
#include "base/assert.hpp"
#include "base/macros.hpp"
#include "base/mutex.hpp"
#include "base/thread.hpp"
#include "base/timer.hpp"
#include "std/target_os.hpp"
//#include "std/windows.hpp"
#include <algorithm>
#include <cassert>
#include <iomanip>
#include <iostream>
#include <iterator>
#include <map>
#include <mutex>
#include <sstream>
#include <vector>
using namespace std;
namespace
{
mutex g_logMutex;
} // namespace
namespace my
{
std::string ToString(LogLevel level)
string ToString(LogLevel level)
{
auto const & names = GetLogLevelNames();
CHECK_LESS(level, names.size(), ());
return names[level];
}
bool FromString(std::string const & s, LogLevel & level)
bool FromString(string const & s, LogLevel & level)
{
auto const & names = GetLogLevelNames();
auto it = std::find(names.begin(), names.end(), s);
auto it = find(names.begin(), names.end(), s);
if (it == names.end())
return false;
level = static_cast<LogLevel>(std::distance(names.begin(), it));
level = static_cast<LogLevel>(distance(names.begin(), it));
return true;
}
std::vector<std::string> const & GetLogLevelNames()
vector<string> const & GetLogLevelNames()
{
static std::vector<std::string> const kNames = {
{"DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"}};
// If you're going to modify the behavior of the function, please,
// check validity of LogHelper ctor.
static vector<string> const kNames = {{"DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"}};
return kNames;
}
class LogHelper
{
int m_threadsCount;
std::map<threads::ThreadID, int> m_threadID;
map<threads::ThreadID, int> m_threadID;
int GetThreadID()
{
@ -63,19 +72,19 @@ class LogHelper
public:
LogHelper() : m_threadsCount(0)
{
m_names[0] = "DEBUG";
m_lens[0] = 5;
m_names[1] = "INFO";
m_lens[1] = 4;
m_names[2] = "WARNING";
m_lens[2] = 7;
m_names[3] = "ERROR";
m_lens[3] = 5;
m_names[4] = "CRITICAL";
m_lens[4] = 8;
// This code highly depends on the fact that GetLogLevelNames()
// always returns the same constant vector of strings.
auto const & names = GetLogLevelNames();
assert(names.size() == 5);
for (size_t i = 0; i < 5; ++i)
{
m_names[i] = names[i].c_str();
m_lens[i] = names[i].size();
}
}
void WriteProlog(std::ostream & s, LogLevel level)
void WriteProlog(ostream & s, LogLevel level)
{
s << "LOG";
@ -83,34 +92,32 @@ public:
s << " " << m_names[level];
double const sec = m_timer.ElapsedSeconds();
s << " " << std::setfill(' ') << std::setw(static_cast<int>(16 - m_lens[level])) << sec << " ";
s << " " << setfill(' ') << setw(static_cast<int>(16 - m_lens[level])) << sec << " ";
}
};
std::mutex g_logMutex;
void LogMessageDefault(LogLevel level, SrcPoint const & srcPoint, std::string const & msg)
void LogMessageDefault(LogLevel level, SrcPoint const & srcPoint, string const & msg)
{
std::lock_guard<std::mutex> lock(g_logMutex);
lock_guard<mutex> lock(g_logMutex);
static LogHelper logger;
std::ostringstream out;
ostringstream out;
logger.WriteProlog(out, level);
out << DebugPrint(srcPoint) << msg << std::endl;
std::cerr << out.str();
out << DebugPrint(srcPoint) << msg << endl;
cerr << out.str();
CHECK_LESS(level, g_LogAbortLevel, ("Abort. Log level is too serious", level));
}
void LogMessageTests(LogLevel level, SrcPoint const &, std::string const & msg)
void LogMessageTests(LogLevel level, SrcPoint const &, string const & msg)
{
std::lock_guard<std::mutex> lock(g_logMutex);
lock_guard<mutex> lock(g_logMutex);
std::ostringstream out;
out << msg << std::endl;
std::cerr << out.str();
ostringstream out;
out << msg << endl;
cerr << out.str();
CHECK_LESS(level, g_LogAbortLevel, ("Abort. Log level is too serious", level));
}
@ -119,7 +126,7 @@ LogMessageFn LogMessage = &LogMessageDefault;
LogMessageFn SetLogMessageFn(LogMessageFn fn)
{
std::swap(LogMessage, fn);
swap(LogMessage, fn);
return fn;
}
@ -141,6 +148,6 @@ LogLevel GetDefaultLogAbortLevel()
#endif // defined(DEBUG)
}
TLogLevel g_LogLevel = {GetDefaultLogLevel()};
TLogLevel g_LogAbortLevel = {GetDefaultLogAbortLevel()};
AtomicLogLevel g_LogLevel = {GetDefaultLogLevel()};
AtomicLogLevel g_LogAbortLevel = {GetDefaultLogAbortLevel()};
} // namespace my

22
base/logging.hpp
View file

@ -22,15 +22,15 @@ std::string ToString(LogLevel level);
bool FromString(std::string const & s, LogLevel & level);
std::vector<std::string> const & GetLogLevelNames();
using TLogLevel = std::atomic<LogLevel>;
typedef void (*LogMessageFn)(LogLevel level, SrcPoint const &, std::string const &);
using AtomicLogLevel = std::atomic<LogLevel>;
using LogMessageFn = void (*)(LogLevel level, SrcPoint const &, std::string const &);
LogLevel GetDefaultLogLevel();
LogLevel GetDefaultLogAbortLevel();
extern LogMessageFn LogMessage;
extern TLogLevel g_LogLevel;
extern TLogLevel g_LogAbortLevel;
extern AtomicLogLevel g_LogLevel;
extern AtomicLogLevel g_LogAbortLevel;
/// @return Pointer to previous message function.
LogMessageFn SetLogMessageFn(LogMessageFn fn);
@ -73,24 +73,14 @@ using ::my::LCRITICAL;
#define LOG(level, msg) \
do \
{ \
if ((level) < ::my::g_LogLevel) \
{ \
} \
else \
{ \
if (!((level) < ::my::g_LogLevel)) \
::my::LogMessage(level, SRC(), ::my::impl::Message msg); \
} \
} while (false)
// Logging macro with short info (without entry point)
#define LOG_SHORT(level, msg) \
do \
{ \
if ((level) < ::my::g_LogLevel) \
{ \
} \
else \
{ \
if (!((level) < ::my::g_LogLevel)) \
::my::LogMessage(level, my::SrcPoint(), ::my::impl::Message msg); \
} \
} while (false)