Logging: check for filter before sending to the queue, to skip all heavy formatting on the other thread.

This commit is contained in:
Emmanuel Gil Peyrot 2015-03-06 19:15:02 +01:00
parent 53ba65db43
commit 0aa44e238d
7 changed files with 21 additions and 9 deletions

View file

@ -22,7 +22,8 @@
int __cdecl main(int argc, char **argv) { int __cdecl main(int argc, char **argv) {
std::shared_ptr<Log::Logger> logger = Log::InitGlobalLogger(); std::shared_ptr<Log::Logger> logger = Log::InitGlobalLogger();
Log::Filter log_filter(Log::Level::Debug); Log::Filter log_filter(Log::Level::Debug);
std::thread logging_thread(Log::TextLoggingLoop, logger, &log_filter); Log::SetFilter(&log_filter);
std::thread logging_thread(Log::TextLoggingLoop, logger);
SCOPE_EXIT({ SCOPE_EXIT({
logger->Close(); logger->Close();
logging_thread.join(); logging_thread.join();

View file

@ -310,7 +310,8 @@ int __cdecl main(int argc, char* argv[])
{ {
std::shared_ptr<Log::Logger> logger = Log::InitGlobalLogger(); std::shared_ptr<Log::Logger> logger = Log::InitGlobalLogger();
Log::Filter log_filter(Log::Level::Info); Log::Filter log_filter(Log::Level::Info);
std::thread logging_thread(Log::TextLoggingLoop, logger, &log_filter); Log::SetFilter(&log_filter);
std::thread logging_thread(Log::TextLoggingLoop, logger);
SCOPE_EXIT({ SCOPE_EXIT({
logger->Close(); logger->Close();
logging_thread.join(); logging_thread.join();

View file

@ -135,9 +135,18 @@ Entry CreateEntry(Class log_class, Level log_level,
return std::move(entry); return std::move(entry);
} }
static Filter* filter;
void SetFilter(Filter* new_filter) {
filter = new_filter;
}
void LogMessage(Class log_class, Level log_level, void LogMessage(Class log_class, Level log_level,
const char* filename, unsigned int line_nr, const char* function, const char* filename, unsigned int line_nr, const char* function,
const char* format, ...) { const char* format, ...) {
if (!filter->CheckMessage(log_class, log_level))
return;
va_list args; va_list args;
va_start(args, format); va_start(args, format);
Entry entry = CreateEntry(log_class, log_level, Entry entry = CreateEntry(log_class, log_level,

View file

@ -10,6 +10,7 @@
#include "common/concurrent_ring_buffer.h" #include "common/concurrent_ring_buffer.h"
#include "common/logging/filter.h"
#include "common/logging/log.h" #include "common/logging/log.h"
namespace Log { namespace Log {
@ -131,4 +132,6 @@ Entry CreateEntry(Class log_class, Level log_level,
/// Initializes the default Logger. /// Initializes the default Logger.
std::shared_ptr<Logger> InitGlobalLogger(); std::shared_ptr<Logger> InitGlobalLogger();
void SetFilter(Filter* filter);
} }

View file

@ -2,6 +2,8 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#pragma once
#include <array> #include <array>
#include <string> #include <string>

View file

@ -11,7 +11,6 @@
#endif #endif
#include "common/logging/backend.h" #include "common/logging/backend.h"
#include "common/logging/filter.h"
#include "common/logging/log.h" #include "common/logging/log.h"
#include "common/logging/text_formatter.h" #include "common/logging/text_formatter.h"
@ -116,7 +115,7 @@ void PrintColoredMessage(const Entry& entry) {
#endif #endif
} }
void TextLoggingLoop(std::shared_ptr<Logger> logger, const Filter* filter) { void TextLoggingLoop(std::shared_ptr<Logger> logger) {
std::array<Entry, 256> entry_buffer; std::array<Entry, 256> entry_buffer;
while (true) { while (true) {
@ -126,11 +125,9 @@ void TextLoggingLoop(std::shared_ptr<Logger> logger, const Filter* filter) {
} }
for (size_t i = 0; i < num_entries; ++i) { for (size_t i = 0; i < num_entries; ++i) {
const Entry& entry = entry_buffer[i]; const Entry& entry = entry_buffer[i];
if (filter->CheckMessage(entry.log_class, entry.log_level)) {
PrintColoredMessage(entry); PrintColoredMessage(entry);
} }
} }
}
} }
} }

View file

@ -11,7 +11,6 @@ namespace Log {
class Logger; class Logger;
struct Entry; struct Entry;
class Filter;
/** /**
* Attempts to trim an arbitrary prefix from `path`, leaving only the part starting at `root`. It's * Attempts to trim an arbitrary prefix from `path`, leaving only the part starting at `root`. It's
@ -36,6 +35,6 @@ void PrintColoredMessage(const Entry& entry);
* Logging loop that repeatedly reads messages from the provided logger and prints them to the * Logging loop that repeatedly reads messages from the provided logger and prints them to the
* console. It is the baseline barebones log outputter. * console. It is the baseline barebones log outputter.
*/ */
void TextLoggingLoop(std::shared_ptr<Logger> logger, const Filter* filter); void TextLoggingLoop(std::shared_ptr<Logger> logger);
} }