From c8610d9a86ae8b237895f7c2d6baa42cdf292d96 Mon Sep 17 00:00:00 2001 From: gabime Date: Fri, 6 Apr 2018 02:24:07 +0300 Subject: [PATCH] support for color formatting --- bench/boost-bench-mt.cpp | 1 - bench/easylogging-bench-async.cpp | 2 +- bench/easylogging-bench-mt.cpp | 2 +- bench/easylogging-bench.cpp | 4 +-- bench/g3log-async.cpp | 5 +-- bench/glog-bench.cpp | 1 - bench/log4cplus-bench-mt.cpp | 14 ++++----- bench/log4cplus-bench.cpp | 12 +++---- bench/log4cpp-bench-mt.cpp | 12 +++---- bench/log4cpp-bench.cpp | 10 +++--- bench/p7-bench-mt.cpp | 23 ++++++-------- bench/p7-bench.cpp | 18 +++++------ bench/spdlog-async.cpp | 6 ++-- bench/spdlog-bench-mt.cpp | 2 +- include/spdlog/details/log_msg.h | 3 ++ include/spdlog/details/os.h | 2 +- .../spdlog/details/pattern_formatter_impl.h | 31 ++++++++++++++++++- include/spdlog/sinks/ansicolor_sink.h | 30 ++++++++++++------ 18 files changed, 105 insertions(+), 73 deletions(-) diff --git a/bench/boost-bench-mt.cpp b/bench/boost-bench-mt.cpp index 3a6eeea8..a076e6e4 100644 --- a/bench/boost-bench-mt.cpp +++ b/bench/boost-bench-mt.cpp @@ -82,6 +82,5 @@ int main(int argc, char *argv[]) std::cout << "Delta = " << deltaf << " seconds" << std::endl; std::cout << "Rate = " << rate << "/sec" << std::endl; - return 0; } diff --git a/bench/easylogging-bench-async.cpp b/bench/easylogging-bench-async.cpp index 81985a6a..e9b0dc84 100644 --- a/bench/easylogging-bench-async.cpp +++ b/bench/easylogging-bench-async.cpp @@ -11,8 +11,8 @@ #define ELPP_THREAD_SAFE #define ELPP_EXPERIMENTAL_ASYNC -#include "easylogging++.h" #include "easylogging++.cc" +#include "easylogging++.h" INITIALIZE_EASYLOGGINGPP using namespace std; diff --git a/bench/easylogging-bench-mt.cpp b/bench/easylogging-bench-mt.cpp index cfcf3348..7601d3c0 100644 --- a/bench/easylogging-bench-mt.cpp +++ b/bench/easylogging-bench-mt.cpp @@ -10,8 +10,8 @@ #include #define ELPP_THREAD_SAFE -#include "easylogging++.h" #include "easylogging++.cc" +#include "easylogging++.h" INITIALIZE_EASYLOGGINGPP using namespace std; diff --git a/bench/easylogging-bench.cpp b/bench/easylogging-bench.cpp index 06b66134..15c093d8 100644 --- a/bench/easylogging-bench.cpp +++ b/bench/easylogging-bench.cpp @@ -6,8 +6,8 @@ #include #include -#include "easylogging++.h" #include "easylogging++.cc" +#include "easylogging++.h" INITIALIZE_EASYLOGGINGPP int main(int, char *[]) @@ -21,7 +21,7 @@ int main(int, char *[]) el::Configurations conf("easyl.conf"); el::Loggers::reconfigureLogger("default", conf); - el::Logger* defaultLogger = el::Loggers::getLogger("default"); + el::Logger *defaultLogger = el::Loggers::getLogger("default"); auto start = clock::now(); for (int i = 0; i < howmany; ++i) diff --git a/bench/g3log-async.cpp b/bench/g3log-async.cpp index b5e15a2b..61ed72df 100644 --- a/bench/g3log-async.cpp +++ b/bench/g3log-async.cpp @@ -13,7 +13,8 @@ #include "g3log/logworker.hpp" using namespace std; -template std::string format(const T &value); +template +std::string format(const T &value); int main(int argc, char *argv[]) { @@ -27,7 +28,7 @@ int main(int argc, char *argv[]) int howmany = 1000000; auto worker = g3::LogWorker::createLogWorker(); - auto handle= worker->addDefaultLogger(argv[0], "logs"); + auto handle = worker->addDefaultLogger(argv[0], "logs"); g3::initializeLogging(worker.get()); std::atomic msg_counter{0}; diff --git a/bench/glog-bench.cpp b/bench/glog-bench.cpp index 6b4445a9..7469896c 100644 --- a/bench/glog-bench.cpp +++ b/bench/glog-bench.cpp @@ -8,7 +8,6 @@ #include "glog/logging.h" - int main(int, char *argv[]) { using namespace std::chrono; diff --git a/bench/log4cplus-bench-mt.cpp b/bench/log4cplus-bench-mt.cpp index 6acbf3fa..72e2681c 100644 --- a/bench/log4cplus-bench-mt.cpp +++ b/bench/log4cplus-bench-mt.cpp @@ -10,17 +10,17 @@ #include #include -#include "log4cplus/logger.h" #include "log4cplus/fileappender.h" -#include "log4cplus/layout.h" -#include "log4cplus/ndc.h" #include "log4cplus/helpers/loglog.h" #include "log4cplus/helpers/property.h" +#include "log4cplus/layout.h" +#include "log4cplus/logger.h" #include "log4cplus/loggingmacros.h" +#include "log4cplus/ndc.h" using namespace log4cplus; -int main(int argc, char * argv[]) +int main(int argc, char *argv[]) { using namespace std::chrono; using clock = steady_clock; @@ -32,13 +32,11 @@ int main(int argc, char * argv[]) int howmany = 1000000; log4cplus::initialize(); - SharedFileAppenderPtr append( - new FileAppender(LOG4CPLUS_TEXT("logs/log4cplus-bench-mt.log"), std::ios_base::trunc, - true, true)); + SharedFileAppenderPtr append(new FileAppender(LOG4CPLUS_TEXT("logs/log4cplus-bench-mt.log"), std::ios_base::trunc, true, true)); append->setName(LOG4CPLUS_TEXT("File")); log4cplus::tstring pattern = LOG4CPLUS_TEXT("%d{%Y-%m-%d %H:%M:%S.%Q}: %p - %m %n"); - append->setLayout( std::auto_ptr(new PatternLayout(pattern)) ); + append->setLayout(std::auto_ptr(new PatternLayout(pattern))); append->getloc(); Logger::getRoot().addAppender(SharedAppenderPtr(append.get())); diff --git a/bench/log4cplus-bench.cpp b/bench/log4cplus-bench.cpp index e522e85a..e738aecd 100644 --- a/bench/log4cplus-bench.cpp +++ b/bench/log4cplus-bench.cpp @@ -7,13 +7,13 @@ #include #include -#include "log4cplus/logger.h" #include "log4cplus/fileappender.h" -#include "log4cplus/layout.h" -#include "log4cplus/ndc.h" #include "log4cplus/helpers/loglog.h" #include "log4cplus/helpers/property.h" +#include "log4cplus/layout.h" +#include "log4cplus/logger.h" #include "log4cplus/loggingmacros.h" +#include "log4cplus/ndc.h" using namespace log4cplus; @@ -25,13 +25,11 @@ int main(int, char *[]) int howmany = 1000000; log4cplus::initialize(); - SharedFileAppenderPtr append( - new FileAppender(LOG4CPLUS_TEXT("logs/log4cplus-bench.log"), std::ios_base::trunc, - true, true)); + SharedFileAppenderPtr append(new FileAppender(LOG4CPLUS_TEXT("logs/log4cplus-bench.log"), std::ios_base::trunc, true, true)); append->setName(LOG4CPLUS_TEXT("File")); log4cplus::tstring pattern = LOG4CPLUS_TEXT("%d{%Y-%m-%d %H:%M:%S.%Q}: %p - %m %n"); - append->setLayout( std::auto_ptr(new PatternLayout(pattern)) ); + append->setLayout(std::auto_ptr(new PatternLayout(pattern))); append->getloc(); Logger::getRoot().addAppender(SharedAppenderPtr(append.get())); diff --git a/bench/log4cpp-bench-mt.cpp b/bench/log4cpp-bench-mt.cpp index dc6a5f58..b96b8e1b 100644 --- a/bench/log4cpp-bench-mt.cpp +++ b/bench/log4cpp-bench-mt.cpp @@ -10,15 +10,15 @@ #include #include -#include "log4cpp/Category.hh" #include "log4cpp/Appender.hh" +#include "log4cpp/BasicLayout.hh" +#include "log4cpp/Category.hh" #include "log4cpp/FileAppender.hh" #include "log4cpp/Layout.hh" -#include "log4cpp/BasicLayout.hh" -#include "log4cpp/Priority.hh" #include "log4cpp/PatternLayout.hh" +#include "log4cpp/Priority.hh" -int main(int argc, char * argv[]) +int main(int argc, char *argv[]) { using namespace std::chrono; using clock = steady_clock; @@ -29,12 +29,12 @@ int main(int argc, char * argv[]) int howmany = 1000000; - log4cpp::Appender *appender = new log4cpp::FileAppender("default", "logs/log4cpp-bench-mt.log"); + log4cpp::Appender *appender = new log4cpp::FileAppender("default", "logs/log4cpp-bench-mt.log"); log4cpp::PatternLayout *layout = new log4cpp::PatternLayout(); layout->setConversionPattern("%d{%Y-%m-%d %H:%M:%S.%l}: %p - %m %n"); appender->setLayout(layout); - log4cpp::Category& root = log4cpp::Category::getRoot(); + log4cpp::Category &root = log4cpp::Category::getRoot(); root.addAppender(appender); root.setPriority(log4cpp::Priority::INFO); diff --git a/bench/log4cpp-bench.cpp b/bench/log4cpp-bench.cpp index a21526c8..75029817 100644 --- a/bench/log4cpp-bench.cpp +++ b/bench/log4cpp-bench.cpp @@ -7,13 +7,13 @@ #include #include -#include "log4cpp/Category.hh" #include "log4cpp/Appender.hh" +#include "log4cpp/BasicLayout.hh" +#include "log4cpp/Category.hh" #include "log4cpp/FileAppender.hh" #include "log4cpp/Layout.hh" -#include "log4cpp/BasicLayout.hh" -#include "log4cpp/Priority.hh" #include "log4cpp/PatternLayout.hh" +#include "log4cpp/Priority.hh" int main(int, char *[]) { @@ -22,12 +22,12 @@ int main(int, char *[]) int howmany = 1000000; - log4cpp::Appender *appender = new log4cpp::FileAppender("default", "logs/log4cpp-bench.log"); + log4cpp::Appender *appender = new log4cpp::FileAppender("default", "logs/log4cpp-bench.log"); log4cpp::PatternLayout *layout = new log4cpp::PatternLayout(); layout->setConversionPattern("%d{%Y-%m-%d %H:%M:%S.%l}: %p - %m %n"); appender->setLayout(layout); - log4cpp::Category& root = log4cpp::Category::getRoot(); + log4cpp::Category &root = log4cpp::Category::getRoot(); root.addAppender(appender); root.setPriority(log4cpp::Priority::INFO); diff --git a/bench/p7-bench-mt.cpp b/bench/p7-bench-mt.cpp index a3195208..996922c9 100644 --- a/bench/p7-bench-mt.cpp +++ b/bench/p7-bench-mt.cpp @@ -5,15 +5,14 @@ #include #include +#include #include +#include #include #include -#include -#include #include "P7_Trace.h" - int main(int argc, char *argv[]) { using namespace std::chrono; @@ -27,10 +26,9 @@ int main(int argc, char *argv[]) IP7_Trace::hModule module = NULL; - //create P7 client object - std::unique_ptr> client( - P7_Create_Client(TM("/P7.Pool=1024 /P7.Sink=FileTxt /P7.Dir=logs/p7-bench-mt")), - [&](IP7_Client *ptr){ + // create P7 client object + std::unique_ptr> client( + P7_Create_Client(TM("/P7.Pool=1024 /P7.Sink=FileTxt /P7.Dir=logs/p7-bench-mt")), [&](IP7_Client *ptr) { if (ptr) ptr->Release(); }); @@ -41,10 +39,9 @@ int main(int argc, char *argv[]) return 1; } - //create P7 trace object 1 - std::unique_ptr> trace( - P7_Create_Trace(client.get(), TM("Trace channel 1")), - [&](IP7_Trace *ptr){ + // create P7 trace object 1 + std::unique_ptr> trace( + P7_Create_Trace(client.get(), TM("Trace channel 1")), [&](IP7_Trace *ptr) { if (ptr) ptr->Release(); }); @@ -65,7 +62,7 @@ int main(int argc, char *argv[]) for (int t = 0; t < thread_count; ++t) { threads.push_back(std::thread([&]() { - trace->Register_Thread(TM("Application"), t+1); + trace->Register_Thread(TM("Application"), t + 1); while (true) { int counter = ++msg_counter; @@ -73,7 +70,7 @@ int main(int argc, char *argv[]) break; trace->P7_INFO(module, TM("p7 message #%d: This is some text for your pleasure"), counter); } - trace->Register_Thread(TM("Application"), t+1); + trace->Register_Thread(TM("Application"), t + 1); })); } diff --git a/bench/p7-bench.cpp b/bench/p7-bench.cpp index 15513ca5..25c39b03 100644 --- a/bench/p7-bench.cpp +++ b/bench/p7-bench.cpp @@ -4,13 +4,12 @@ // #include +#include #include #include -#include #include "P7_Trace.h" - int main(int, char *[]) { using namespace std::chrono; @@ -20,10 +19,9 @@ int main(int, char *[]) IP7_Trace::hModule module = NULL; - //create P7 client object - std::unique_ptr> client( - P7_Create_Client(TM("/P7.Pool=1024 /P7.Sink=FileTxt /P7.Dir=logs/p7-bench")), - [&](IP7_Client *ptr){ + // create P7 client object + std::unique_ptr> client( + P7_Create_Client(TM("/P7.Pool=1024 /P7.Sink=FileTxt /P7.Dir=logs/p7-bench")), [&](IP7_Client *ptr) { if (ptr) ptr->Release(); }); @@ -34,10 +32,9 @@ int main(int, char *[]) return 1; } - //create P7 trace object 1 - std::unique_ptr> trace( - P7_Create_Trace(client.get(), TM("Trace channel 1")), - [&](IP7_Trace *ptr){ + // create P7 trace object 1 + std::unique_ptr> trace( + P7_Create_Trace(client.get(), TM("Trace channel 1")), [&](IP7_Trace *ptr) { if (ptr) ptr->Release(); }); @@ -55,7 +52,6 @@ int main(int, char *[]) for (int i = 0; i < howmany; ++i) trace->P7_INFO(module, TM("p7 message #%d: This is some text for your pleasure"), i); - duration delta = clock::now() - start; float deltaf = delta.count(); auto rate = howmany / deltaf; diff --git a/bench/spdlog-async.cpp b/bench/spdlog-async.cpp index e1d1a95f..e8b70009 100644 --- a/bench/spdlog-async.cpp +++ b/bench/spdlog-async.cpp @@ -5,8 +5,8 @@ #include #include -#include #include +#include #include #include @@ -36,7 +36,7 @@ int main(int argc, char *argv[]) run = false; })); - while(run) + while (run) { std::atomic msg_counter{0}; std::vector threads; @@ -68,7 +68,7 @@ int main(int argc, char *argv[]) std::cout << "Threads: " << thread_count << std::endl; std::cout << "Delta = " << std::fixed << deltaf << " seconds" << std::endl; std::cout << "Rate = " << std::fixed << rate << "/sec" << std::endl; - } //while + } // while stoper.join(); diff --git a/bench/spdlog-bench-mt.cpp b/bench/spdlog-bench-mt.cpp index b4948e73..62dd9cc7 100644 --- a/bench/spdlog-bench-mt.cpp +++ b/bench/spdlog-bench-mt.cpp @@ -5,8 +5,8 @@ #include #include -#include #include +#include #include #include diff --git a/include/spdlog/details/log_msg.h b/include/spdlog/details/log_msg.h index 9a03318d..1d079aaf 100644 --- a/include/spdlog/details/log_msg.h +++ b/include/spdlog/details/log_msg.h @@ -40,6 +40,9 @@ struct log_msg fmt::MemoryWriter raw; fmt::MemoryWriter formatted; size_t msg_id{0}; + // wrap this range with color codes + size_t color_range_start{0}; + size_t color_range_end{0}; }; } // namespace details } // namespace spdlog diff --git a/include/spdlog/details/os.h b/include/spdlog/details/os.h index 5a5dbde8..2eeeeb38 100644 --- a/include/spdlog/details/os.h +++ b/include/spdlog/details/os.h @@ -238,7 +238,7 @@ inline size_t filesize(FILE *f) int fd = fileno(f); // 64 bits(but not in osx or cygwin, where fstat64 is deprecated) #if !defined(__FreeBSD__) && !defined(__APPLE__) && (defined(__x86_64__) || defined(__ppc64__)) && !defined(__CYGWIN__) - struct stat64 st; + struct stat64 st; if (fstat64(fd, &st) == 0) { return static_cast(st.st_size); diff --git a/include/spdlog/details/pattern_formatter_impl.h b/include/spdlog/details/pattern_formatter_impl.h index 9aa634e7..d8b92f9b 100644 --- a/include/spdlog/details/pattern_formatter_impl.h +++ b/include/spdlog/details/pattern_formatter_impl.h @@ -421,7 +421,24 @@ private: std::string _str; }; +// set the color range. expect it to be in the form of "%^colored text%$" +class start_color_formatter SPDLOG_FINAL : public flag_formatter +{ + void format(details::log_msg &msg, const std::tm &) override + { + msg.color_range_start = msg.formatted.size(); + } +}; +class stop_color_formatter SPDLOG_FINAL : public flag_formatter +{ + void format(details::log_msg &msg, const std::tm &) override + { + msg.color_range_end = msg.formatted.size(); + } +}; + // Full info formatter + // pattern: [%Y-%m-%d %H:%M:%S.%e] [%n] [%l] %v class full_formatter SPDLOG_FINAL : public flag_formatter { @@ -462,8 +479,13 @@ class full_formatter SPDLOG_FINAL : public flag_formatter msg.formatted << '[' << *msg.logger_name << "] "; #endif - msg.formatted << '[' << level::to_str(msg.level) << "] "; + const char *level_name = level::to_str(msg.level); + size_t level_name_size = strlen(level_name); + msg.formatted << '[' << fmt::StringRef(level_name, level_name_size) << "] "; msg.formatted << fmt::StringRef(msg.raw.data(), msg.raw.size()); + // wrap the level with color + msg.color_range_start = 37; + msg.color_range_end = 37 + level_name_size; } }; @@ -491,6 +513,7 @@ inline void spdlog::pattern_formatter::compile_pattern(const std::string &patter { _formatters.push_back(std::move(user_chars)); } + // if( if (++it != end) { handle_flag(*it); @@ -644,6 +667,12 @@ inline void spdlog::pattern_formatter::handle_flag(char flag) case ('i'): _formatters.emplace_back(new details::i_formatter()); break; + case ('^'): + _formatters.emplace_back(new details::start_color_formatter()); + break; + case ('$'): + _formatters.emplace_back(new details::stop_color_formatter()); + break; default: // Unknown flag appears as is _formatters.emplace_back(new details::ch_formatter('%')); diff --git a/include/spdlog/sinks/ansicolor_sink.h b/include/spdlog/sinks/ansicolor_sink.h index 9e7f1a59..8f086c8e 100644 --- a/include/spdlog/sinks/ansicolor_sink.h +++ b/include/spdlog/sinks/ansicolor_sink.h @@ -28,9 +28,9 @@ public: : target_file_(file) { should_do_colors_ = details::os::in_terminal(file) && details::os::is_color_terminal(); - colors_[level::trace] = cyan; + colors_[level::trace] = magenta; colors_[level::debug] = cyan; - colors_[level::info] = reset; + colors_[level::info] = green; colors_[level::warn] = yellow + bold; colors_[level::err] = red + bold; colors_[level::critical] = bold + on_red; @@ -83,17 +83,20 @@ protected: { // Wrap the originally formatted message in color codes. // If color is not supported in the terminal, log as is instead. - if (should_do_colors_) + if (should_do_colors_ && msg.color_range_end > msg.color_range_start) { - const std::string &prefix = colors_[msg.level]; - fwrite(prefix.data(), sizeof(char), prefix.size(), target_file_); - fwrite(msg.formatted.data(), sizeof(char), msg.formatted.size(), target_file_); - fwrite(reset.data(), sizeof(char), reset.size(), target_file_); - fwrite(clear_line.data(), sizeof(char), clear_line.size(), target_file_); + // before color range + _print_range(msg, 0, msg.color_range_start); + // in color range + _print_ccode(colors_[msg.level]); + _print_range(msg, msg.color_range_start, msg.color_range_end); + _print_ccode(reset); + // after color range + _print_range(msg, msg.color_range_end, msg.formatted.size()); } else { - fwrite(msg.formatted.data(), sizeof(char), msg.formatted.size(), target_file_); + _print_range(msg, 0, msg.formatted.size()); } _flush(); } @@ -103,6 +106,15 @@ protected: fflush(target_file_); } +private: + void _print_ccode(const std::string &color_code) + { + fwrite(color_code.data(), sizeof(char), color_code.size(), target_file_); + } + void _print_range(const details::log_msg &msg, size_t start, size_t end) + { + fwrite(msg.formatted.data() + start, sizeof(char), end - start, target_file_); + } FILE *target_file_; bool should_do_colors_; std::unordered_map colors_;