games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-04-02 22:05:43 +02:00
Code Issues Releases Activity

Relaxed Mutex of Logger. Attempt to optimize format function.

Browse Source
This commit is contained in:
DjWarmonger 2015-08-30 19:26:19 +02:00
parent 2012d53dd6
commit cdad9f88b7
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/logging/CLogger.cpp
View File

@ -230,13 +230,10 @@ std::string CLogFormatter::format(const LogRecord & record) const
{ {
std::string message = pattern; std::string message = pattern;
// Format date //Format date
dateStream.str(std::string()); boost::algorithm::replace_first(message, "%d", boost::posix_time::to_simple_string (record.timeStamp));
dateStream.clear();
dateStream << record.timeStamp;
boost::algorithm::replace_first(message, "%d", dateStream.str());
// Format log level //Format log level
std::string level; std::string level;
switch(record.level) switch(record.level)
{ {
@ -258,11 +255,13 @@ std::string CLogFormatter::format(const LogRecord & record) const
} }
boost::algorithm::replace_first(message, "%l", level); boost::algorithm::replace_first(message, "%l", level);
// Format name, thread id and message //Format name, thread id and message
boost::algorithm::replace_first(message, "%n", record.domain.getName()); boost::algorithm::replace_first(message, "%n", record.domain.getName());
boost::algorithm::replace_first(message, "%t", boost::lexical_cast<std::string>(record.threadId)); boost::algorithm::replace_first(message, "%t", record.threadId);
boost::algorithm::replace_first(message, "%m", record.message); boost::algorithm::replace_first(message, "%m", record.message);
//return boost::to_string (boost::format("%d %d %d[%d] - %d") % dateStream.str() % level % record.domain.getName() % record.threadId % record.message);
return message; return message;
} }
@ -365,8 +364,9 @@ CLogFileTarget::CLogFileTarget(boost::filesystem::path filePath, bool append /*=
void CLogFileTarget::write(const LogRecord & record) void CLogFileTarget::write(const LogRecord & record)
{ {
std::string message = formatter.format(record); //formatting is slow, do it outside the lock
TLockGuard _(mx); TLockGuard _(mx);
file << formatter.format(record) << std::endl; file << message << std::endl;
} }
const CLogFormatter & CLogFileTarget::getFormatter() const { return formatter; } const CLogFormatter & CLogFileTarget::getFormatter() const { return formatter; }

9
lib/logging/CLogger.h
View File

@ -188,14 +188,17 @@ private:
struct DLL_LINKAGE LogRecord struct DLL_LINKAGE LogRecord
{ {
LogRecord(const CLoggerDomain & domain, ELogLevel::ELogLevel level, const std::string & message) LogRecord(const CLoggerDomain & domain, ELogLevel::ELogLevel level, const std::string & message)
: domain(domain), level(level), message(message), timeStamp(boost::posix_time::microsec_clock::local_time()), : domain(domain),
threadId(boost::this_thread::get_id()) { } level(level),
message(message),
timeStamp(boost::posix_time::microsec_clock::local_time()),
threadId(boost::lexical_cast<std::string>(boost::this_thread::get_id())) { }
CLoggerDomain domain; CLoggerDomain domain;
ELogLevel::ELogLevel level; ELogLevel::ELogLevel level;
std::string message; std::string message;
boost::posix_time::ptime timeStamp; boost::posix_time::ptime timeStamp;
boost::thread::id threadId; std::string threadId;
}; };
/// The class CLogFormatter formats log records. /// The class CLogFormatter formats log records.