small fix to example.sln

We can control should daily_file_sink truncate an underlying file or not

CMakeLists.txt

@@ -4,7 +4,7 @@
 #
 
 cmake_minimum_required(VERSION 3.1)
-project(spdlog VERSION 0.16.3 LANGUAGES CXX)
+project(spdlog VERSION 1.0.0 LANGUAGES CXX)
 include(CTest)
 include(CMakeDependentOption)
 include(GNUInstallDirs)

README.md

@@ -6,7 +6,7 @@ Very fast, header only, C++ logging library. [![Build Status](https://travis-ci.
 ## Install
 #### Just copy the headers:
 
-* Copy the source [folder](https://github.com/gabime/spdlog/tree/master/include/spdlog) to your build tree and use a C++11 compiler.
+* Copy the source [folder](https://github.com/gabime/spdlog/tree/v1.x/include/spdlog) to your build tree and use a C++11 compiler.
 
 #### Or use your favorite package manager:
 
@@ -20,7 +20,7 @@ Very fast, header only, C++ logging library. [![Build Status](https://travis-ci.
  
 
 ## Platforms
- * Linux, FreeBSD, Solaris
+ * Linux, FreeBSD, Solaris, AIX
  * Windows (vc 2013+, cygwin)
  * Mac OSX (clang 3.5+)
  * Android
@@ -29,8 +29,7 @@ Very fast, header only, C++ logging library. [![Build Status](https://travis-ci.
 * Very fast - performance is the primary goal (see [benchmarks](#benchmarks) below).
 * Headers only, just copy and use.
 * Feature rich [call style](#usage-example) using the excellent [fmt](https://github.com/fmtlib/fmt) library.
-* Optional printf syntax support.
-* Extremely fast asynchronous mode (optional) - using lockfree queues and other tricks to reach millions of calls/sec.
+* Fast asynchronous mode (optional)
 * [Custom](https://github.com/gabime/spdlog/wiki/3.-Custom-formatting) formatting.
 * Conditional Logging
 * Multi/Single threaded loggers.
@@ -47,175 +46,215 @@ Very fast, header only, C++ logging library. [![Build Status](https://travis-ci.
 
 ## Benchmarks
 
-Below are some [benchmarks](bench) comparing popular log libraries under Ubuntu 64 bit, Intel i7-4770 CPU @ 3.40GHz
+Below are some [benchmarks](https://github.com/gabime/spdlog/blob/v1.x/bench/bench.cpp) done in Ubuntu 64 bit, Intel i7-4770 CPU @ 3.40GHz
 
 #### Synchronous mode
-Time needed to log 1,000,000 lines in synchronous mode (in seconds, the best of 3 runs):
-
-|threads|boost log 1.54|glog   |easylogging |spdlog|
-|-------|:-------:|:-----:|----------:|------:|
-|1|       4.169s  |1.066s |0.975s     |0.302s|
-|10|     6.180s   |3.032s |2.857s     |0.968s|
-|100|     5.981s  |1.139s |4.512s     |0.497s|
-
+```
+*******************************************************************************
+Single thread, 1,000,000 iterations
+*******************************************************************************
+basic_st...		Elapsed: 0.231041	4,328,228/sec
+rotating...             Elapsed: 0.233466	4,283,282/sec
+daily_st...		Elapsed: 0.244491	4,090,136/sec
+null_st...		Elapsed: 0.162708	6,145,995/sec
 
+*******************************************************************************
+10 threads sharing same logger, 1,000,000 iterations
+*******************************************************************************
+basic_mt...		Elapsed: 0.854029	1,170,920/sec
+rotating_mt		Elapsed: 0.867038	1,153,351/sec
+daily_mt...		Elapsed: 0.869593	1,149,963/sec
+null_mt...		Elapsed: 0.171215	2,033,537/sec
+```
 #### Asynchronous mode
-Time needed to log 1,000,000 lines in asynchronous mode, i.e. the time it takes to put them in the async queue (in seconds, the best of 3 runs):
+```
+*******************************************************************************
+10 threads sharing same logger, 1,000,000 iterations 
+*******************************************************************************
+async...		Elapsed: 0.442731	2,258,706/sec
+async...		Elapsed: 0.427072	2,341,527/sec
+async...		Elapsed: 0.449768	2,223,369/sec
+```
 
-|threads|g2log <sup>async logger</sup>   |spdlog <sup>async mode</sup>|
-|:-------|:-----:|-------------------------:|
-|1|       1.850s |0.216s |
-|10|      0.943s  |0.173s|
-|100|      0.959s |0.202s|
+## Usage samples
 
-
-
-
-## Usage Example
 ```c++
-
 #include "spdlog/spdlog.h"
-
-#include <iostream>
-#include <memory>
-
-void async_example();
-void syslog_example();
-void user_defined_example();
-void err_handler_example();
-
-namespace spd = spdlog;
-int main(int, char*[])
+#include "spdlog/sinks/stdout_color_sinks.h"
+void stdout_example()
 {
-    try
+    // create color multi threaded logger
+    auto console = spdlog::stdout_color_mt("console");
+    console->info("Welcome to spdlog!");
+    console->error("Some error message with arg: {}", 1);
+
+    auto err_logger = spdlog::stderr_color_mt("stderr");
+    err_logger->error("Some error message");
+
+    // Formatting examples
+    console->warn("Easy padding in numbers like {:08d}", 12);
+    console->critical("Support for int: {0:d};  hex: {0:x};  oct: {0:o}; bin: {0:b}", 42);
+    console->info("Support for floats {:03.2f}", 1.23456);
+    console->info("Positional args are {1} {0}..", "too", "supported");
+    console->info("{:<30}", "left aligned");
+
+    spdlog::get("console")->info("loggers can be retrieved from a global registry using the spdlog::get(logger_name)");
+
+    // Runtime log levels
+    spdlog::set_level(spdlog::level::info); // Set global log level to info
+    console->debug("This message should not be displayed!");
+    console->set_level(spdlog::level::trace); // Set specific logger's log level
+    console->debug("This message should be displayed..");
+
+    // Customize msg format for all loggers
+    spdlog::set_pattern("[%H:%M:%S %z] [%n] [%^---%L---%$] [thread %t] %v");
+    console->info("This an info message with custom format");
+
+    // Compile time log levels
+    // define SPDLOG_DEBUG_ON or SPDLOG_TRACE_ON
+    SPDLOG_TRACE(console, "Enabled only #ifdef SPDLOG_TRACE_ON..{} ,{}", 1, 3.23);
+    SPDLOG_DEBUG(console, "Enabled only #ifdef SPDLOG_DEBUG_ON.. {} ,{}", 1, 3.23);
+}
+```
+---
+#### Basic file logger
+```c++
+#include "spdlog/sinks/basic_file_sink.h"
+void basic_logfile_example()
+{
+    try 
     {
-        // Console logger with color
-        auto console = spd::stdout_color_mt("console");
-        console->info("Welcome to spdlog!");
-        console->error("Some error message with arg{}..", 1);
-	
-        // Formatting examples
-        console->warn("Easy padding in numbers like {:08d}", 12);
-        console->critical("Support for int: {0:d};  hex: {0:x};  oct: {0:o}; bin: {0:b}", 42);
-        console->info("Support for floats {:03.2f}", 1.23456);
-        console->info("Positional args are {1} {0}..", "too", "supported");
-        console->info("{:<30}", "left aligned");
-	
-	// Use global registry to retrieve loggers
-        spd::get("console")->info("loggers can be retrieved from a global registry using the spdlog::get(logger_name) function");
-        
-        // Create basic file logger (not rotated)
-        auto my_logger = spd::basic_logger_mt("basic_logger", "logs/basic.txt");
-        my_logger->info("Some log message");
-
-        // Create a file rotating logger with 5mb size max and 3 rotated files
-        auto rotating_logger = spd::rotating_logger_mt("some_logger_name", "logs/mylogfile.txt", 1048576 * 5, 3);
-        for (int i = 0; i < 10; ++i)
-            rotating_logger->info("{} * {} equals {:>10}", i, i, i*i);
-
-        // Create a daily logger - a new file is created every day on 2:30am
-        auto daily_logger = spd::daily_logger_mt("daily_logger", "logs/daily.txt", 2, 30);
-        // trigger flush if the log severity is error or higher
-        daily_logger->flush_on(spd::level::err);
-        daily_logger->info(123.44);
-
-        // Customize msg format for all messages
-        spd::set_pattern("[%^+++%$] [%H:%M:%S %z] [thread %t] %v");
-        console->info("This an info message with custom format (and custom color range between the '%^' and '%$')");
-	console->error("This an error message with custom format (and custom color range between the '%^' and '%$')");
-
-        // Runtime log levels
-	spd::set_level(spd::level::info); //Set global log level to info
-	console->debug("This message should not be displayed!");
-	console->set_level(spd::level::debug); // Set specific logger's log level
-	console->debug("This message should be displayed..");
-
-        // Compile time log levels
-        // define SPDLOG_DEBUG_ON or SPDLOG_TRACE_ON
-        SPDLOG_TRACE(console, "Enabled only #ifdef SPDLOG_TRACE_ON..{} ,{}", 1, 3.23);
-        SPDLOG_DEBUG(console, "Enabled only #ifdef SPDLOG_DEBUG_ON.. {} ,{}", 1, 3.23);
-
-        // Asynchronous logging is very fast..
-        // Just call spdlog::set_async_mode(q_size) and all created loggers from now on will be asynchronous..
-        async_example();
-
-        // syslog example. linux/osx only
-        syslog_example();
-
-        // android example. compile with NDK
-        android_example();
-
-        // Log user-defined types example
-        user_defined_example();
-
-        // Change default log error handler
-        err_handler_example();
-
-        // Apply a function on all registered loggers
-        spd::apply_all([&](std::shared_ptr<spd::logger> l)
-        {
-            l->info("End of example.");
-        });
-
-        // Release and close all loggers
-        spd::drop_all();
+        auto my_logger = spdlog::basic_logger_mt("basic_logger", "logs/basic-log.txt");
     }
-    // Exceptions will only be thrown upon failed logger or sink construction (not during logging)
-    catch (const spd::spdlog_ex& ex)
+    catch (const spdlog::spdlog_ex &ex)
     {
         std::cout << "Log init failed: " << ex.what() << std::endl;
         return 1;
     }
 }
-
-void async_example()
+```
+---
+#### Rotating files
+```c++
+#include "spdlog/sinks/rotating_file_sink.h"
+void rotating_example()
 {
-    size_t q_size = 4096; //queue size must be power of 2
-    spd::set_async_mode(q_size);
-    auto async_file = spd::daily_logger_st("async_file_logger", "logs/async_log.txt");
-    for (int i = 0; i < 100; ++i)
-        async_file->info("Async message #{}", i);
+    // Create a file rotating logger with 5mb size max and 3 rotated files
+    auto rotating_logger = spdlog::rotating_logger_mt("some_logger_name", "logs/rotating.txt", 1048576 * 5, 3);
 }
+```
 
-//syslog example
-void syslog_example()
+---
+#### Daily files
+```c++
+
+#include "spdlog/sinks/daily_file_sink.h"
+void daily_example()
 {
-#ifdef SPDLOG_ENABLE_SYSLOG 
-    std::string ident = "spdlog-example";
-    auto syslog_logger = spd::syslog_logger("syslog", ident, LOG_PID);
-    syslog_logger->warn("This is warning that will end up in syslog..");
-#endif
-}
-
-// user defined types logging by implementing operator<<
-struct my_type
-{
-    int i;
-    template<typename OStream>
-    friend OStream& operator<<(OStream& os, const my_type &c)
-    {
-        return os << "[my_type i="<<c.i << "]";
-    }
-};
-
-#include <spdlog/fmt/ostr.h> // must be included
-void user_defined_example()
-{
-    spd::get("console")->info("user defined type: {}", my_type { 14 });
-}
-
-//
-//custom error handler
-//
-void err_handler_example()
-{	
-	spd::set_error_handler([](const std::string& msg) {
-		std::cerr << "my err handler: " << msg << std::endl;
-	}); 
-	// (or logger->set_error_handler(..) to set for specific logger)
+    // Create a daily logger - a new file is created every day on 2:30am
+    auto daily_logger = spdlog::daily_logger_mt("daily_logger", "logs/daily.txt", 2, 30);
 }
 
 ```
 
+---
+#### Periodic flush
+```c++
+// periodically flush all *registered* loggers every 3 seconds:
+// warning: only use if all your loggers are thread safe!
+spdlog::flush_every(std::chrono::seconds(3));
+
+```
+
+---
+#### Asynchronous logging
+```c++
+#include "spdlog/async.h"
+void async_example()
+{
+    // default thread pool settings can be modified *before* creating the async logger:
+    // spdlog::init_thread_pool(8192, 1); // queue with 8k items and 1 backing thread.
+    auto async_file = spdlog::basic_logger_mt<spdlog::async_factory>("async_file_logger", "logs/async_log.txt");
+    // alternatively:
+    // auto async_file = spdlog::create_async<spdlog::sinks::basic_file_sink_mt>("async_file_logger", "logs/async_log.txt");   
+}
+
+```
+---
+#### Logger with multi targets - each with different format and log level
+```c++
+
+// create logger with 2 targets with different log levels and formats.
+// the console will show only warnings or errors, while the file will log all.
+void multi_sink_example()
+{
+    auto console_sink = std::make_shared<spdlog::sinks::stdout_color_sink_mt>();
+    console_sink->set_level(spdlog::level::warn);
+    console_sink->set_pattern("[multi_sink_example] [%^%l%$] %v");
+
+    auto file_sink = std::make_shared<spdlog::sinks::basic_file_sink_mt>("logs/multisink.txt", true);
+    file_sink->set_level(spdlog::level::trace);
+
+    spdlog::logger logger("multi_sink", {console_sink, file_sink});
+    logger.set_level(spdlog::level::debug);
+    logger.warn("this should appear in both console and file");
+    logger.info("this message should not appear in the console, only in the file");
+}
+```
+---
+#### User defined types
+```c++
+// user defined types logging by implementing operator<<
+#include "spdlog/fmt/ostr.h" // must be included
+struct my_type
+{
+    int i;
+    template<typename OStream>
+    friend OStream &operator<<(OStream &os, const my_type &c)
+    {
+        return os << "[my_type i=" << c.i << "]";
+    }
+};
+
+void user_defined_example()
+{
+    spdlog::get("console")->info("user defined type: {}", my_type{14});
+}
+
+```
+---
+#### Custom error handler
+```c++
+void err_handler_example()
+{
+    // can be set globally or per logger(logger->set_error_handler(..))
+    spdlog::set_error_handler([](const std::string &msg) { spdlog::get("console")->error("*** LOGGER ERROR ***: {}", msg); });
+    spdlog::get("console")->info("some invalid message to trigger an error {}{}{}{}", 3);
+}
+
+```
+---
+#### syslog 
+```c++
+#include "spdlog/sinks/syslog_sink.h"
+void syslog_example()
+{
+    std::string ident = "spdlog-example";
+    auto syslog_logger = spdlog::syslog_logger("syslog", ident, LOG_PID);
+    syslog_logger->warn("This is warning that will end up in syslog.");
+}
+```
+---
+#### Android example 
+```c++
+#incude "spdlog/sinks/android_sink.h"
+void android_example()
+{
+    std::string tag = "spdlog-android";
+    auto android_logger = spdlog::android_logger("android", tag);
+    android_logger->critical("Use \"adb shell logcat\" to view this message.");
+}
+```
+
 ## Documentation
 Documentation can be found in the [wiki](https://github.com/gabime/spdlog/wiki/1.-QuickStart) pages.

bench/Makefile

@@ -1,93 +1,23 @@
 CXX	?= g++
-CXXFLAGS	= -march=native -Wall -Wextra -pedantic -std=c++11 -pthread -I../include
-CXX_RELEASE_FLAGS = -O3 -flto -DNDEBUG
+CXXFLAGS	= -march=native -Wall -Wextra -pedantic -std=c++11 -pthread -I../include -fmax-errors=1
+CXX_RELEASE_FLAGS = -Ofast -flto -Wl,--no-as-needed
 
 
-#         g2log-async
-binaries=spdlog-bench spdlog-bench-mt spdlog-async spdlog-null-async \
-         boost-bench boost-bench-mt \
-         glog-bench glog-bench-mt \
-         g3log-async \
-         p7-bench p7-bench-mt \
-         log4cpp-bench log4cpp-bench-mt \
-         log4cplus-bench log4cplus-bench-mt \
-         easylogging-bench easylogging-bench-mt easylogging-bench-async \
-         plog-bench plog-bench-mt
+binaries=bench latency async_bench
 
 all: $(binaries)
 
-spdlog-bench: spdlog-bench.cpp
-	$(CXX) spdlog-bench.cpp -o spdlog-bench $(CXXFLAGS) $(CXX_RELEASE_FLAGS)
+bench: bench.cpp
+	$(CXX) bench.cpp -o bench $(CXXFLAGS) $(CXX_RELEASE_FLAGS)
 	
-spdlog-bench-mt: spdlog-bench-mt.cpp
-	$(CXX) spdlog-bench-mt.cpp -o spdlog-bench-mt  $(CXXFLAGS) $(CXX_RELEASE_FLAGS)
+
+async_bench: async_bench.cpp
+	$(CXX) async_bench.cpp -o async_bench $(CXXFLAGS) $(CXX_RELEASE_FLAGS)
 	
-spdlog-async: spdlog-async.cpp
-	$(CXX) spdlog-async.cpp -o spdlog-async  $(CXXFLAGS) $(CXX_RELEASE_FLAGS)
-
-spdlog-null-async: spdlog-null-async.cpp
-	$(CXX) spdlog-null-async.cpp -o spdlog-null-async $(CXXFLAGS) $(CXX_RELEASE_FLAGS)
-
-BOOST_FLAGS	= -DBOOST_LOG_DYN_LINK -I$(HOME)/include -I/usr/include -L$(HOME)/lib -lboost_log_setup -lboost_log -lboost_filesystem -lboost_system -lboost_thread -lboost_regex -lboost_date_time -lboost_chrono
-
-boost-bench: boost-bench.cpp
-	$(CXX) boost-bench.cpp -o boost-bench $(CXXFLAGS) $(BOOST_FLAGS) $(CXX_RELEASE_FLAGS)
 	
-boost-bench-mt: boost-bench-mt.cpp
-	$(CXX) boost-bench-mt.cpp -o boost-bench-mt $(CXXFLAGS) $(BOOST_FLAGS) $(CXX_RELEASE_FLAGS)	
-
-GLOG_FLAGS = -I$(HOME)/include -L$(HOME)/lib -lglog
-glog-bench: glog-bench.cpp
-	$(CXX) glog-bench.cpp -o glog-bench $(CXXFLAGS) $(GLOG_FLAGS) $(CXX_RELEASE_FLAGS)
-	
-glog-bench-mt: glog-bench-mt.cpp
-	$(CXX) glog-bench-mt.cpp -o glog-bench-mt $(CXXFLAGS) $(GLOG_FLAGS) $(CXX_RELEASE_FLAGS)	
-
-G2LOG_FLAGS = -I$(HOME)/include -L$(HOME)/lib -llib_g2logger 
-g2log-async: g2log-async.cpp
-	$(CXX) g2log-async.cpp -o g2log-async $(CXXFLAGS) $(G2LOG_FLAGS) $(CXX_RELEASE_FLAGS)
-	
-G3LOG_FLAGS = -I$(HOME)/include -L$(HOME)/lib -lg3logger
-g3log-async: g3log-async.cpp
-	$(CXX) g3log-async.cpp -o g3log-async $(CXXFLAGS) $(G3LOG_FLAGS) $(CXX_RELEASE_FLAGS)
-
-P7_FLAGS = -I$(HOME)/P7/Headers -I$(HOME)/include -L$(HOME)/lib -lP7
-p7-bench: p7-bench.cpp
-	$(CXX) p7-bench.cpp -o p7-bench $(CXXFLAGS) $(P7_FLAGS) $(CXX_RELEASE_FLAGS)
-
-p7-bench-mt: p7-bench-mt.cpp
-	$(CXX) p7-bench-mt.cpp -o p7-bench-mt $(CXXFLAGS) $(P7_FLAGS) $(CXX_RELEASE_FLAGS)
-
-LOG4CPP_FLAGS = -I$(HOME)/include -L$(HOME)/lib -llog4cpp
-log4cpp-bench: log4cpp-bench.cpp
-	$(CXX) log4cpp-bench.cpp -o log4cpp-bench $(CXXFLAGS) $(LOG4CPP_FLAGS) $(CXX_RELEASE_FLAGS)
-
-log4cpp-bench-mt: log4cpp-bench-mt.cpp
-	$(CXX) log4cpp-bench-mt.cpp -o log4cpp-bench-mt $(CXXFLAGS) $(LOG4CPP_FLAGS) $(CXX_RELEASE_FLAGS)
-
-LOG4CPLUS_FLAGS = -I$(HOME)/include -L$(HOME)/lib -llog4cplus
-log4cplus-bench: log4cplus-bench.cpp
-	$(CXX) log4cplus-bench.cpp -o log4cplus-bench $(CXXFLAGS) $(LOG4CPLUS_FLAGS) $(CXX_RELEASE_FLAGS)
-
-log4cplus-bench-mt: log4cplus-bench-mt.cpp
-	$(CXX) log4cplus-bench-mt.cpp -o log4cplus-bench-mt $(CXXFLAGS) $(LOG4CPLUS_FLAGS) $(CXX_RELEASE_FLAGS)
-
-EASYL_FLAGS = -I$(HOME)/easyloggingpp/src
-easylogging-bench: easylogging-bench.cpp
-	$(CXX) easylogging-bench.cpp -o easylogging-bench $(CXXFLAGS) $(EASYL_FLAGS) $(CXX_RELEASE_FLAGS)
-
-easylogging-bench-mt: easylogging-bench-mt.cpp
-	$(CXX) easylogging-bench-mt.cpp -o easylogging-bench-mt $(CXXFLAGS) $(EASYL_FLAGS) $(CXX_RELEASE_FLAGS)
-
-easylogging-bench-async: easylogging-bench-async.cpp
-	$(CXX) easylogging-bench-async.cpp -o easylogging-bench-async $(CXXFLAGS) $(EASYL_FLAGS) $(CXX_RELEASE_FLAGS)
-
-PLOG_FLAGS = -I$(HOME)/include
-plog-bench: plog-bench.cpp
-	$(CXX) plog-bench.cpp -o plog-bench $(CXXFLAGS) $(PLOG_FLAGS) $(CXX_RELEASE_FLAGS)
-
-plog-bench-mt: plog-bench-mt.cpp
-	$(CXX) plog-bench-mt.cpp -o plog-bench-mt $(CXXFLAGS) $(PLOG_FLAGS) $(CXX_RELEASE_FLAGS)
+latency: latency.cpp
+	$(CXX) latency.cpp -o latency $(CXXFLAGS) $(CXX_RELEASE_FLAGS)
+				
 
 .PHONY: clean
 

bench/Makefile.mingw

@@ -1,57 +0,0 @@
-CXX	?= g++
-CXXFLAGS	= -D_WIN32_WINNT=0x600 -march=native -Wall -Wextra -pedantic -std=c++11 -pthread -Wl,--no-as-needed  -I../include 
-CXX_RELEASE_FLAGS = -O3 -flto
-
-
-binaries=spdlog-bench spdlog-bench-mt spdlog-async boost-bench boost-bench-mt glog-bench glog-bench-mt g2log-async easylogging-bench easylogging-bench-mt
-
-all: $(binaries)
-
-spdlog-bench: spdlog-bench.cpp
-	$(CXX) spdlog-bench.cpp -o spdlog-bench $(CXXFLAGS) $(CXX_RELEASE_FLAGS)
-	
-spdlog-bench-mt: spdlog-bench-mt.cpp
-	$(CXX) spdlog-bench-mt.cpp -o spdlog-bench-mt  $(CXXFLAGS) $(CXX_RELEASE_FLAGS)
-	
-spdlog-async: spdlog-async.cpp
-	$(CXX) spdlog-async.cpp -o spdlog-async  $(CXXFLAGS) $(CXX_RELEASE_FLAGS)
-	
-
-BOOST_FLAGS	= -DBOOST_LOG_DYN_LINK  -I/home/gabi/devel/boost_1_56_0/ -L/home/gabi/devel/boost_1_56_0/stage/lib -lboost_log  -lboost_log_setup -lboost_filesystem -lboost_system -lboost_thread -lboost_regex -lboost_date_time -lboost_chrono	
-
-boost-bench: boost-bench.cpp
-	$(CXX) boost-bench.cpp -o boost-bench $(CXXFLAGS) $(BOOST_FLAGS) $(CXX_RELEASE_FLAGS)
-	
-boost-bench-mt: boost-bench-mt.cpp
-	$(CXX) boost-bench-mt.cpp -o boost-bench-mt $(CXXFLAGS) $(BOOST_FLAGS) $(CXX_RELEASE_FLAGS)	
-
-
-GLOG_FLAGS = -lglog
-glog-bench: glog-bench.cpp
-	$(CXX) glog-bench.cpp -o glog-bench $(CXXFLAGS) $(GLOG_FLAGS) $(CXX_RELEASE_FLAGS)
-	
-glog-bench-mt: glog-bench-mt.cpp
-	$(CXX) glog-bench-mt.cpp -o glog-bench-mt $(CXXFLAGS) $(GLOG_FLAGS) $(CXX_RELEASE_FLAGS)	
-
-
-G2LOG_FLAGS = -I/home/gabi/devel/g2log/g2log/src -L/home/gabi/devel/g2log/g2log -llib_g2logger 
-g2log-async: g2log-async.cpp
-	$(CXX) g2log-async.cpp -o g2log-async $(CXXFLAGS) $(G2LOG_FLAGS) $(CXX_RELEASE_FLAGS)
-	
-
-EASYL_FLAGS = -I../../easylogging/src/
-easylogging-bench: easylogging-bench.cpp
-	$(CXX) easylogging-bench.cpp -o easylogging-bench $(CXXFLAGS) $(EASYL_FLAGS) $(CXX_RELEASE_FLAGS)
-easylogging-bench-mt: easylogging-bench-mt.cpp
-	$(CXX) easylogging-bench-mt.cpp -o easylogging-bench-mt $(CXXFLAGS) $(EASYL_FLAGS) $(CXX_RELEASE_FLAGS)	
-	
-.PHONY: clean
-
-clean:
-	rm -f *.o logs/* $(binaries)
-
-
-rebuild: clean all
-
-
-

bench/README.md

@@ -1,14 +0,0 @@
-# loggers
-
-Name | License | Lang. | Year | Platform | Compiler | Dependence | URL
---- | --- | --- | --- | --- | --- | --- | ---
-Pantheios | BSD | C++ | 2017 | Windows, Linux, MacOSX | VC++, GCC(3.2+), Intel, Borland, Comeau, Digital Mars, Metrowerks | STLSoft | http://www.pantheios.org/ <br> http://blog.pantheios.org/ <br> https://github.com/synesissoftware/Pantheios <br> http://www.pantheios.org/performance.html
-Glog | 3-clause BSD| C++| 2017 | Windows, Linux, MacOSX | VC++, GCC, Clang, intel| Google gflags | https://github.com/google/glog
-G3log | Public Domain | C++11 | 2018 | Windows, Linux, MacOSX, iPhoneOS | VC++, GCC, Clang, MinGW | None | https://github.com/KjellKod/g3log <br> https://github.com/KjellKod/g3sinks <br> https://kjellkod.wordpress.com/2014/08/16/presenting-g3log-the-next-version-of-the-next-generation-of-loggers/ <br> https://kjellkod.wordpress.com/2015/06/30/the-worlds-fastest-logger-vs-g3log/
-P7 | LGPL | C++, C, C#, Python | 2017 | Windows, Linux | VC++, GCC, Clang, MinGW | None | http://baical.net/p7.html
-log4cpp | LGPL | C++ | 2017 | Windows, Linux, MacOSX | VC++, GCC, Sun CC, OpenVMS | Boost | http://log4cpp.sourceforge.net/
-log4cplus | 2-clause BSD or Apache 2 | C++ | 2017 | Windows, Linux, MacOSX, Android | VC++, GCC, Clang | Boost | https://github.com/log4cplus/log4cplus <br> https://sourceforge.net/p/log4cplus/wiki/Home/
-Easylogging | MIT | C++11 | 2018 | Windows, Linux, MacOSX, iPhoneOS, Android | VC++, GCC, Clang, Intel, MinGW | None | https://github.com/muflihun/easyloggingpp
-Spdlog | MIT | C++11 | 2018 | Windows, Linux, MacOSX, iPhoneOS, Android(logcat) | VC++, GCC, Clang, MinGW | None, Headers only library | https://github.com/gabime/spdlog <br> https://github.com/fmtlib/fmt
-Boost.Log v2 | Boost | C++ | 2016 | Windows, Linux, MacOSX, iPhoneOS, Android | VC++, GCC, Clang | Boost | https://github.com/boostorg/log <br> http://www.boost.org/doc/libs/1_66_0/libs/log/doc/html/index.html
-plog | MPL 2.0 | C++ | 2017 | Windows, Linux, MacOSX, iPhoneOS, Android | gcc, clang, msvc, mingw, mingw-w64, icc, c++builder | None, Headers only library | https://github.com/SergiusTheBest/plog

bench/async_bench.cpp

@@ -0,0 +1,138 @@
+//
+// Copyright(c) 2015 Gabi Melman.
+// Distributed under the MIT License (http://opensource.org/licenses/MIT)
+//
+
+//
+// bench.cpp : spdlog benchmarks
+//
+#include "spdlog/async.h"
+#include "spdlog/sinks/basic_file_sink.h"
+#include "spdlog/sinks/stdout_color_sinks.h"
+#include "spdlog/spdlog.h"
+#include "utils.h"
+#include <atomic>
+#include <iostream>
+#include <memory>
+#include <string>
+#include <thread>
+
+using namespace std;
+using namespace std::chrono;
+using namespace spdlog;
+using namespace spdlog::sinks;
+using namespace utils;
+
+void bench_mt(int howmany, std::shared_ptr<spdlog::logger> log, int thread_count);
+
+int count_lines(const char *filename)
+{
+    int counter = 0;
+    auto *infile = fopen(filename, "r");
+    int ch;
+    while (EOF != (ch = getc(infile)))
+    {
+        if ('\n' == ch)
+            counter++;
+    }
+
+    return counter;
+}
+int main(int argc, char *argv[])
+{
+
+    int howmany = 1000000;
+    int queue_size = howmany + 2;
+    int threads = 10;
+    int iters = 3;
+
+    try
+    {
+        auto console = spdlog::stdout_color_mt("console");
+        if (argc == 1)
+        {
+            console->set_pattern("%v");
+            console->info("Usage: {} <message_count> <threads> <q_size> <iterations>", argv[0]);
+            return 0;
+        }
+
+        if (argc > 1)
+            howmany = atoi(argv[1]);
+        if (argc > 2)
+            threads = atoi(argv[2]);
+        if (argc > 3)
+            queue_size = atoi(argv[3]);
+
+        if (argc > 4)
+            iters = atoi(argv[4]);
+
+        console->info("-------------------------------------------------");
+        console->info("Messages: {:14n}", howmany);
+        console->info("Threads : {:14n}", threads);
+        console->info("Queue   : {:14n}", queue_size);
+        console->info("Iters   : {:>14n}", iters);
+        console->info("-------------------------------------------------");
+
+        const char *filename = "logs/basic_async.log";
+
+        for (int i = 0; i < iters; i++)
+        {
+            auto tp = std::make_shared<details::thread_pool>(queue_size, 1);
+            auto file_sink = std::make_shared<spdlog::sinks::basic_file_sink_mt>(filename, true);
+            auto logger = std::make_shared<async_logger>("async_logger", std::move(file_sink), std::move(tp), async_overflow_policy::block);
+            bench_mt(howmany, std::move(logger), threads);
+            auto count = count_lines(filename);
+
+            if (count != howmany)
+            {
+                console->error("Test failed. {} has {:n} lines instead of {:n}", filename, count, howmany);
+                exit(1);
+            }
+            else
+            {
+                console->info("Line count OK ({:n})\n", count);
+            }
+        }
+    }
+    catch (std::exception &ex)
+    {
+        std::cerr << "Error: " << ex.what() << std::endl;
+        perror("Last error");
+        return 1;
+    }
+    return 0;
+}
+
+void thread_fun(std::shared_ptr<spdlog::logger> logger, int howmany)
+{
+    for (int i = 0; i < howmany; i++)
+    {
+        logger->info("Hello logger: msg number {}", i);
+    }
+}
+
+void bench_mt(int howmany, std::shared_ptr<spdlog::logger> logger, int thread_count)
+{
+    using std::chrono::high_resolution_clock;
+    vector<thread> threads;
+    auto start = high_resolution_clock::now();
+
+    int msgs_per_thread = howmany / thread_count;
+    int msgs_per_thread_mod = howmany % thread_count;
+    for (int t = 0; t < thread_count; ++t)
+    {
+        if (t == 0 && msgs_per_thread_mod)
+            threads.push_back(std::thread(thread_fun, logger, msgs_per_thread + msgs_per_thread_mod));
+        else
+            threads.push_back(std::thread(thread_fun, logger, msgs_per_thread));
+    }
+
+    for (auto &t : threads)
+    {
+        t.join();
+    };
+
+    auto delta = high_resolution_clock::now() - start;
+    auto delta_d = duration_cast<duration<double>>(delta).count();
+    spdlog::get("console")->info("Elapsed: {} secs\t {:n}/sec", delta_d, int(howmany / delta_d));
+}

bench/bench.cpp

@@ -6,9 +6,11 @@
 //
 // bench.cpp : spdlog benchmarks
 //
-#include "spdlog/async_logger.h"
-#include "spdlog/sinks/file_sinks.h"
+#include "spdlog/async.h"
+#include "spdlog/sinks/basic_file_sink.h"
+#include "spdlog/sinks/daily_file_sink.h"
 #include "spdlog/sinks/null_sink.h"
+#include "spdlog/sinks/rotating_file_sink.h"
 #include "spdlog/spdlog.h"
 #include "utils.h"
 #include <atomic>
@@ -30,8 +32,8 @@ void bench_mt(int howmany, std::shared_ptr<spdlog::logger> log, int thread_count
 int main(int argc, char *argv[])
 {
 
-    int queue_size = 1048576;
     int howmany = 1000000;
+    int queue_size = howmany + 2;
     int threads = 10;
     int file_size = 30 * 1024 * 1024;
     int rotating_files = 5;
@@ -46,38 +48,51 @@ int main(int argc, char *argv[])
         if (argc > 3)
             queue_size = atoi(argv[3]);
 
-        cout << "*******************************************************************************\n";
+        cout << "******************************************************************"
+                "*************\n";
         cout << "Single thread, " << format(howmany) << " iterations" << endl;
-        cout << "*******************************************************************************\n";
+        cout << "******************************************************************"
+                "*************\n";
+
+        auto basic_st = spdlog::basic_logger_mt("basic_st", "logs/basic_st.log", true);
+        bench(howmany, basic_st);
 
         auto rotating_st = spdlog::rotating_logger_st("rotating_st", "logs/rotating_st.log", file_size, rotating_files);
         bench(howmany, rotating_st);
+
         auto daily_st = spdlog::daily_logger_st("daily_st", "logs/daily_st.log");
         bench(howmany, daily_st);
+
         bench(howmany, spdlog::create<null_sink_st>("null_st"));
 
-        cout << "\n*******************************************************************************\n";
+        cout << "\n****************************************************************"
+                "***************\n";
         cout << threads << " threads sharing same logger, " << format(howmany) << " iterations" << endl;
-        cout << "*******************************************************************************\n";
+        cout << "******************************************************************"
+                "*************\n";
+
+        auto basic_mt = spdlog::basic_logger_mt("basic_mt", "logs/basic_mt.log", true);
+        bench_mt(howmany, basic_mt, threads);
 
         auto rotating_mt = spdlog::rotating_logger_mt("rotating_mt", "logs/rotating_mt.log", file_size, rotating_files);
         bench_mt(howmany, rotating_mt, threads);
 
         auto daily_mt = spdlog::daily_logger_mt("daily_mt", "logs/daily_mt.log");
         bench_mt(howmany, daily_mt, threads);
-        bench(howmany, spdlog::create<null_sink_st>("null_mt"));
+        bench_mt(howmany, spdlog::create<null_sink_mt>("null_mt"), threads);
 
-        cout << "\n*******************************************************************************\n";
+        cout << "\n****************************************************************"
+                "***************\n";
         cout << "async logging.. " << threads << " threads sharing same logger, " << format(howmany) << " iterations " << endl;
-        cout << "*******************************************************************************\n";
-
-        spdlog::set_async_mode(queue_size);
+        cout << "******************************************************************"
+                "*************\n";
 
         for (int i = 0; i < 3; ++i)
         {
-            auto as = spdlog::daily_logger_st("as", "logs/daily_async.log");
+            spdlog::init_thread_pool(queue_size, 1);
+            auto as = spdlog::basic_logger_mt<spdlog::async_factory>("async", "logs/basic_async.log", true);
             bench_mt(howmany, as, threads);
-            spdlog::drop("as");
+            spdlog::drop("async");
         }
     }
     catch (std::exception &ex)
@@ -91,34 +106,33 @@ int main(int argc, char *argv[])
 
 void bench(int howmany, std::shared_ptr<spdlog::logger> log)
 {
+    using std::chrono::high_resolution_clock;
     cout << log->name() << "...\t\t" << flush;
-    auto start = system_clock::now();
+    auto start = high_resolution_clock::now();
     for (auto i = 0; i < howmany; ++i)
     {
         log->info("Hello logger: msg number {}", i);
     }
 
-    auto delta = system_clock::now() - start;
+    auto delta = high_resolution_clock::now() - start;
     auto delta_d = duration_cast<duration<double>>(delta).count();
-    cout << format(int(howmany / delta_d)) << "/sec" << endl;
+
+    cout << "Elapsed: " << delta_d << "\t" << format(int(howmany / delta_d)) << "/sec" << endl;
+    spdlog::drop(log->name());
 }
 
 void bench_mt(int howmany, std::shared_ptr<spdlog::logger> log, int thread_count)
 {
-
+    using std::chrono::high_resolution_clock;
     cout << log->name() << "...\t\t" << flush;
-    std::atomic<int> msg_counter{0};
     vector<thread> threads;
-    auto start = system_clock::now();
+    auto start = high_resolution_clock::now();
     for (int t = 0; t < thread_count; ++t)
     {
         threads.push_back(std::thread([&]() {
-            for (;;)
+            for (int j = 0; j < howmany / thread_count; j++)
             {
-                int counter = ++msg_counter;
-                if (counter > howmany)
-                    break;
-                log->info("Hello logger: msg number {}", counter);
+                log->info("Hello logger: msg number {}", j);
             }
         }));
     }
@@ -128,7 +142,7 @@ void bench_mt(int howmany, std::shared_ptr<spdlog::logger> log, int thread_count
         t.join();
     };
 
-    auto delta = system_clock::now() - start;
+    auto delta = high_resolution_clock::now() - start;
     auto delta_d = duration_cast<duration<double>>(delta).count();
-    cout << format(int(howmany / delta_d)) << "/sec" << endl;
+    cout << "Elapsed: " << delta_d << "\t" << format(int(howmany / delta_d)) << "/sec" << endl;
 }

bench/boost-bench-mt.cpp

@@ -1,86 +0,0 @@
-//
-// Copyright(c) 2015 Gabi Melman.
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-//
-
-#include <atomic>
-#include <chrono>
-#include <iostream>
-#include <thread>
-#include <vector>
-
-#include <boost/log/core.hpp>
-#include <boost/log/expressions.hpp>
-#include <boost/log/sinks/text_file_backend.hpp>
-#include <boost/log/sources/record_ostream.hpp>
-#include <boost/log/sources/severity_logger.hpp>
-#include <boost/log/trivial.hpp>
-#include <boost/log/utility/setup/common_attributes.hpp>
-#include <boost/log/utility/setup/file.hpp>
-
-namespace logging = boost::log;
-namespace src = boost::log::sources;
-namespace sinks = boost::log::sinks;
-namespace keywords = boost::log::keywords;
-
-void init()
-{
-    logging::add_file_log(keywords::file_name = "logs/boost-bench-mt_%N.log", /*< file name pattern >*/
-        keywords::auto_flush = false, keywords::format = "[%TimeStamp%]: %Message%");
-
-    logging::core::get()->set_filter(logging::trivial::severity >= logging::trivial::info);
-}
-
-using namespace std;
-
-int main(int argc, char *argv[])
-{
-    using namespace std::chrono;
-    using clock = steady_clock;
-
-    int thread_count = 10;
-    if (argc > 1)
-        thread_count = atoi(argv[1]);
-
-    int howmany = 1000000;
-
-    init();
-    logging::add_common_attributes();
-
-    using namespace logging::trivial;
-
-    src::severity_logger_mt<severity_level> lg;
-
-    std::atomic<int> msg_counter{0};
-    vector<thread> threads;
-
-    auto start = clock::now();
-    for (int t = 0; t < thread_count; ++t)
-    {
-        threads.push_back(std::thread([&]() {
-            while (true)
-            {
-                int counter = ++msg_counter;
-                if (counter > howmany)
-                    break;
-                BOOST_LOG_SEV(lg, info) << "boost message #" << counter << ": This is some text for your pleasure";
-            }
-        }));
-    }
-
-    for (auto &t : threads)
-    {
-        t.join();
-    }
-
-    duration<float> delta = clock::now() - start;
-    float deltaf = delta.count();
-    auto rate = howmany / deltaf;
-
-    std::cout << "Total: " << howmany << std::endl;
-    std::cout << "Threads: " << thread_count << std::endl;
-    std::cout << "Delta = " << deltaf << " seconds" << std::endl;
-    std::cout << "Rate = " << rate << "/sec" << std::endl;
-
-    return 0;
-}

bench/boost-bench.cpp

@@ -1,56 +0,0 @@
-//
-// Copyright(c) 2015 Gabi Melman.
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-//
-
-#include <chrono>
-#include <iostream>
-
-#include <boost/log/core.hpp>
-#include <boost/log/expressions.hpp>
-#include <boost/log/sinks/text_file_backend.hpp>
-#include <boost/log/sources/record_ostream.hpp>
-#include <boost/log/sources/severity_logger.hpp>
-#include <boost/log/trivial.hpp>
-#include <boost/log/utility/setup/common_attributes.hpp>
-#include <boost/log/utility/setup/file.hpp>
-
-namespace logging = boost::log;
-namespace src = boost::log::sources;
-namespace sinks = boost::log::sinks;
-namespace keywords = boost::log::keywords;
-
-void init()
-{
-    logging::add_file_log(keywords::file_name = "logs/boost-bench_%N.log", /*< file name pattern >*/
-        keywords::auto_flush = false, keywords::format = "[%TimeStamp%]: %Message%");
-
-    logging::core::get()->set_filter(logging::trivial::severity >= logging::trivial::info);
-}
-
-int main(int, char *[])
-{
-    using namespace std::chrono;
-    using clock = steady_clock;
-
-    int howmany = 1000000;
-    init();
-    logging::add_common_attributes();
-
-    using namespace logging::trivial;
-    src::severity_logger_mt<severity_level> lg;
-
-    auto start = clock::now();
-    for (int i = 0; i < howmany; ++i)
-        BOOST_LOG_SEV(lg, info) << "boost message #" << i << ": This is some text for your pleasure";
-
-    duration<float> delta = clock::now() - start;
-    float deltaf = delta.count();
-    auto rate = howmany / deltaf;
-
-    std::cout << "Total: " << howmany << std::endl;
-    std::cout << "Delta = " << deltaf << " seconds" << std::endl;
-    std::cout << "Rate = " << rate << "/sec" << std::endl;
-
-    return 0;
-}

bench/easyl-async.conf

@@ -1,10 +0,0 @@
-* GLOBAL:
-    FORMAT                  =   "[%datetime]: %levshort %thread %msg"
-    FILENAME                =   ./logs/easylogging-async.log
-    ENABLED                 =   true
-    TO_FILE                 =   true
-    TO_STANDARD_OUTPUT      =   false
-    MILLISECONDS_WIDTH      =   3
-    PERFORMANCE_TRACKING    =   false
-    MAX_LOG_FILE_SIZE       =   10485760
-    Log_Flush_Threshold		= 	10485760

bench/easyl-mt.conf

@@ -1,10 +0,0 @@
-* GLOBAL:
-    FORMAT                  =   "[%datetime]: %levshort %thread %msg"
-    FILENAME                =   ./logs/easylogging-mt.log
-    ENABLED                 =   true
-    TO_FILE                 =   true
-    TO_STANDARD_OUTPUT      =   false
-    MILLISECONDS_WIDTH      =   3
-    PERFORMANCE_TRACKING    =   false
-    MAX_LOG_FILE_SIZE       =   10485760
-    Log_Flush_Threshold		= 	10485760

bench/easyl.conf

@@ -1,10 +0,0 @@
-* GLOBAL:
-    FORMAT                  =   "[%datetime]: %levshort %msg"
-    FILENAME                =   ./logs/easylogging.log
-    ENABLED                 =   true
-    TO_FILE                 =   true
-    TO_STANDARD_OUTPUT      =   false
-    MILLISECONDS_WIDTH      =   3
-    PERFORMANCE_TRACKING    =   false
-    MAX_LOG_FILE_SIZE       =   10485760
-    Log_Flush_Threshold		= 	10485760

bench/easylogging-bench-async.cpp

@@ -1,67 +0,0 @@
-//
-// Copyright(c) 2015 Gabi Melman.
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-//
-
-#include <atomic>
-#include <chrono>
-#include <iostream>
-#include <thread>
-#include <vector>
-
-#define ELPP_THREAD_SAFE
-#define ELPP_EXPERIMENTAL_ASYNC
-#include "easylogging++.cc"
-#include "easylogging++.h"
-INITIALIZE_EASYLOGGINGPP
-
-using namespace std;
-
-int main(int argc, char *argv[])
-{
-    using namespace std::chrono;
-    using clock = steady_clock;
-
-    int thread_count = 10;
-    if (argc > 1)
-        thread_count = atoi(argv[1]);
-
-    int howmany = 1000000;
-
-    // Load configuration from file
-    el::Configurations conf("easyl-async.conf");
-    el::Loggers::reconfigureLogger("default", conf);
-
-    std::atomic<int> msg_counter{0};
-    vector<thread> threads;
-
-    auto start = clock::now();
-    for (int t = 0; t < thread_count; ++t)
-    {
-        threads.push_back(std::thread([&]() {
-            while (true)
-            {
-                int counter = ++msg_counter;
-                if (counter > howmany)
-                    break;
-                LOG(INFO) << "easylog message #" << counter << ": This is some text for your pleasure";
-            }
-        }));
-    }
-
-    for (auto &t : threads)
-    {
-        t.join();
-    }
-
-    duration<float> delta = clock::now() - start;
-    float deltaf = delta.count();
-    auto rate = howmany / deltaf;
-
-    std::cout << "Total: " << howmany << std::endl;
-    std::cout << "Threads: " << thread_count << std::endl;
-    std::cout << "Delta = " << deltaf << " seconds" << std::endl;
-    std::cout << "Rate = " << rate << "/sec" << std::endl;
-
-    return 0;
-}

bench/easylogging-bench-mt.cpp

@@ -1,66 +0,0 @@
-//
-// Copyright(c) 2015 Gabi Melman.
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-//
-
-#include <atomic>
-#include <chrono>
-#include <iostream>
-#include <thread>
-#include <vector>
-
-#define ELPP_THREAD_SAFE
-#include "easylogging++.cc"
-#include "easylogging++.h"
-INITIALIZE_EASYLOGGINGPP
-
-using namespace std;
-
-int main(int argc, char *argv[])
-{
-    using namespace std::chrono;
-    using clock = steady_clock;
-
-    int thread_count = 10;
-    if (argc > 1)
-        thread_count = atoi(argv[1]);
-
-    int howmany = 1000000;
-
-    // Load configuration from file
-    el::Configurations conf("easyl-mt.conf");
-    el::Loggers::reconfigureLogger("default", conf);
-
-    std::atomic<int> msg_counter{0};
-    vector<thread> threads;
-
-    auto start = clock::now();
-    for (int t = 0; t < thread_count; ++t)
-    {
-        threads.push_back(std::thread([&]() {
-            while (true)
-            {
-                int counter = ++msg_counter;
-                if (counter > howmany)
-                    break;
-                LOG(INFO) << "easylog message #" << counter << ": This is some text for your pleasure";
-            }
-        }));
-    }
-
-    for (auto &t : threads)
-    {
-        t.join();
-    }
-
-    duration<float> delta = clock::now() - start;
-    float deltaf = delta.count();
-    auto rate = howmany / deltaf;
-
-    std::cout << "Total: " << howmany << std::endl;
-    std::cout << "Threads: " << thread_count << std::endl;
-    std::cout << "Delta = " << deltaf << " seconds" << std::endl;
-    std::cout << "Rate = " << rate << "/sec" << std::endl;
-
-    return 0;
-}

bench/easylogging-bench.cpp

@@ -1,39 +0,0 @@
-//
-// Copyright(c) 2015 Gabi Melman.
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-//
-
-#include <chrono>
-#include <iostream>
-
-#include "easylogging++.cc"
-#include "easylogging++.h"
-INITIALIZE_EASYLOGGINGPP
-
-int main(int, char *[])
-{
-    using namespace std::chrono;
-    using clock = steady_clock;
-
-    int howmany = 1000000;
-
-    // Load configuration from file
-    el::Configurations conf("easyl.conf");
-    el::Loggers::reconfigureLogger("default", conf);
-
-    el::Logger *defaultLogger = el::Loggers::getLogger("default");
-
-    auto start = clock::now();
-    for (int i = 0; i < howmany; ++i)
-        LOG(INFO) << "easylog message #" << i << ": This is some text for your pleasure";
-
-    duration<float> delta = clock::now() - start;
-    float deltaf = delta.count();
-    auto rate = howmany / deltaf;
-
-    std::cout << "Total: " << howmany << std::endl;
-    std::cout << "Delta = " << deltaf << " seconds" << std::endl;
-    std::cout << "Rate = " << rate << "/sec" << std::endl;
-
-    return 0;
-}

bench/g2log-async.cpp

@@ -1,61 +0,0 @@
-//
-// Copyright(c) 2015 Gabi Melman.
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-//
-
-#include <atomic>
-#include <chrono>
-#include <iostream>
-#include <thread>
-#include <vector>
-
-#include "g2log.h"
-#include "g2logworker.h"
-
-using namespace std;
-template<typename T>
-std::string format(const T &value);
-
-int main(int argc, char *argv[])
-{
-    using namespace std::chrono;
-    using clock = steady_clock;
-    int thread_count = 10;
-
-    if (argc > 1)
-        thread_count = atoi(argv[1]);
-    int howmany = 1000000;
-
-    g2LogWorker g2log(argv[0], "logs");
-    g2::initializeLogging(&g2log);
-
-    std::atomic<int> msg_counter{0};
-    vector<thread> threads;
-    auto start = clock::now();
-    for (int t = 0; t < thread_count; ++t)
-    {
-        threads.push_back(std::thread([&]() {
-            while (true)
-            {
-                int counter = ++msg_counter;
-                if (counter > howmany)
-                    break;
-                LOG(INFO) << "g2log message #" << counter << ": This is some text for your pleasure";
-            }
-        }));
-    }
-
-    for (auto &t : threads)
-    {
-        t.join();
-    }
-
-    duration<float> delta = clock::now() - start;
-    float deltaf = delta.count();
-    auto rate = howmany / deltaf;
-
-    cout << "Total: " << howmany << std::endl;
-    cout << "Threads: " << thread_count << std::endl;
-    std::cout << "Delta = " << deltaf << " seconds" << std::endl;
-    std::cout << "Rate = " << rate << "/sec" << std::endl;
-}

bench/g3log-async.cpp

@@ -1,63 +0,0 @@
-//
-// Copyright(c) 2015 Gabi Melman.
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-//
-
-#include <atomic>
-#include <chrono>
-#include <iostream>
-#include <thread>
-#include <vector>
-
-#include "g3log/g3log.hpp"
-#include "g3log/logworker.hpp"
-
-using namespace std;
-template<typename T>
-std::string format(const T &value);
-
-int main(int argc, char *argv[])
-{
-    using namespace std::chrono;
-    using clock = steady_clock;
-    int thread_count = 10;
-
-    if (argc > 1)
-        thread_count = atoi(argv[1]);
-
-    int howmany = 1000000;
-
-    auto worker = g3::LogWorker::createLogWorker();
-    auto handle = worker->addDefaultLogger(argv[0], "logs");
-    g3::initializeLogging(worker.get());
-
-    std::atomic<int> msg_counter{0};
-    vector<thread> threads;
-    auto start = clock::now();
-    for (int t = 0; t < thread_count; ++t)
-    {
-        threads.push_back(std::thread([&]() {
-            while (true)
-            {
-                int counter = ++msg_counter;
-                if (counter > howmany)
-                    break;
-                LOG(INFO) << "g3log message #" << counter << ": This is some text for your pleasure";
-            }
-        }));
-    }
-
-    for (auto &t : threads)
-    {
-        t.join();
-    }
-
-    duration<float> delta = clock::now() - start;
-    float deltaf = delta.count();
-    auto rate = howmany / deltaf;
-
-    cout << "Total: " << howmany << std::endl;
-    cout << "Threads: " << thread_count << std::endl;
-    std::cout << "Delta = " << deltaf << " seconds" << std::endl;
-    std::cout << "Rate = " << rate << "/sec" << std::endl;
-}

bench/glog-bench-mt.cpp

@@ -1,63 +0,0 @@
-//
-// Copyright(c) 2015 Gabi Melman.
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-//
-
-#include <atomic>
-#include <chrono>
-#include <iostream>
-#include <thread>
-#include <vector>
-
-#include "glog/logging.h"
-
-using namespace std;
-
-int main(int argc, char *argv[])
-{
-    using namespace std::chrono;
-    using clock = steady_clock;
-
-    int thread_count = 10;
-    if (argc > 1)
-        thread_count = atoi(argv[1]);
-
-    int howmany = 1000000;
-
-    FLAGS_logtostderr = 0;
-    FLAGS_log_dir = "logs";
-    google::InitGoogleLogging(argv[0]);
-
-    std::atomic<int> msg_counter{0};
-    vector<thread> threads;
-
-    auto start = clock::now();
-    for (int t = 0; t < thread_count; ++t)
-    {
-        threads.push_back(std::thread([&]() {
-            while (true)
-            {
-                int counter = ++msg_counter;
-                if (counter > howmany)
-                    break;
-                LOG(INFO) << "glog message #" << counter << ": This is some text for your pleasure";
-            }
-        }));
-    }
-
-    for (auto &t : threads)
-    {
-        t.join();
-    }
-
-    duration<float> delta = clock::now() - start;
-    float deltaf = delta.count();
-    auto rate = howmany / deltaf;
-
-    std::cout << "Total: " << howmany << std::endl;
-    std::cout << "Threads: " << thread_count << std::endl;
-    std::cout << "Delta = " << deltaf << " seconds" << std::endl;
-    std::cout << "Rate = " << rate << "/sec" << std::endl;
-
-    return 0;
-}

bench/glog-bench.cpp

@@ -1,34 +0,0 @@
-//
-// Copyright(c) 2015 Gabi Melman.
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-//
-
-#include <chrono>
-#include <iostream>
-
-#include "glog/logging.h"
-
-int main(int, char *argv[])
-{
-    using namespace std::chrono;
-    using clock = steady_clock;
-
-    int howmany = 1000000;
-
-    FLAGS_logtostderr = 0;
-    FLAGS_log_dir = "logs";
-    google::InitGoogleLogging(argv[0]);
-    auto start = clock::now();
-    for (int i = 0; i < howmany; ++i)
-        LOG(INFO) << "glog message #" << i << ": This is some text for your pleasure";
-
-    duration<float> delta = clock::now() - start;
-    float deltaf = delta.count();
-    auto rate = howmany / deltaf;
-
-    std::cout << "Total: " << howmany << std::endl;
-    std::cout << "Delta = " << deltaf << " seconds" << std::endl;
-    std::cout << "Rate = " << rate << "/sec" << std::endl;
-
-    return 0;
-}

bench/latency.cpp

@@ -0,0 +1,151 @@
+//
+// Copyright(c) 2018 Gabi Melman.
+// Distributed under the MIT License (http://opensource.org/licenses/MIT)
+//
+
+//
+// latency.cpp : spdlog latency benchmarks
+//
+#include "spdlog/async.h"
+#include "spdlog/sinks/basic_file_sink.h"
+#include "spdlog/sinks/daily_file_sink.h"
+#include "spdlog/sinks/null_sink.h"
+#include "spdlog/sinks/rotating_file_sink.h"
+#include "spdlog/spdlog.h"
+#include "utils.h"
+#include <atomic>
+#include <cstdlib>
+#include <iostream>
+#include <memory>
+#include <string>
+#include <thread>
+
+using namespace std;
+using namespace std::chrono;
+using namespace spdlog;
+using namespace spdlog::sinks;
+using namespace utils;
+
+void bench(int howmany, std::shared_ptr<spdlog::logger> log);
+void bench_mt(int howmany, std::shared_ptr<spdlog::logger> log, int thread_count);
+
+int main(int, char *[])
+{
+    std::srand(static_cast<unsigned>(std::time(nullptr))); // use current time as seed for random generator
+    int howmany = 1000000;
+    int queue_size = howmany + 2;
+    int threads = 10;
+    int file_size = 30 * 1024 * 1024;
+    int rotating_files = 5;
+
+    try
+    {
+
+        cout << "******************************************************************"
+                "*************\n";
+        cout << "Single thread\n";
+        cout << "******************************************************************"
+                "*************\n";
+
+        auto basic_st = spdlog::basic_logger_mt("basic_st", "logs/basic_st.log", true);
+        bench(howmany, basic_st);
+
+        auto rotating_st = spdlog::rotating_logger_st("rotating_st", "logs/rotating_st.log", file_size, rotating_files);
+        bench(howmany, rotating_st);
+
+        auto daily_st = spdlog::daily_logger_st("daily_st", "logs/daily_st.log");
+        bench(howmany, daily_st);
+
+        bench(howmany, spdlog::create<null_sink_st>("null_st"));
+
+        cout << "\n****************************************************************"
+                "***************\n";
+        cout << threads << " threads sharing same logger\n";
+        cout << "******************************************************************"
+                "*************\n";
+
+        auto basic_mt = spdlog::basic_logger_mt("basic_mt", "logs/basic_mt.log", true);
+        bench_mt(howmany, basic_mt, threads);
+
+        auto rotating_mt = spdlog::rotating_logger_mt("rotating_mt", "logs/rotating_mt.log", file_size, rotating_files);
+        bench_mt(howmany, rotating_mt, threads);
+
+        auto daily_mt = spdlog::daily_logger_mt("daily_mt", "logs/daily_mt.log");
+        bench_mt(howmany, daily_mt, threads);
+        bench(howmany, spdlog::create<null_sink_st>("null_mt"));
+
+        cout << "\n****************************************************************"
+                "***************\n";
+        cout << "async logging.. " << threads << " threads sharing same logger\n";
+        cout << "******************************************************************"
+                "*************\n";
+
+        for (int i = 0; i < 3; ++i)
+        {
+            spdlog::init_thread_pool(queue_size, 1);
+            auto as = spdlog::basic_logger_mt<spdlog::async_factory>("async", "logs/basic_async.log", true);
+            bench_mt(howmany, as, threads);
+            spdlog::drop("async");
+        }
+    }
+    catch (std::exception &ex)
+    {
+        std::cerr << "Error: " << ex.what() << std::endl;
+        perror("Last error");
+        return EXIT_FAILURE;
+    }
+    return EXIT_SUCCESS;
+}
+
+void bench(int howmany, std::shared_ptr<spdlog::logger> log)
+{
+    using namespace std::chrono;
+    using chrono::high_resolution_clock;
+    using chrono::milliseconds;
+    using chrono::nanoseconds;
+
+    cout << log->name() << "...\t\t" << flush;
+    nanoseconds total_nanos = nanoseconds::zero();
+    for (auto i = 0; i < howmany; ++i)
+    {
+        auto start = high_resolution_clock::now();
+        log->info("Hello logger: msg number {}", i);
+        auto delta_nanos = chrono::duration_cast<nanoseconds>(high_resolution_clock::now() - start);
+        total_nanos += delta_nanos;
+    }
+
+    auto avg = total_nanos.count() / howmany;
+    cout << format(avg) << " ns/call" << endl;
+}
+
+void bench_mt(int howmany, std::shared_ptr<spdlog::logger> log, int thread_count)
+{
+    using namespace std::chrono;
+    using chrono::high_resolution_clock;
+    using chrono::milliseconds;
+    using chrono::nanoseconds;
+
+    cout << log->name() << "...\t\t" << flush;
+    vector<thread> threads;
+    std::atomic<nanoseconds::rep> total_nanos{0};
+    for (int t = 0; t < thread_count; ++t)
+    {
+        threads.push_back(std::thread([&]() {
+            for (int j = 0; j < howmany / thread_count; j++)
+            {
+                auto start = high_resolution_clock::now();
+                log->info("Hello logger: msg number {}", j);
+                auto delta_nanos = chrono::duration_cast<nanoseconds>(high_resolution_clock::now() - start);
+                total_nanos += delta_nanos.count();
+            }
+        }));
+    }
+
+    for (auto &t : threads)
+    {
+        t.join();
+    };
+
+    auto avg = total_nanos / howmany;
+    cout << format(avg) << " ns/call" << endl;
+}

bench/latency/Makefile

@@ -1,32 +0,0 @@
-CXX	?= g++
-CXXFLAGS	= -march=native -Wall -std=c++11 -pthread 
-CXX_RELEASE_FLAGS = -O2 -DNDEBUG
-
-
-binaries=spdlog-latency g3log-latency g3log-crush
-
-all: $(binaries)
-
-spdlog-latency: spdlog-latency.cpp
-	$(CXX) spdlog-latency.cpp -o spdlog-latency $(CXXFLAGS) $(CXX_RELEASE_FLAGS) -I../../include
-
-
-
-g3log-latency: g3log-latency.cpp
-	$(CXX) g3log-latency.cpp -o g3log-latency $(CXXFLAGS) $(CXX_RELEASE_FLAGS) -I../../../g3log/src -L. -lg3logger 
-		
-		
-g3log-crush: g3log-crush.cpp
-	$(CXX) g3log-crush.cpp -o g3log-crush $(CXXFLAGS) $(CXX_RELEASE_FLAGS) -I../../../g3log/src -L. -lg3logger 
-		
-	
-.PHONY: clean
-
-clean:
-	rm -f *.o  *.log $(binaries)
-
-
-rebuild: clean all
-
-
-

bench/latency/compare.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-echo "running spdlog and g3log tests 10 time with ${1:-10} threads each (total 1,000,000 entries).."
-rm -f *.log
-for i in {1..10}
-
-do
-   echo
-   sleep 0.5
-   ./spdlog-latency ${1:-10} 2>/dev/null || exit
-   sleep 0.5
-   ./g3log-latency ${1:-10} 2>/dev/null || exit
-
-done

bench/latency/g3log-crush.cpp

@@ -1,34 +0,0 @@
-#include <iostream>
-
-#include <g3log/g3log.hpp>
-#include <g3log/logworker.hpp>
-
-void CrusherLoop()
-{
-    size_t counter = 0;
-    while (true)
-    {
-        LOGF(INFO, "Some text to crush you machine. thread:");
-        if (++counter % 1000000 == 0)
-        {
-            std::cout << "Wrote " << counter << " entries" << std::endl;
-        }
-    }
-}
-
-int main(int argc, char **argv)
-{
-    std::cout << "WARNING: This test will exaust all your machine memory and will crush it!" << std::endl;
-    std::cout << "Are you sure you want to continue ? " << std::endl;
-    char c;
-    std::cin >> c;
-    if (toupper(c) != 'Y')
-        return 0;
-
-    auto worker = g3::LogWorker::createLogWorker();
-    auto handle = worker->addDefaultLogger(argv[0], "g3log.txt");
-    g3::initializeLogging(worker.get());
-    CrusherLoop();
-
-    return 0;
-}

bench/latency/g3log-latency.cpp

@@ -1,118 +0,0 @@
-#include "utils.h"
-#include <algorithm>
-#include <atomic>
-#include <chrono>
-#include <cstdio>
-#include <fstream>
-#include <functional>
-#include <g3log/g3log.hpp>
-#include <g3log/logworker.hpp>
-#include <iomanip>
-#include <iostream>
-#include <map>
-#include <numeric>
-#include <sstream>
-#include <thread>
-#include <vector>
-
-namespace {
-const uint64_t g_iterations = 1000000;
-
-std::atomic<size_t> g_counter = {0};
-
-void MeasurePeakDuringLogWrites(const size_t id, std::vector<uint64_t> &result)
-{
-
-    while (true)
-    {
-        const size_t value_now = ++g_counter;
-        if (value_now > g_iterations)
-        {
-            return;
-        }
-
-        auto start_time = std::chrono::high_resolution_clock::now();
-        LOGF(INFO, "Some text to log for thread: %ld", id);
-        auto stop_time = std::chrono::high_resolution_clock::now();
-        uint64_t time_us = std::chrono::duration_cast<std::chrono::microseconds>(stop_time - start_time).count();
-        result.push_back(time_us);
-    }
-}
-
-void PrintResults(const std::map<size_t, std::vector<uint64_t>> &threads_result, size_t total_us)
-{
-
-    std::vector<uint64_t> all_measurements;
-    all_measurements.reserve(g_iterations);
-    for (auto &t_result : threads_result)
-    {
-        all_measurements.insert(all_measurements.end(), t_result.second.begin(), t_result.second.end());
-    }
-
-    // calc worst latenct
-    auto worst = *std::max_element(all_measurements.begin(), all_measurements.end());
-
-    // calc avg
-    auto total = accumulate(begin(all_measurements), end(all_measurements), 0, std::plus<uint64_t>());
-    auto avg = double(total) / all_measurements.size();
-
-    std::cout << "[g3log]  worst: " << std::setw(10) << std::right << worst << "\tAvg: " << avg << "\tTotal: " << utils::format(total_us)
-              << " us" << std::endl;
-}
-} // namespace
-
-// The purpose of this test is NOT to see how fast
-// each thread can possibly write. It is to see what
-// the worst latency is for writing a log entry
-//
-// In the test 1 million log entries will be written
-// an atomic counter is used to give each thread what
-// it is to write next. The overhead of atomic
-// synchronization between the threads are not counted in the worst case latency
-int main(int argc, char **argv)
-{
-    size_t number_of_threads{0};
-    if (argc == 2)
-    {
-        number_of_threads = atoi(argv[1]);
-    }
-    if (argc != 2 || number_of_threads == 0)
-    {
-        std::cerr << "USAGE is: " << argv[0] << " number_threads" << std::endl;
-        return 1;
-    }
-
-    std::vector<std::thread> threads(number_of_threads);
-    std::map<size_t, std::vector<uint64_t>> threads_result;
-
-    for (size_t idx = 0; idx < number_of_threads; ++idx)
-    {
-        // reserve to 1 million for all the result
-        // it's a test so  let's not care about the wasted space
-        threads_result[idx].reserve(g_iterations);
-    }
-
-    const std::string g_path = "./";
-    const std::string g_prefix_log_name = "g3log-performance-";
-    const std::string g_measurement_dump = g_path + g_prefix_log_name + "_RESULT.txt";
-
-    auto worker = g3::LogWorker::createLogWorker();
-    auto handle = worker->addDefaultLogger(argv[0], "g3log.txt");
-    g3::initializeLogging(worker.get());
-
-    auto start_time_application_total = std::chrono::high_resolution_clock::now();
-    for (uint64_t idx = 0; idx < number_of_threads; ++idx)
-    {
-        threads[idx] = std::thread(MeasurePeakDuringLogWrites, idx, std::ref(threads_result[idx]));
-    }
-    for (size_t idx = 0; idx < number_of_threads; ++idx)
-    {
-        threads[idx].join();
-    }
-    auto stop_time_application_total = std::chrono::high_resolution_clock::now();
-
-    uint64_t total_time_in_us =
-        std::chrono::duration_cast<std::chrono::microseconds>(stop_time_application_total - start_time_application_total).count();
-    PrintResults(threads_result, total_time_in_us);
-    return 0;
-}

bench/latency/spdlog-latency.cpp

@@ -1,119 +0,0 @@
-
-#include "utils.h"
-#include <algorithm>
-#include <atomic>
-#include <chrono>
-#include <cstdio>
-#include <functional>
-#include <iostream>
-#include <map>
-#include <numeric>
-#include <thread>
-#include <vector>
-
-#include "spdlog/spdlog.h"
-
-namespace spd = spdlog;
-
-namespace {
-const uint64_t g_iterations = 1000000;
-
-std::atomic<size_t> g_counter = {0};
-
-void MeasurePeakDuringLogWrites(const size_t id, std::vector<uint64_t> &result)
-{
-    auto logger = spd::get("file_logger");
-    while (true)
-    {
-        const size_t value_now = ++g_counter;
-        if (value_now > g_iterations)
-        {
-            return;
-        }
-
-        auto start_time = std::chrono::high_resolution_clock::now();
-        logger->info("Some text to log for thread: [somemore text...............................] {}", id);
-        auto stop_time = std::chrono::high_resolution_clock::now();
-        uint64_t time_us = std::chrono::duration_cast<std::chrono::microseconds>(stop_time - start_time).count();
-        result.push_back(time_us);
-    }
-}
-
-void PrintResults(const std::map<size_t, std::vector<uint64_t>> &threads_result, size_t total_us)
-{
-
-    std::vector<uint64_t> all_measurements;
-    all_measurements.reserve(g_iterations);
-    for (auto &t_result : threads_result)
-    {
-        all_measurements.insert(all_measurements.end(), t_result.second.begin(), t_result.second.end());
-    }
-
-    // calc worst latenct
-    auto worst = *std::max_element(all_measurements.begin(), all_measurements.end());
-
-    // calc avg
-    auto total = accumulate(begin(all_measurements), end(all_measurements), 0, std::plus<uint64_t>());
-    auto avg = double(total) / all_measurements.size();
-
-    std::cout << "[spdlog] worst: " << std::setw(10) << std::right << worst << "\tAvg: " << avg << "\tTotal: " << utils::format(total_us)
-              << " us" << std::endl;
-}
-} // namespace
-
-// The purpose of this test is NOT to see how fast
-// each thread can possibly write. It is to see what
-// the worst latency is for writing a log entry
-//
-// In the test 1 million log entries will be written
-// an atomic counter is used to give each thread what
-// it is to write next. The overhead of atomic
-// synchronization between the threads are not counted in the worst case latency
-int main(int argc, char **argv)
-{
-    size_t number_of_threads{0};
-    if (argc == 2)
-    {
-        number_of_threads = atoi(argv[1]);
-    }
-    if (argc != 2 || number_of_threads == 0)
-    {
-        std::cerr << "usage: " << argv[0] << " number_threads" << std::endl;
-        return 1;
-    }
-
-    std::vector<std::thread> threads(number_of_threads);
-    std::map<size_t, std::vector<uint64_t>> threads_result;
-
-    for (size_t idx = 0; idx < number_of_threads; ++idx)
-    {
-        // reserve to 1 million for all the result
-        // it's a test so  let's not care about the wasted space
-        threads_result[idx].reserve(g_iterations);
-    }
-
-    int queue_size = 1048576; // 2 ^ 20
-    spdlog::set_async_mode(queue_size);
-    auto logger = spdlog::create<spd::sinks::simple_file_sink_mt>("file_logger", "spdlog.log", true);
-
-    // force flush on every call to compare with g3log
-    auto s = (spd::sinks::simple_file_sink_mt *)logger->sinks()[0].get();
-    s->set_force_flush(true);
-
-    auto start_time_application_total = std::chrono::high_resolution_clock::now();
-    for (uint64_t idx = 0; idx < number_of_threads; ++idx)
-    {
-        threads[idx] = std::thread(MeasurePeakDuringLogWrites, idx, std::ref(threads_result[idx]));
-    }
-    for (size_t idx = 0; idx < number_of_threads; ++idx)
-    {
-        threads[idx].join();
-    }
-    auto stop_time_application_total = std::chrono::high_resolution_clock::now();
-
-    uint64_t total_time_in_us =
-        std::chrono::duration_cast<std::chrono::microseconds>(stop_time_application_total - start_time_application_total).count();
-
-    PrintResults(threads_result, total_time_in_us);
-    return 0;
-}

bench/latency/utils.h

@@ -1,34 +0,0 @@
-//
-// Copyright(c) 2015 Gabi Melman.
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-//
-
-#pragma once
-
-#include <iomanip>
-#include <locale>
-#include <sstream>
-
-namespace utils {
-
-template<typename T>
-inline std::string format(const T &value)
-{
-    static std::locale loc("");
-    std::stringstream ss;
-    ss.imbue(loc);
-    ss << value;
-    return ss.str();
-}
-
-template<>
-inline std::string format(const double &value)
-{
-    static std::locale loc("");
-    std::stringstream ss;
-    ss.imbue(loc);
-    ss << std::fixed << std::setprecision(1) << value;
-    return ss.str();
-}
-
-} // namespace utils

bench/log4cplus-bench-mt.cpp

@@ -1,78 +0,0 @@
-//
-// Copyright(c) 2015 Gabi Melman.
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-//
-
-#include <atomic>
-#include <chrono>
-#include <iostream>
-#include <memory>
-#include <thread>
-#include <vector>
-
-#include "log4cplus/fileappender.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[])
-{
-    using namespace std::chrono;
-    using clock = steady_clock;
-
-    int thread_count = 10;
-    if (argc > 1)
-        thread_count = std::atoi(argv[1]);
-
-    int howmany = 1000000;
-
-    log4cplus::initialize();
-    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<Layout>(new PatternLayout(pattern)));
-    append->getloc();
-    Logger::getRoot().addAppender(SharedAppenderPtr(append.get()));
-
-    Logger root = Logger::getRoot();
-
-    std::atomic<int> msg_counter{0};
-    std::vector<std::thread> threads;
-
-    auto start = clock::now();
-    for (int t = 0; t < thread_count; ++t)
-    {
-        threads.push_back(std::thread([&]() {
-            while (true)
-            {
-                int counter = ++msg_counter;
-                if (counter > howmany)
-                    break;
-                LOG4CPLUS_INFO(root, "log4cplus message #" << counter << ": This is some text for your pleasure");
-            }
-        }));
-    }
-
-    for (auto &t : threads)
-    {
-        t.join();
-    }
-
-    duration<float> delta = clock::now() - start;
-    float deltaf = delta.count();
-    auto rate = howmany / deltaf;
-
-    std::cout << "Total: " << howmany << std::endl;
-    std::cout << "Threads: " << thread_count << std::endl;
-    std::cout << "Delta = " << deltaf << " seconds" << std::endl;
-    std::cout << "Rate = " << rate << "/sec" << std::endl;
-
-    log4cplus::Logger::shutdown();
-    return 0;
-}

bench/log4cplus-bench.cpp

@@ -1,52 +0,0 @@
-//
-// Copyright(c) 2015 Gabi Melman.
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-//
-
-#include <chrono>
-#include <iostream>
-#include <memory>
-
-#include "log4cplus/fileappender.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, char *[])
-{
-    using namespace std::chrono;
-    using clock = steady_clock;
-
-    int howmany = 1000000;
-
-    log4cplus::initialize();
-    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<Layout>(new PatternLayout(pattern)));
-    append->getloc();
-    Logger::getRoot().addAppender(SharedAppenderPtr(append.get()));
-
-    Logger root = Logger::getRoot();
-
-    auto start = clock::now();
-    for (int i = 0; i < howmany; ++i)
-        LOG4CPLUS_INFO(root, "log4cplus message #" << i << ": This is some text for your pleasure");
-
-    duration<float> delta = clock::now() - start;
-    float deltaf = delta.count();
-    auto rate = howmany / deltaf;
-
-    std::cout << "Total: " << howmany << std::endl;
-    std::cout << "Delta = " << deltaf << " seconds" << std::endl;
-    std::cout << "Rate = " << rate << "/sec" << std::endl;
-
-    log4cplus::Logger::shutdown();
-    return 0;
-}

bench/log4cpp-bench-mt.cpp

@@ -1,74 +0,0 @@
-//
-// Copyright(c) 2015 Gabi Melman.
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-//
-
-#include <atomic>
-#include <chrono>
-#include <iostream>
-#include <memory>
-#include <thread>
-#include <vector>
-
-#include "log4cpp/Appender.hh"
-#include "log4cpp/BasicLayout.hh"
-#include "log4cpp/Category.hh"
-#include "log4cpp/FileAppender.hh"
-#include "log4cpp/Layout.hh"
-#include "log4cpp/PatternLayout.hh"
-#include "log4cpp/Priority.hh"
-
-int main(int argc, char *argv[])
-{
-    using namespace std::chrono;
-    using clock = steady_clock;
-
-    int thread_count = 10;
-    if (argc > 1)
-        thread_count = std::atoi(argv[1]);
-
-    int howmany = 1000000;
-
-    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();
-    root.addAppender(appender);
-    root.setPriority(log4cpp::Priority::INFO);
-
-    std::atomic<int> msg_counter{0};
-    std::vector<std::thread> threads;
-
-    auto start = clock::now();
-    for (int t = 0; t < thread_count; ++t)
-    {
-        threads.push_back(std::thread([&]() {
-            while (true)
-            {
-                int counter = ++msg_counter;
-                if (counter > howmany)
-                    break;
-                root << log4cpp::Priority::INFO << "log4cpp message #" << counter << ": This is some text for your pleasure";
-            }
-        }));
-    }
-
-    for (auto &t : threads)
-    {
-        t.join();
-    }
-
-    duration<float> delta = clock::now() - start;
-    float deltaf = delta.count();
-    auto rate = howmany / deltaf;
-
-    std::cout << "Total: " << howmany << std::endl;
-    std::cout << "Threads: " << thread_count << std::endl;
-    std::cout << "Delta = " << deltaf << " seconds" << std::endl;
-    std::cout << "Rate = " << rate << "/sec" << std::endl;
-
-    root.shutdown();
-    return 0;
-}

bench/log4cpp-bench.cpp

@@ -1,48 +0,0 @@
-//
-// Copyright(c) 2015 Gabi Melman.
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-//
-
-#include <chrono>
-#include <iostream>
-#include <memory>
-
-#include "log4cpp/Appender.hh"
-#include "log4cpp/BasicLayout.hh"
-#include "log4cpp/Category.hh"
-#include "log4cpp/FileAppender.hh"
-#include "log4cpp/Layout.hh"
-#include "log4cpp/PatternLayout.hh"
-#include "log4cpp/Priority.hh"
-
-int main(int, char *[])
-{
-    using namespace std::chrono;
-    using clock = steady_clock;
-
-    int howmany = 1000000;
-
-    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();
-    root.addAppender(appender);
-    root.setPriority(log4cpp::Priority::INFO);
-
-    auto start = clock::now();
-    for (int i = 0; i < howmany; ++i)
-        root << log4cpp::Priority::INFO << "log4cpp message #" << i << ": This is some text for your pleasure";
-
-    duration<float> delta = clock::now() - start;
-    float deltaf = delta.count();
-    auto rate = howmany / deltaf;
-
-    std::cout << "Total: " << howmany << std::endl;
-    std::cout << "Delta = " << deltaf << " seconds" << std::endl;
-    std::cout << "Rate = " << rate << "/sec" << std::endl;
-
-    root.shutdown();
-    return 0;
-}

bench/p7-bench-mt.cpp

@@ -1,94 +0,0 @@
-//
-// Copyright(c) 2015 Gabi Melman.
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-//
-
-#include <atomic>
-#include <chrono>
-#include <functional>
-#include <iostream>
-#include <memory>
-#include <thread>
-#include <vector>
-
-#include "P7_Trace.h"
-
-int main(int argc, char *argv[])
-{
-    using namespace std::chrono;
-    using clock = steady_clock;
-
-    int thread_count = 10;
-    if (argc > 1)
-        thread_count = std::atoi(argv[1]);
-
-    int howmany = 1000000;
-
-    IP7_Trace::hModule module = NULL;
-
-    // create P7 client object
-    std::unique_ptr<IP7_Client, std::function<void(IP7_Client *)>> client(
-        P7_Create_Client(TM("/P7.Pool=1024 /P7.Sink=FileTxt /P7.Dir=logs/p7-bench-mt")), [&](IP7_Client *ptr) {
-            if (ptr)
-                ptr->Release();
-        });
-
-    if (!client)
-    {
-        std::cout << "Can't create IP7_Client" << std::endl;
-        return 1;
-    }
-
-    // create P7 trace object 1
-    std::unique_ptr<IP7_Trace, std::function<void(IP7_Trace *)>> trace(
-        P7_Create_Trace(client.get(), TM("Trace channel 1")), [&](IP7_Trace *ptr) {
-            if (ptr)
-                ptr->Release();
-        });
-
-    if (!trace)
-    {
-        std::cout << "Can't create IP7_Trace" << std::endl;
-        return 1;
-    }
-
-    trace->Register_Thread(TM("Application"), 0);
-    trace->Register_Module(TM("Main"), &module);
-
-    std::atomic<int> msg_counter{0};
-    std::vector<std::thread> threads;
-
-    auto start = clock::now();
-    for (int t = 0; t < thread_count; ++t)
-    {
-        threads.push_back(std::thread([&]() {
-            trace->Register_Thread(TM("Application"), t + 1);
-            while (true)
-            {
-                int counter = ++msg_counter;
-                if (counter > howmany)
-                    break;
-                trace->P7_INFO(module, TM("p7 message #%d: This is some text for your pleasure"), counter);
-            }
-            trace->Register_Thread(TM("Application"), t + 1);
-        }));
-    }
-
-    for (auto &t : threads)
-    {
-        t.join();
-    }
-
-    duration<float> delta = clock::now() - start;
-    float deltaf = delta.count();
-    auto rate = howmany / deltaf;
-
-    std::cout << "Total: " << howmany << std::endl;
-    std::cout << "Threads: " << thread_count << std::endl;
-    std::cout << "Delta = " << deltaf << " seconds" << std::endl;
-    std::cout << "Rate = " << rate << "/sec" << std::endl;
-
-    trace->Unregister_Thread(0);
-
-    return 0;
-}

bench/p7-bench.cpp

@@ -1,66 +0,0 @@
-//
-// Copyright(c) 2015 Gabi Melman.
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-//
-
-#include <chrono>
-#include <functional>
-#include <iostream>
-#include <memory>
-
-#include "P7_Trace.h"
-
-int main(int, char *[])
-{
-    using namespace std::chrono;
-    using clock = steady_clock;
-
-    int howmany = 1000000;
-
-    IP7_Trace::hModule module = NULL;
-
-    // create P7 client object
-    std::unique_ptr<IP7_Client, std::function<void(IP7_Client *)>> client(
-        P7_Create_Client(TM("/P7.Pool=1024 /P7.Sink=FileTxt /P7.Dir=logs/p7-bench")), [&](IP7_Client *ptr) {
-            if (ptr)
-                ptr->Release();
-        });
-
-    if (!client)
-    {
-        std::cout << "Can't create IP7_Client" << std::endl;
-        return 1;
-    }
-
-    // create P7 trace object 1
-    std::unique_ptr<IP7_Trace, std::function<void(IP7_Trace *)>> trace(
-        P7_Create_Trace(client.get(), TM("Trace channel 1")), [&](IP7_Trace *ptr) {
-            if (ptr)
-                ptr->Release();
-        });
-
-    if (!trace)
-    {
-        std::cout << "Can't create IP7_Trace" << std::endl;
-        return 1;
-    }
-
-    trace->Register_Thread(TM("Application"), 0);
-    trace->Register_Module(TM("Main"), &module);
-
-    auto start = clock::now();
-    for (int i = 0; i < howmany; ++i)
-        trace->P7_INFO(module, TM("p7 message #%d: This is some text for your pleasure"), i);
-
-    duration<float> delta = clock::now() - start;
-    float deltaf = delta.count();
-    auto rate = howmany / deltaf;
-
-    std::cout << "Total: " << howmany << std::endl;
-    std::cout << "Delta = " << deltaf << " seconds" << std::endl;
-    std::cout << "Rate = " << rate << "/sec" << std::endl;
-
-    trace->Unregister_Thread(0);
-
-    return 0;
-}

bench/plog-bench-mt.cpp

@@ -1,61 +0,0 @@
-//
-// Copyright(c) 2015 Gabi Melman.
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-//
-
-#include <atomic>
-#include <chrono>
-#include <iostream>
-#include <thread>
-#include <vector>
-
-#include "plog/Log.h"
-
-using namespace std;
-
-int main(int argc, char *argv[])
-{
-    using namespace std::chrono;
-    using clock = steady_clock;
-
-    int thread_count = 10;
-    if (argc > 1)
-        thread_count = atoi(argv[1]);
-
-    int howmany = 1000000;
-
-    plog::init(plog::debug, "logs/plog-bench-mt.log");
-
-    std::atomic<int> msg_counter{0};
-    vector<thread> threads;
-
-    auto start = clock::now();
-    for (int t = 0; t < thread_count; ++t)
-    {
-        threads.push_back(std::thread([&]() {
-            while (true)
-            {
-                int counter = ++msg_counter;
-                if (counter > howmany)
-                    break;
-                LOG_INFO << "plog message #" << counter << ": This is some text for your pleasure";
-            }
-        }));
-    }
-
-    for (auto &t : threads)
-    {
-        t.join();
-    }
-
-    duration<float> delta = clock::now() - start;
-    float deltaf = delta.count();
-    auto rate = howmany / deltaf;
-
-    std::cout << "Total: " << howmany << std::endl;
-    std::cout << "Threads: " << thread_count << std::endl;
-    std::cout << "Delta = " << deltaf << " seconds" << std::endl;
-    std::cout << "Rate = " << rate << "/sec" << std::endl;
-
-    return 0;
-}

bench/plog-bench.cpp

@@ -1,34 +0,0 @@
-//
-// Copyright(c) 2015 Gabi Melman.
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-//
-
-#include <chrono>
-#include <iostream>
-#include <memory>
-
-#include "plog/Log.h"
-
-int main(int, char *[])
-{
-    using namespace std::chrono;
-    using clock = steady_clock;
-
-    int howmany = 1000000;
-
-    plog::init(plog::debug, "logs/plog-bench.log");
-
-    auto start = clock::now();
-    for (int i = 0; i < howmany; ++i)
-        LOG_INFO << "plog message #" << i << ": This is some text for your pleasure";
-
-    duration<float> delta = clock::now() - start;
-    float deltaf = delta.count();
-    auto rate = howmany / deltaf;
-
-    std::cout << "Total: " << howmany << std::endl;
-    std::cout << "Delta = " << deltaf << " seconds" << std::endl;
-    std::cout << "Rate = " << rate << "/sec" << std::endl;
-
-    return 0;
-}

bench/spdlog-async.cpp

@@ -10,7 +10,8 @@
 #include <thread>
 #include <vector>
 
-#include "spdlog/spdlog.h"
+#include "spdlog/async.h"
+#include "spdlog/sinks/basic_file_sink.h"
 
 using namespace std;
 
@@ -24,9 +25,9 @@ int main(int argc, char *argv[])
         thread_count = std::atoi(argv[1]);
 
     int howmany = 1000000;
+    spdlog::init_thread_pool(howmany, 1);
 
-    spdlog::set_async_mode(1048576);
-    auto logger = spdlog::create<spdlog::sinks::simple_file_sink_mt>("file_logger", "logs/spdlog-bench-async.log", false);
+    auto logger = spdlog::create_async_logger<spdlog::sinks::basic_file_sink_mt>("file_logger", "logs/spdlog-bench-async.log", false);
     logger->set_pattern("[%Y-%m-%d %T.%F]: %L %t %v");
 
     std::cout << "To stop, press <Enter>" << std::endl;

bench/spdlog-bench-mt.cpp

@@ -1,63 +0,0 @@
-//
-// Copyright(c) 2015 Gabi Melman.
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-//
-
-#include <atomic>
-#include <chrono>
-#include <cstdlib>
-#include <iostream>
-#include <thread>
-#include <vector>
-
-#include "spdlog/spdlog.h"
-
-using namespace std;
-
-int main(int argc, char *argv[])
-{
-    using namespace std::chrono;
-    using clock = steady_clock;
-
-    int thread_count = 10;
-    if (argc > 1)
-        thread_count = std::atoi(argv[1]);
-
-    int howmany = 1000000;
-
-    auto logger = spdlog::create<spdlog::sinks::simple_file_sink_mt>("file_logger", "logs/spdlog-bench-mt.log", false);
-    logger->set_pattern("[%Y-%m-%d %T.%F]: %L %t %v");
-
-    std::atomic<int> msg_counter{0};
-    std::vector<thread> threads;
-
-    auto start = clock::now();
-    for (int t = 0; t < thread_count; ++t)
-    {
-        threads.push_back(std::thread([&]() {
-            while (true)
-            {
-                int counter = ++msg_counter;
-                if (counter > howmany)
-                    break;
-                logger->info("spdlog message #{}: This is some text for your pleasure", counter);
-            }
-        }));
-    }
-
-    for (auto &t : threads)
-    {
-        t.join();
-    }
-
-    duration<float> delta = clock::now() - start;
-    float deltaf = delta.count();
-    auto rate = howmany / deltaf;
-
-    std::cout << "Total: " << howmany << std::endl;
-    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;
-
-    return 0;
-}

bench/spdlog-bench.cpp

@@ -1,34 +0,0 @@
-//
-// Copyright(c) 2015 Gabi Melman.
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-//
-
-#include <chrono>
-#include <iostream>
-
-#include "spdlog/spdlog.h"
-
-int main(int, char *[])
-{
-    using namespace std::chrono;
-    using clock = steady_clock;
-
-    int howmany = 1000000;
-
-    auto logger = spdlog::create<spdlog::sinks::simple_file_sink_st>("file_logger", "logs/spdlog-bench.log", false);
-    logger->set_pattern("[%Y-%m-%d %T.%F]: %L %v");
-
-    auto start = clock::now();
-    for (int i = 0; i < howmany; ++i)
-        logger->info("spdlog message #{} : This is some text for your pleasure", i);
-
-    duration<float> delta = clock::now() - start;
-    float deltaf = delta.count();
-    auto rate = howmany / deltaf;
-
-    std::cout << "Total: " << howmany << std::endl;
-    std::cout << "Delta = " << std::fixed << deltaf << " seconds" << std::endl;
-    std::cout << "Rate = " << std::fixed << rate << "/sec" << std::endl;
-
-    return 0;
-}

bench/spdlog-null-async.cpp

@@ -1,103 +0,0 @@
-//
-// Copyright(c) 2015 Gabi Melman.
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-//
-
-//
-// bench.cpp : spdlog benchmarks
-//
-#include "spdlog/async_logger.h"
-#include "spdlog/sinks/null_sink.h"
-#include "spdlog/spdlog.h"
-#include "utils.h"
-#include <atomic>
-#include <cstdlib> // EXIT_FAILURE
-#include <iostream>
-#include <memory>
-#include <string>
-#include <thread>
-
-using namespace std;
-using namespace std::chrono;
-using namespace spdlog;
-using namespace spdlog::sinks;
-using namespace utils;
-
-size_t bench_as(int howmany, std::shared_ptr<spdlog::logger> log, int thread_count);
-
-int main(int argc, char *argv[])
-{
-
-    int queue_size = 1048576;
-    int howmany = 1000000;
-    int threads = 10;
-    int iters = 10;
-
-    try
-    {
-
-        if (argc > 1)
-            howmany = atoi(argv[1]);
-        if (argc > 2)
-            threads = atoi(argv[2]);
-        if (argc > 3)
-            queue_size = atoi(argv[3]);
-
-        cout << "\n*******************************************************************************\n";
-        cout << "async logging.. " << threads << " threads sharing same logger, " << format(howmany) << " messages " << endl;
-        cout << "*******************************************************************************\n";
-
-        spdlog::set_async_mode(queue_size);
-
-        size_t total_rate = 0;
-
-        for (int i = 0; i < iters; ++i)
-        {
-            // auto as = spdlog::daily_logger_st("as", "logs/daily_async");
-            auto as = spdlog::create<null_sink_st>("async(null-sink)");
-            total_rate += bench_as(howmany, as, threads);
-            spdlog::drop("async(null-sink)");
-        }
-        std::cout << endl;
-        std::cout << "Avg rate: " << format(total_rate / iters) << "/sec" << std::endl;
-    }
-    catch (std::exception &ex)
-    {
-        std::cerr << "Error: " << ex.what() << std::endl;
-        perror("Last error");
-        return EXIT_FAILURE;
-    }
-    return EXIT_SUCCESS;
-}
-
-// return rate/sec
-size_t bench_as(int howmany, std::shared_ptr<spdlog::logger> log, int thread_count)
-{
-    cout << log->name() << "...\t\t" << flush;
-    std::atomic<int> msg_counter{0};
-    vector<thread> threads;
-    auto start = system_clock::now();
-    for (int t = 0; t < thread_count; ++t)
-    {
-        threads.push_back(std::thread([&]() {
-            for (;;)
-            {
-                int counter = ++msg_counter;
-                if (counter > howmany)
-                    break;
-                log->info("Hello logger: msg number {}", counter);
-            }
-        }));
-    }
-
-    for (auto &t : threads)
-    {
-        t.join();
-    }
-
-    auto delta = system_clock::now() - start;
-    auto delta_d = duration_cast<duration<double>>(delta).count();
-    auto per_sec = size_t(howmany / delta_d);
-    cout << format(per_sec) << "/sec" << endl;
-    return per_sec;
-}

example/Makefile

@@ -1,28 +1,20 @@
 CXX	?= g++
-CXXFLAGS	=
-CXX_FLAGS = -Wall -Wshadow -Wextra -pedantic -std=c++11 -pthread -I../include
+CXX_FLAGS = -Wall -Wextra -pedantic -std=c++11 -pthread -I../include -fmax-errors=1
 CXX_RELEASE_FLAGS = -O3 -march=native
 CXX_DEBUG_FLAGS= -g
 
-
-all:	example bench
-debug:	example-debug bench-debug
+all:	example 
+debug:	example-debug
 
 example: example.cpp
 	$(CXX) example.cpp -o example $(CXX_FLAGS) $(CXX_RELEASE_FLAGS) $(CXXFLAGS)
 
-bench: bench.cpp
-	$(CXX) bench.cpp -o bench $(CXX_FLAGS) $(CXX_RELEASE_FLAGS) $(CXXFLAGS)
-
 
 example-debug: example.cpp
 	$(CXX) example.cpp -o example-debug $(CXX_FLAGS) $(CXX_DEBUG_FLAGS) $(CXXFLAGS)
 
-bench-debug: bench.cpp
-	$(CXX) bench.cpp -o bench-debug $(CXX_FLAGS) $(CXX_DEBUG_FLAGS) $(CXXFLAGS)
-
 clean:
-	rm -f *.o logs/*.txt example example-debug bench bench-debug
+	rm -f *.o logs/*.txt example example-debug
 
 
 rebuild: clean all

example/Makefile.clang

@@ -4,26 +4,20 @@ CXX_RELEASE_FLAGS = -O2
 CXX_DEBUG_FLAGS= -g 
 
 
-all:	example bench
-debug: example-debug bench-debug
+all:	example 
+debug: example-debug 
 
 example: example.cpp
 	$(CXX) example.cpp -o example-clang $(CXXFLAGS) $(CXX_RELEASE_FLAGS)
 
-bench: bench.cpp
-	$(CXX) bench.cpp -o bench-clang $(CXXFLAGS) $(CXX_RELEASE_FLAGS)
 	
 
 example-debug: example.cpp
 	$(CXX) example.cpp -o example-clang-debug $(CXXFLAGS) $(CXX_DEBUG_FLAGS)
-	
-bench-debug: bench.cpp
-	$(CXX) bench.cpp -o bench-clang-debug $(CXXFLAGS) $(CXX_DEBUG_FLAGS)	
-
 
 
 clean:
-	rm -f *.o logs/*.txt example-clang example-clang-debug bench-clang bench-clang-debug 
+	rm -f *.o logs/*.txt example-clang example-clang-debug 
 
 
 rebuild: clean all

example/Makefile.mingw

@@ -1,29 +1,22 @@
 CXX	?= g++
-CXXFLAGS	=  -D_WIN32_WINNT=0x600 -march=native -Wall -Wextra -Wshadow -pedantic -std=gnu++0x -pthread -Wl,--no-as-needed  -I../include 
+CXXFLAGS	=  -D_WIN32_WINNT=0x600 -march=native -Wall -Wextra -pedantic -std=gnu++0x -pthread -Wl,--no-as-needed  -I../include 
 CXX_RELEASE_FLAGS = -O3 
 CXX_DEBUG_FLAGS= -g 
 
 
-all:	example bench
-debug: example-debug bench-debug
+all:	example 
+debug: example-debug 
 
 example: example.cpp
 	$(CXX) example.cpp -o example $(CXXFLAGS) $(CXX_RELEASE_FLAGS)
 
-bench: bench.cpp
-	$(CXX) bench.cpp -o bench $(CXXFLAGS) $(CXX_RELEASE_FLAGS)
 	
-
 example-debug: example.cpp
 	$(CXX) example.cpp -o example-debug $(CXXFLAGS) $(CXX_DEBUG_FLAGS)
-	
-bench-debug: bench.cpp
-	$(CXX) bench.cpp -o bench-debug $(CXXFLAGS) $(CXX_DEBUG_FLAGS)	
-
 
 
 clean:
-	rm -f *.o logs/*.txt example example-debug bench bench-debug 
+	rm -f *.o logs/*.txt example example-debug
 
 
 rebuild: clean all

example/example.cpp

@@ -7,134 +7,155 @@
 //
 //
 
-#define SPDLOG_TRACE_ON
-#define SPDLOG_DEBUG_ON
+#include <iostream>
+
+void stdout_example();
+void basic_example();
+void rotating_example();
+void daily_example();
+void async_example();
+void multi_sink_example();
+void user_defined_example();
+void err_handler_example();
+void syslog_example();
 
 #include "spdlog/spdlog.h"
 
-#include <iostream>
-#include <memory>
-
-void async_example();
-void syslog_example();
-void android_example();
-void user_defined_example();
-void err_handler_example();
-
-namespace spd = spdlog;
 int main(int, char *[])
 {
+
     try
     {
-        // Console logger with color
-        auto console = spd::stdout_color_mt("console");
-        console->info("Welcome to spdlog!");
-        console->error("Some error message with arg{}..", 1);
+        // console logging example
+        stdout_example();
 
-        // Formatting examples
-        console->warn("Easy padding in numbers like {:08d}", 12);
-        console->critical("Support for int: {0:d};  hex: {0:x};  oct: {0:o}; bin: {0:b}", 42);
-        console->info("Support for floats {:03.2f}", 1.23456);
-        console->info("Positional args are {1} {0}..", "too", "supported");
-        console->info("{:<30}", "left aligned");
+        // various file loggers
+        basic_example();
+        rotating_example();
+        daily_example();
 
-        spd::get("console")->info("loggers can be retrieved from a global registry using the spdlog::get(logger_name) function");
-
-        // Create basic file logger (not rotated)
-        auto my_logger = spd::basic_logger_mt("basic_logger", "logs/basic-log.txt");
-        my_logger->info("Some log message");
-
-        // Create a file rotating logger with 5mb size max and 3 rotated files
-        auto rotating_logger = spd::rotating_logger_mt("some_logger_name", "logs/rotating.txt", 1048576 * 5, 3);
-        for (int i = 0; i < 10; ++i)
-        {
-            rotating_logger->info("{} * {} equals {:>10}", i, i, i * i);
-        }
-
-        // Create a daily logger - a new file is created every day on 2:30am
-        auto daily_logger = spd::daily_logger_mt("daily_logger", "logs/daily.txt", 2, 30);
-        // trigger flush if the log severity is error or higher
-        daily_logger->flush_on(spd::level::err);
-        daily_logger->info(123.44);
-
-        // Customize msg format for all messages
-        spd::set_pattern("[%^+++%$] [%H:%M:%S %z] [thread %t] %v");
-        console->info("This an info message with custom format");
-        console->error("This an error message with custom format");
-
-        // Runtime log levels
-        spd::set_level(spd::level::info); // Set global log level to info
-        console->debug("This message should not be displayed!");
-        console->set_level(spd::level::debug); // Set specific logger's log level
-        console->debug("This message should be displayed..");
-
-        // Compile time log levels
-        // define SPDLOG_DEBUG_ON or SPDLOG_TRACE_ON
-        SPDLOG_TRACE(console, "Enabled only #ifdef SPDLOG_TRACE_ON..{} ,{}", 1, 3.23);
-        SPDLOG_DEBUG(console, "Enabled only #ifdef SPDLOG_DEBUG_ON.. {} ,{}", 1, 3.23);
-
-        // Asynchronous logging is very fast..
-        // Just call spdlog::set_async_mode(q_size) and all created loggers from now on will be asynchronous..
+        // async logging using a backing thread pool
         async_example();
 
-        // syslog example. linux/osx only
-        syslog_example();
+        // a logger can have multiple targets with different formats
+        multi_sink_example();
 
-        // android example. compile with NDK
-        android_example();
-
-        // Log user-defined types example
+        // user defined types logging by implementing operator<<
         user_defined_example();
 
-        // Change default log error handler
+        // custom  error handler
         err_handler_example();
 
-        // Apply a function on all registered loggers
-        spd::apply_all([&](std::shared_ptr<spdlog::logger> l) { l->info("End of example."); });
+        // flush all *registered* loggers using a worker thread every 3 seconds.
+        // note: registered loggers *must* be thread safe for this to work correctly!
+        spdlog::flush_every(std::chrono::seconds(3));
 
-        // Release and close all loggers
-        spdlog::drop_all();
+        // apply some function on all registered loggers
+        spdlog::apply_all([&](std::shared_ptr<spdlog::logger> l) { l->info("End of example."); });
+
+        // release any threads created by spdlog, and drop all loggers in the registry.
+        spdlog::shutdown();
     }
     // Exceptions will only be thrown upon failed logger or sink construction (not during logging)
-    catch (const spd::spdlog_ex &ex)
+    catch (const spdlog::spdlog_ex &ex)
     {
         std::cout << "Log init failed: " << ex.what() << std::endl;
         return 1;
     }
 }
 
+#include "spdlog/sinks/stdout_color_sinks.h"
+// or #include "spdlog/sinks/stdout_sinks.h" if no colors needed
+void stdout_example()
+{
+    // create color multi threaded logger
+    auto console = spdlog::stdout_color_mt("console");
+    console->info("Welcome to spdlog version {}.{}.{} !", SPDLOG_VER_MAJOR, SPDLOG_VER_MINOR, SPDLOG_VER_PATCH);
+    console->error("Some error message with arg: {}", 1);
+
+    auto err_logger = spdlog::stderr_color_mt("stderr");
+    err_logger->error("Some error message");
+
+    // Formatting examples
+    console->warn("Easy padding in numbers like {:08d}", 12);
+    console->critical("Support for int: {0:d};  hex: {0:x};  oct: {0:o}; bin: {0:b}", 42);
+    console->info("Support for floats {:03.2f}", 1.23456);
+    console->info("Positional args are {1} {0}..", "too", "supported");
+    console->info("{:<30}", "left aligned");
+
+    spdlog::get("console")->info("loggers can be retrieved from a global registry using the spdlog::get(logger_name)");
+
+    // Runtime log levels
+    spdlog::set_level(spdlog::level::info); // Set global log level to info
+    console->debug("This message should not be displayed!");
+    console->set_level(spdlog::level::trace); // Set specific logger's log level
+    console->debug("This message should be displayed..");
+
+    // Customize msg format for all loggers
+    spdlog::set_pattern("[%H:%M:%S %z] [%n] [%^---%L---%$] [thread %t] %v");
+    console->info("This an info message with custom format");
+
+    // Compile time log levels
+    // define SPDLOG_DEBUG_ON or SPDLOG_TRACE_ON
+    SPDLOG_TRACE(console, "Enabled only #ifdef SPDLOG_TRACE_ON..{} ,{}", 1, 3.23);
+    SPDLOG_DEBUG(console, "Enabled only #ifdef SPDLOG_DEBUG_ON.. {} ,{}", 1, 3.23);
+}
+
+#include "spdlog/sinks/basic_file_sink.h"
+void basic_example()
+{
+    // Create basic file logger (not rotated)
+    auto my_logger = spdlog::basic_logger_mt("basic_logger", "logs/basic-log.txt");
+}
+
+#include "spdlog/sinks/rotating_file_sink.h"
+void rotating_example()
+{
+    // Create a file rotating logger with 5mb size max and 3 rotated files
+    auto rotating_logger = spdlog::rotating_logger_mt("some_logger_name", "logs/rotating.txt", 1048576 * 5, 3);
+}
+
+#include "spdlog/sinks/daily_file_sink.h"
+void daily_example()
+{
+    // Create a daily logger - a new file is created every day on 2:30am
+    auto daily_logger = spdlog::daily_logger_mt("daily_logger", "logs/daily.txt", 2, 30);
+}
+
+#include "spdlog/async.h"
 void async_example()
 {
-    size_t q_size = 4096; // queue size must be power of 2
-    spdlog::set_async_mode(q_size);
-    auto async_file = spd::daily_logger_st("async_file_logger", "logs/async_log.txt");
-    for (int i = 0; i < 100; ++i)
+    // default thread pool settings can be modified *before* creating the async logger:
+    // spdlog::init_thread_pool(32768, 1); // queue with max 32k items 1 backing thread.
+    auto async_file = spdlog::basic_logger_mt<spdlog::async_factory>("async_file_logger", "logs/async_log.txt");
+    // alternatively:
+    // auto async_file = spdlog::create_async<spdlog::sinks::basic_file_sink_mt>("async_file_logger", "logs/async_log.txt");
+
+    for (int i = 1; i < 101; ++i)
     {
         async_file->info("Async message #{}", i);
     }
 }
 
-// syslog example (linux/osx/freebsd)
-void syslog_example()
-{
-#ifdef SPDLOG_ENABLE_SYSLOG
-    std::string ident = "spdlog-example";
-    auto syslog_logger = spd::syslog_logger("syslog", ident, LOG_PID);
-    syslog_logger->warn("This is warning that will end up in syslog.");
-#endif
-}
+// create logger with 2 targets with different log levels and formats
+// the console will show only warnings or errors, while the file will log all
 
-// Android example
-void android_example()
+void multi_sink_example()
 {
-#if defined(__ANDROID__)
-    std::string tag = "spdlog-android";
-    auto android_logger = spd::android_logger("android", tag);
-    android_logger->critical("Use \"adb shell logcat\" to view this message.");
-#endif
-}
+    auto console_sink = std::make_shared<spdlog::sinks::stdout_color_sink_mt>();
+    console_sink->set_level(spdlog::level::warn);
+    console_sink->set_pattern("[multi_sink_example] [%^%l%$] %v");
 
+    auto file_sink = std::make_shared<spdlog::sinks::basic_file_sink_mt>("logs/multisink.txt", true);
+    file_sink->set_level(spdlog::level::trace);
+
+    spdlog::logger logger("multi_sink", {console_sink, file_sink});
+    logger.set_level(spdlog::level::debug);
+    logger.warn("this should appear in both console and file");
+    logger.info("this message should not appear in the console, only in the file");
+}
 // user defined types logging by implementing operator<<
+#include "spdlog/fmt/ostr.h" // must be included
 struct my_type
 {
     int i;
@@ -145,10 +166,9 @@ struct my_type
     }
 };
 
-#include "spdlog/fmt/ostr.h" // must be included
 void user_defined_example()
 {
-    spd::get("console")->info("user defined type: {}", my_type{14});
+    spdlog::get("console")->info("user defined type: {}", my_type{14});
 }
 
 //
@@ -156,7 +176,30 @@ void user_defined_example()
 //
 void err_handler_example()
 {
-    // can be set globaly or per logger(logger->set_error_handler(..))
-    spdlog::set_error_handler([](const std::string &msg) { std::cerr << "my err handler: " << msg << std::endl; });
-    spd::get("console")->info("some invalid message to trigger an error {}{}{}{}", 3);
+    // can be set globally or per logger(logger->set_error_handler(..))
+    spdlog::set_error_handler([](const std::string &msg) { spdlog::get("console")->error("*** ERROR HANDLER EXAMPLE ***: {}", msg); });
+    spdlog::get("console")->info("some invalid message to trigger an error {}{}{}{}", 3);
 }
+
+// syslog example (linux/osx/freebsd)
+#ifndef _WIN32
+#include "spdlog/sinks/syslog_sink.h"
+void syslog_example()
+{
+    std::string ident = "spdlog-example";
+    auto syslog_logger = spdlog::syslog_logger_mt("syslog", ident, LOG_PID);
+    syslog_logger->warn("This is warning that will end up in syslog.");
+}
+#endif
+
+// Android example
+#if defined(__ANDROID__)
+#include "spdlog/sinks/android_sink.h"
+void android_example()
+{
+    std::string tag = "spdlog-android";
+    auto android_logger = spdlog::android_logger_mt("android", tag);
+    android_logger->critical("Use \"adb shell logcat\" to view this message.");
+}
+
+#endif

example/example.sln

@@ -1,10 +1,79 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.27703.2018
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example", "example.vcxproj", "{9E5AB93A-0CCE-4BAC-9FCB-0FC9CB5EB8D2}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "spdlog", "spdlog", "{7FC6AB76-AD88-4135-888C-0568E81475AF}"
+	ProjectSection(SolutionItems) = preProject
+		..\include\spdlog\async.h = ..\include\spdlog\async.h
+		..\include\spdlog\async_logger.h = ..\include\spdlog\async_logger.h
+		..\include\spdlog\common.h = ..\include\spdlog\common.h
+		..\include\spdlog\formatter.h = ..\include\spdlog\formatter.h
+		..\include\spdlog\logger.h = ..\include\spdlog\logger.h
+		..\include\spdlog\spdlog.h = ..\include\spdlog\spdlog.h
+		..\include\spdlog\tweakme.h = ..\include\spdlog\tweakme.h
+		..\include\spdlog\version.h = ..\include\spdlog\version.h
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "details", "details", "{08E93803-E650-42D9-BBB4-3C16979F850E}"
+	ProjectSection(SolutionItems) = preProject
+		..\include\spdlog\details\async_logger_impl.h = ..\include\spdlog\details\async_logger_impl.h
+		..\include\spdlog\details\circular_q.h = ..\include\spdlog\details\circular_q.h
+		..\include\spdlog\details\console_globals.h = ..\include\spdlog\details\console_globals.h
+		..\include\spdlog\details\file_helper.h = ..\include\spdlog\details\file_helper.h
+		..\include\spdlog\details\fmt_helper.h = ..\include\spdlog\details\fmt_helper.h
+		..\include\spdlog\details\log_msg.h = ..\include\spdlog\details\log_msg.h
+		..\include\spdlog\details\logger_impl.h = ..\include\spdlog\details\logger_impl.h
+		..\include\spdlog\details\mpmc_blocking_q.h = ..\include\spdlog\details\mpmc_blocking_q.h
+		..\include\spdlog\details\null_mutex.h = ..\include\spdlog\details\null_mutex.h
+		..\include\spdlog\details\os.h = ..\include\spdlog\details\os.h
+		..\include\spdlog\details\pattern_formatter.h = ..\include\spdlog\details\pattern_formatter.h
+		..\include\spdlog\details\periodic_worker.h = ..\include\spdlog\details\periodic_worker.h
+		..\include\spdlog\details\registry.h = ..\include\spdlog\details\registry.h
+		..\include\spdlog\details\spdlog_impl.h = ..\include\spdlog\details\spdlog_impl.h
+		..\include\spdlog\details\thread_pool.h = ..\include\spdlog\details\thread_pool.h
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "fmt", "fmt", "{82378DE1-8463-4F91-91A0-C2C40E2AEA2A}"
+	ProjectSection(SolutionItems) = preProject
+		..\include\spdlog\fmt\fmt.h = ..\include\spdlog\fmt\fmt.h
+		..\include\spdlog\fmt\ostr.h = ..\include\spdlog\fmt\ostr.h
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "bundled", "bundled", "{D9CA4494-80D1-48D1-A897-D3564F7B27FF}"
+	ProjectSection(SolutionItems) = preProject
+		..\include\spdlog\fmt\bundled\format.cc = ..\include\spdlog\fmt\bundled\format.cc
+		..\include\spdlog\fmt\bundled\format.h = ..\include\spdlog\fmt\bundled\format.h
+		..\include\spdlog\fmt\bundled\LICENSE.rst = ..\include\spdlog\fmt\bundled\LICENSE.rst
+		..\include\spdlog\fmt\bundled\ostream.cc = ..\include\spdlog\fmt\bundled\ostream.cc
+		..\include\spdlog\fmt\bundled\ostream.h = ..\include\spdlog\fmt\bundled\ostream.h
+		..\include\spdlog\fmt\bundled\posix.cc = ..\include\spdlog\fmt\bundled\posix.cc
+		..\include\spdlog\fmt\bundled\posix.h = ..\include\spdlog\fmt\bundled\posix.h
+		..\include\spdlog\fmt\bundled\printf.cc = ..\include\spdlog\fmt\bundled\printf.cc
+		..\include\spdlog\fmt\bundled\printf.h = ..\include\spdlog\fmt\bundled\printf.h
+		..\include\spdlog\fmt\bundled\time.h = ..\include\spdlog\fmt\bundled\time.h
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sinks", "sinks", "{27D16BB9-2B81-4F61-80EC-0C7A777248E4}"
+	ProjectSection(SolutionItems) = preProject
+		..\include\spdlog\sinks\android_sink.h = ..\include\spdlog\sinks\android_sink.h
+		..\include\spdlog\sinks\ansicolor_sink.h = ..\include\spdlog\sinks\ansicolor_sink.h
+		..\include\spdlog\sinks\base_sink.h = ..\include\spdlog\sinks\base_sink.h
+		..\include\spdlog\sinks\dist_sink.h = ..\include\spdlog\sinks\dist_sink.h
+		..\include\spdlog\sinks\file_sinks.h = ..\include\spdlog\sinks\file_sinks.h
+		..\include\spdlog\sinks\msvc_sink.h = ..\include\spdlog\sinks\msvc_sink.h
+		..\include\spdlog\sinks\null_sink.h = ..\include\spdlog\sinks\null_sink.h
+		..\include\spdlog\sinks\ostream_sink.h = ..\include\spdlog\sinks\ostream_sink.h
+		..\include\spdlog\sinks\sink.h = ..\include\spdlog\sinks\sink.h
+		..\include\spdlog\sinks\stdout_color_sinks.h = ..\include\spdlog\sinks\stdout_color_sinks.h
+		..\include\spdlog\sinks\stdout_sinks.h = ..\include\spdlog\sinks\stdout_sinks.h
+		..\include\spdlog\sinks\syslog_sink.h = ..\include\spdlog\sinks\syslog_sink.h
+		..\include\spdlog\sinks\wincolor_sink.h = ..\include\spdlog\sinks\wincolor_sink.h
+		..\include\spdlog\sinks\windebug_sink.h = ..\include\spdlog\sinks\windebug_sink.h
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -15,12 +84,23 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{9E5AB93A-0CCE-4BAC-9FCB-0FC9CB5EB8D2}.Debug|Win32.ActiveCfg = Debug|Win32
 		{9E5AB93A-0CCE-4BAC-9FCB-0FC9CB5EB8D2}.Debug|Win32.Build.0 = Debug|Win32
-		{9E5AB93A-0CCE-4BAC-9FCB-0FC9CB5EB8D2}.Debug|x64.ActiveCfg = Debug|Win32
+		{9E5AB93A-0CCE-4BAC-9FCB-0FC9CB5EB8D2}.Debug|x64.ActiveCfg = Debug|x64
+		{9E5AB93A-0CCE-4BAC-9FCB-0FC9CB5EB8D2}.Debug|x64.Build.0 = Debug|x64
 		{9E5AB93A-0CCE-4BAC-9FCB-0FC9CB5EB8D2}.Release|Win32.ActiveCfg = Release|Win32
 		{9E5AB93A-0CCE-4BAC-9FCB-0FC9CB5EB8D2}.Release|Win32.Build.0 = Release|Win32
-		{9E5AB93A-0CCE-4BAC-9FCB-0FC9CB5EB8D2}.Release|x64.ActiveCfg = Release|Win32
+		{9E5AB93A-0CCE-4BAC-9FCB-0FC9CB5EB8D2}.Release|x64.ActiveCfg = Release|x64
+		{9E5AB93A-0CCE-4BAC-9FCB-0FC9CB5EB8D2}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{08E93803-E650-42D9-BBB4-3C16979F850E} = {7FC6AB76-AD88-4135-888C-0568E81475AF}
+		{82378DE1-8463-4F91-91A0-C2C40E2AEA2A} = {7FC6AB76-AD88-4135-888C-0568E81475AF}
+		{D9CA4494-80D1-48D1-A897-D3564F7B27FF} = {82378DE1-8463-4F91-91A0-C2C40E2AEA2A}
+		{27D16BB9-2B81-4F61-80EC-0C7A777248E4} = {7FC6AB76-AD88-4135-888C-0568E81475AF}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {1BF53532-C5DC-4236-B195-9E17CBE40A48}
+	EndGlobalSection
 EndGlobal

example/example.vcxproj

@@ -1,68 +1,56 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="example.cpp" />
   </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\include\spdlog\async_logger.h" />
-    <ClInclude Include="..\include\spdlog\common.h" />
-    <ClInclude Include="..\include\spdlog\details\async_logger_impl.h" />
-    <ClInclude Include="..\include\spdlog\details\async_log_helper.h" />
-    <ClInclude Include="..\include\spdlog\details\file_helper.h" />
-    <ClInclude Include="..\include\spdlog\details\logger_impl.h" />
-    <ClInclude Include="..\include\spdlog\details\log_msg.h" />
-    <ClInclude Include="..\include\spdlog\details\mpmc_bounded_q.h" />
-    <ClInclude Include="..\include\spdlog\details\null_mutex.h" />
-    <ClInclude Include="..\include\spdlog\details\os.h" />
-    <ClInclude Include="..\include\spdlog\details\pattern_formatter_impl.h" />
-    <ClInclude Include="..\include\spdlog\details\registry.h" />
-    <ClInclude Include="..\include\spdlog\details\spdlog_impl.h" />
-    <ClInclude Include="..\include\spdlog\fmt\fmt.h" />
-    <ClInclude Include="..\include\spdlog\fmt\ostr.h" />
-    <ClInclude Include="..\include\spdlog\formatter.h" />
-    <ClInclude Include="..\include\spdlog\logger.h" />
-    <ClInclude Include="..\include\spdlog\sinks\android_sink.h" />
-    <ClInclude Include="..\include\spdlog\sinks\ansicolor_sink.h" />
-    <ClInclude Include="..\include\spdlog\sinks\base_sink.h" />
-    <ClInclude Include="..\include\spdlog\sinks\dist_sink.h" />
-    <ClInclude Include="..\include\spdlog\sinks\file_sinks.h" />
-    <ClInclude Include="..\include\spdlog\sinks\msvc_sink.h" />
-    <ClInclude Include="..\include\spdlog\sinks\null_sink.h" />
-    <ClInclude Include="..\include\spdlog\sinks\ostream_sink.h" />
-    <ClInclude Include="..\include\spdlog\sinks\sink.h" />
-    <ClInclude Include="..\include\spdlog\sinks\stdout_sinks.h" />
-    <ClInclude Include="..\include\spdlog\sinks\syslog_sink.h" />
-    <ClInclude Include="..\include\spdlog\sinks\wincolor_sink.h" />
-    <ClInclude Include="..\include\spdlog\spdlog.h" />
-    <ClInclude Include="..\include\spdlog\tweakme.h" />
-  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{9E5AB93A-0CCE-4BAC-9FCB-0FC9CB5EB8D2}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>.</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -72,16 +60,28 @@
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>
@@ -98,6 +98,24 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PrecompiledHeaderFile>
+      </PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
@@ -120,6 +138,30 @@
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PrecompiledHeaderFile>
+      </PrecompiledHeaderFile>
+      <PrecompiledHeaderOutputFile>
+      </PrecompiledHeaderOutputFile>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>

example/multisink.cpp

@@ -1,5 +1,6 @@
+#include "spdlog/sinks/file_sinks.h"
+#include "spdlog/sinks/stdout_sinks.h"
 #include "spdlog/spdlog.h"
-
 #include <iostream>
 #include <memory>
 
@@ -14,8 +15,8 @@ int main(int, char *[])
         // Each sink can have it's own log level and a message will be logged.
         std::vector<spdlog::sink_ptr> sinks;
         sinks.push_back(std::make_shared<spdlog::sinks::stdout_sink_mt>());
-        sinks.push_back(std::make_shared<spdlog::sinks::simple_file_sink_mt>("./log_regular_file.txt"));
-        sinks.push_back(std::make_shared<spdlog::sinks::simple_file_sink_mt>("./log_debug_file.txt"));
+        sinks.push_back(std::make_shared<spdlog::sinks::basic_file_sink_mt>("./log_regular_file.txt"));
+        sinks.push_back(std::make_shared<spdlog::sinks::basic_file_sink_mt>("./log_debug_file.txt"));
 
         spdlog::logger console_multisink("multisink", sinks.begin(), sinks.end());
         console_multisink.set_level(spdlog::level::warn);

include/spdlog/async.h

@@ -0,0 +1,87 @@
+
+//
+// Copyright(c) 2018 Gabi Melman.
+// Distributed under the MIT License (http://opensource.org/licenses/MIT)
+//
+
+#pragma once
+
+//
+// Async logging using global thread pool
+// All loggers created here share same global thread pool.
+// Each log message is pushed to a queue along withe a shared pointer to the
+// logger.
+// If a logger deleted while having pending messages in the queue, it's actual
+// destruction will defer
+// until all its messages are processed by the thread pool.
+// This is because each message in the queue holds a shared_ptr to the
+// originating logger.
+
+#include "spdlog/async_logger.h"
+#include "spdlog/details/registry.h"
+#include "spdlog/details/thread_pool.h"
+
+#include <memory>
+#include <mutex>
+
+namespace spdlog {
+
+namespace details {
+static const size_t default_async_q_size = 8192;
+}
+
+// async logger factory - creates async loggers backed with thread pool.
+// if a global thread pool doesn't already exist, create it with default queue
+// size of 8192 items and single thread.
+template<async_overflow_policy OverflowPolicy = async_overflow_policy::block>
+struct async_factory_impl
+{
+    template<typename Sink, typename... SinkArgs>
+    static std::shared_ptr<async_logger> create(const std::string &logger_name, SinkArgs &&... args)
+    {
+        auto &registry_inst = details::registry::instance();
+
+        // create global thread pool if not already exists..
+        std::lock_guard<std::recursive_mutex>(registry_inst.tp_mutex());
+        auto tp = registry_inst.get_tp();
+        if (tp == nullptr)
+        {
+            tp = std::make_shared<details::thread_pool>(details::default_async_q_size, 1);
+            registry_inst.set_tp(tp);
+        }
+
+        auto sink = std::make_shared<Sink>(std::forward<SinkArgs>(args)...);
+        auto new_logger = std::make_shared<async_logger>(logger_name, std::move(sink), std::move(tp), OverflowPolicy);
+        registry_inst.register_and_init(new_logger);
+        return new_logger;
+    }
+};
+
+using async_factory = async_factory_impl<async_overflow_policy::block>;
+using async_factory_nonblock = async_factory_impl<async_overflow_policy::overrun_oldest>;
+
+template<typename Sink, typename... SinkArgs>
+inline std::shared_ptr<spdlog::logger> create_async(const std::string &logger_name, SinkArgs &&... sink_args)
+{
+    return async_factory::create<Sink>(logger_name, std::forward<SinkArgs>(sink_args)...);
+}
+
+template<typename Sink, typename... SinkArgs>
+inline std::shared_ptr<spdlog::logger> create_async_nb(const std::string &logger_name, SinkArgs &&... sink_args)
+{
+    return async_factory_nonblock::create<Sink>(logger_name, std::forward<SinkArgs>(sink_args)...);
+}
+
+// set global thread pool.
+inline void init_thread_pool(size_t q_size, size_t thread_count)
+{
+    auto tp = std::make_shared<details::thread_pool>(q_size, thread_count);
+    details::registry::instance().set_tp(std::move(tp));
+}
+
+// get the global thread pool.
+inline std::shared_ptr<spdlog::details::thread_pool> thread_pool()
+{
+    return details::registry::instance().get_tp();
+}
+} // namespace spdlog

include/spdlog/async_logger.h

@@ -5,67 +5,66 @@
 
 #pragma once
 
-// Very fast asynchronous logger (millions of logs per second on an average desktop)
-// Uses pre allocated lockfree queue for maximum throughput even under large number of threads.
+// Very fast asynchronous logger (millions of logs per second on an average
+// desktop)
+// Uses pre allocated lockfree queue for maximum throughput even under large
+// number of threads.
 // Creates a single back thread to pop messages from the queue and log them.
 //
 // Upon each log write the logger:
 //    1. Checks if its log level is enough to log the message
-//    2. Push a new copy of the message to a queue (or block the caller until space is available in the queue)
+//    2. Push a new copy of the message to a queue (or block the caller until
+//    space is available in the queue)
 //    3. will throw spdlog_ex upon log exceptions
-// Upon destruction, logs all remaining messages in the queue before destructing..
+// Upon destruction, logs all remaining messages in the queue before
+// destructing..
 
-#include "common.h"
-#include "logger.h"
+#include "spdlog/common.h"
+#include "spdlog/logger.h"
 
 #include <chrono>
-#include <functional>
 #include <memory>
 #include <string>
 
 namespace spdlog {
 
+// Async overflow policy - block by default.
+enum class async_overflow_policy
+{
+    block,         // Block until message can be enqueued
+    overrun_oldest // Discard oldest message in the queue if full when trying to
+                   // add new item.
+};
+
 namespace details {
-class async_log_helper;
+class thread_pool;
 }
 
-class async_logger SPDLOG_FINAL : public logger
+class async_logger SPDLOG_FINAL : public std::enable_shared_from_this<async_logger>, public logger
 {
+    friend class details::thread_pool;
+
 public:
-    template<class It>
-    async_logger(const std::string &logger_name, const It &begin, const It &end, size_t queue_size,
-        const async_overflow_policy overflow_policy = async_overflow_policy::block_retry,
-        const std::function<void()> &worker_warmup_cb = nullptr,
-        const std::chrono::milliseconds &flush_interval_ms = std::chrono::milliseconds::zero(),
-        const std::function<void()> &worker_teardown_cb = nullptr);
+    template<typename It>
+    async_logger(std::string logger_name, const It &begin, const It &end, std::weak_ptr<details::thread_pool> tp,
+        async_overflow_policy overflow_policy = async_overflow_policy::block);
 
-    async_logger(const std::string &logger_name, sinks_init_list sinks, size_t queue_size,
-        const async_overflow_policy overflow_policy = async_overflow_policy::block_retry,
-        const std::function<void()> &worker_warmup_cb = nullptr,
-        const std::chrono::milliseconds &flush_interval_ms = std::chrono::milliseconds::zero(),
-        const std::function<void()> &worker_teardown_cb = nullptr);
+    async_logger(std::string logger_name, sinks_init_list sinks, std::weak_ptr<details::thread_pool> tp,
+        async_overflow_policy overflow_policy = async_overflow_policy::block);
 
-    async_logger(const std::string &logger_name, sink_ptr single_sink, size_t queue_size,
-        const async_overflow_policy overflow_policy = async_overflow_policy::block_retry,
-        const std::function<void()> &worker_warmup_cb = nullptr,
-        const std::chrono::milliseconds &flush_interval_ms = std::chrono::milliseconds::zero(),
-        const std::function<void()> &worker_teardown_cb = nullptr);
-
-    // Wait for the queue to be empty, and flush synchronously
-    // Warning: this can potentially last forever as we wait it to complete
-    void flush() override;
-
-    // Error handler
-    void set_error_handler(log_err_handler) override;
-    log_err_handler error_handler() override;
+    async_logger(std::string logger_name, sink_ptr single_sink, std::weak_ptr<details::thread_pool> tp,
+        async_overflow_policy overflow_policy = async_overflow_policy::block);
 
 protected:
-    void _sink_it(details::log_msg &msg) override;
-    void _set_formatter(spdlog::formatter_ptr msg_formatter) override;
-    void _set_pattern(const std::string &pattern, pattern_time_type pattern_time) override;
+    void sink_it_(details::log_msg &msg) override;
+    void flush_() override;
+
+    void backend_log_(details::log_msg &incoming_log_msg);
+    void backend_flush_();
 
 private:
-    std::unique_ptr<details::async_log_helper> _async_log_helper;
+    std::weak_ptr<details::thread_pool> thread_pool_;
+    async_overflow_policy overflow_policy_;
 };
 } // namespace spdlog
 

include/spdlog/common.h

@@ -5,25 +5,23 @@
 
 #pragma once
 
-#define SPDLOG_VERSION "0.16.4-rc"
-
-#include "tweakme.h"
+#include "spdlog/tweakme.h"
 
 #include <atomic>
 #include <chrono>
-#include <exception>
 #include <functional>
 #include <initializer_list>
 #include <memory>
+#include <stdexcept>
 #include <string>
 #include <unordered_map>
 
-#if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)
+#if defined(SPDLOG_WCHAR_FILENAMES) || defined(SPDLOG_WCHAR_TO_UTF8_SUPPORT)
 #include <codecvt>
 #include <locale>
 #endif
 
-#include "details/null_mutex.h"
+#include "spdlog/details/null_mutex.h"
 
 // visual studio upto 2013 does not support noexcept nor constexpr
 #if defined(_MSC_VER) && (_MSC_VER < 1900)
@@ -49,7 +47,7 @@
 #define SPDLOG_DEPRECATED
 #endif
 
-#include "fmt/fmt.h"
+#include "spdlog/fmt/fmt.h"
 
 namespace spdlog {
 
@@ -62,15 +60,14 @@ class sink;
 using log_clock = std::chrono::system_clock;
 using sink_ptr = std::shared_ptr<sinks::sink>;
 using sinks_init_list = std::initializer_list<sink_ptr>;
-using formatter_ptr = std::shared_ptr<spdlog::formatter>;
+using log_err_handler = std::function<void(const std::string &err_msg)>;
+
 #if defined(SPDLOG_NO_ATOMIC_LEVELS)
 using level_t = details::null_atomic_int;
 #else
 using level_t = std::atomic<int>;
 #endif
 
-using log_err_handler = std::function<void(const std::string &err_msg)>;
-
 // Log level enum
 namespace level {
 enum level_enum
@@ -94,12 +91,12 @@ static const char *level_names[] SPDLOG_LEVEL_NAMES;
 
 static const char *short_level_names[]{"T", "D", "I", "W", "E", "C", "O"};
 
-inline const char *to_str(spdlog::level::level_enum l)
+inline const char *to_c_str(spdlog::level::level_enum l)
 {
     return level_names[l];
 }
 
-inline const char *to_short_str(spdlog::level::level_enum l)
+inline const char *to_short_c_str(spdlog::level::level_enum l)
 {
     return short_level_names[l];
 }
@@ -121,15 +118,6 @@ inline spdlog::level::level_enum from_str(const std::string &name)
 using level_hasher = std::hash<int>;
 } // namespace level
 
-//
-// Async overflow policy - block by default.
-//
-enum class async_overflow_policy
-{
-    block_retry,    // Block / yield / sleep until message can be enqueued
-    discard_log_msg // Discard the message it enqueue fails
-};
-
 //
 // Pattern time - specific time getting to use for pattern_formatter.
 // local time by default
@@ -143,31 +131,35 @@ enum class pattern_time_type
 //
 // Log exception
 //
-namespace details {
-namespace os {
-std::string errno_str(int err_num);
-}
-} // namespace details
-class spdlog_ex : public std::exception
+class spdlog_ex : public std::runtime_error
 {
 public:
-    explicit spdlog_ex(std::string msg)
-        : _msg(std::move(msg))
+    explicit spdlog_ex(const std::string &msg)
+        : runtime_error(msg)
     {
     }
-
-    spdlog_ex(const std::string &msg, int last_errno)
+    spdlog_ex(std::string msg, int last_errno)
+        : runtime_error(std::move(msg))
+        , last_errno_(last_errno)
     {
-        _msg = msg + ": " + details::os::errno_str(last_errno);
     }
-
     const char *what() const SPDLOG_NOEXCEPT override
     {
-        return _msg.c_str();
+        if (last_errno_)
+        {
+            fmt::memory_buffer buf;
+            std::string msg(runtime_error::what());
+            fmt::format_system_error(buf, last_errno_, msg);
+            return fmt::to_string(buf).c_str();
+        }
+        else
+        {
+            return runtime_error::what();
+        }
     }
 
 private:
-    std::string _msg;
+    int last_errno_{0};
 };
 
 //
@@ -179,4 +171,13 @@ using filename_t = std::wstring;
 using filename_t = std::string;
 #endif
 
+#define SPDLOG_CATCH_AND_HANDLE                                                                                                            \
+    catch (const std::exception &ex)                                                                                                       \
+    {                                                                                                                                      \
+        err_handler_(ex.what());                                                                                                           \
+    }                                                                                                                                      \
+    catch (...)                                                                                                                            \
+    {                                                                                                                                      \
+        err_handler_("Unknown exeption in logger");                                                                                        \
+    }
 } // namespace spdlog

include/spdlog/contrib/README.md

@@ -1 +0,0 @@
-Please put here your contribs. Popular contribs will be moved to main tree after stablization

include/spdlog/contrib/sinks/.gitignore

@@ -1 +0,0 @@
-

include/spdlog/details/async_log_helper.h

@@ -1,393 +0,0 @@
-//
-// Copyright(c) 2015 Gabi Melman.
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-//
-
-// async log helper :
-// Process logs asynchronously using a back thread.
-//
-// If the internal queue of log messages reaches its max size,
-// then the client call will block until there is more room.
-//
-
-#pragma once
-
-#include "../common.h"
-#include "../details/log_msg.h"
-#include "../details/mpmc_bounded_q.h"
-#include "../details/os.h"
-#include "../formatter.h"
-#include "../sinks/sink.h"
-
-#include <chrono>
-#include <exception>
-#include <functional>
-#include <memory>
-#include <string>
-#include <thread>
-#include <utility>
-#include <vector>
-
-namespace spdlog {
-namespace details {
-
-class async_log_helper
-{
-    // Async msg to move to/from the queue
-    // Movable only. should never be copied
-    enum class async_msg_type
-    {
-        log,
-        flush,
-        terminate
-    };
-
-    struct async_msg
-    {
-        std::string logger_name;
-        level::level_enum level;
-        log_clock::time_point time;
-        size_t thread_id;
-        std::string txt;
-        async_msg_type msg_type;
-        size_t msg_id;
-
-        async_msg() = default;
-        ~async_msg() = default;
-
-        explicit async_msg(async_msg_type m_type)
-            : level(level::info)
-            , thread_id(0)
-            , msg_type(m_type)
-            , msg_id(0)
-        {
-        }
-
-        async_msg(async_msg &&other) SPDLOG_NOEXCEPT : logger_name(std::move(other.logger_name)),
-                                                       level(std::move(other.level)),
-                                                       time(std::move(other.time)),
-                                                       thread_id(other.thread_id),
-                                                       txt(std::move(other.txt)),
-                                                       msg_type(std::move(other.msg_type)),
-                                                       msg_id(other.msg_id)
-        {
-        }
-
-        async_msg &operator=(async_msg &&other) SPDLOG_NOEXCEPT
-        {
-            logger_name = std::move(other.logger_name);
-            level = other.level;
-            time = std::move(other.time);
-            thread_id = other.thread_id;
-            txt = std::move(other.txt);
-            msg_type = other.msg_type;
-            msg_id = other.msg_id;
-            return *this;
-        }
-
-        // never copy or assign. should only be moved..
-        async_msg(const async_msg &) = delete;
-        async_msg &operator=(const async_msg &other) = delete;
-
-        // construct from log_msg
-        explicit async_msg(const details::log_msg &m)
-            : level(m.level)
-            , time(m.time)
-            , thread_id(m.thread_id)
-            , txt(m.raw.data(), m.raw.size())
-            , msg_type(async_msg_type::log)
-            , msg_id(m.msg_id)
-        {
-#ifndef SPDLOG_NO_NAME
-            logger_name = *m.logger_name;
-#endif
-        }
-
-        // copy into log_msg
-        void fill_log_msg(log_msg &msg)
-        {
-            msg.logger_name = &logger_name;
-            msg.level = level;
-            msg.time = time;
-            msg.thread_id = thread_id;
-            msg.raw << txt;
-            msg.msg_id = msg_id;
-        }
-    };
-
-public:
-    using item_type = async_msg;
-    using q_type = details::mpmc_bounded_queue<item_type>;
-
-    using clock = std::chrono::steady_clock;
-
-    async_log_helper(formatter_ptr formatter, std::vector<sink_ptr> sinks, size_t queue_size, const log_err_handler err_handler,
-        const async_overflow_policy overflow_policy = async_overflow_policy::block_retry, std::function<void()> worker_warmup_cb = nullptr,
-        const std::chrono::milliseconds &flush_interval_ms = std::chrono::milliseconds::zero(),
-        std::function<void()> worker_teardown_cb = nullptr);
-
-    void log(const details::log_msg &msg);
-
-    // stop logging and join the back thread
-    ~async_log_helper();
-
-    async_log_helper(const async_log_helper &) = delete;
-    async_log_helper &operator=(const async_log_helper &) = delete;
-
-    void set_formatter(formatter_ptr msg_formatter);
-
-    void flush(bool wait_for_q);
-
-    void set_error_handler(spdlog::log_err_handler err_handler);
-
-private:
-    formatter_ptr _formatter;
-    std::vector<std::shared_ptr<sinks::sink>> _sinks;
-
-    // queue of messages to log
-    q_type _q;
-
-    log_err_handler _err_handler;
-
-    bool _flush_requested;
-
-    bool _terminate_requested;
-
-    // overflow policy
-    const async_overflow_policy _overflow_policy;
-
-    // worker thread warmup callback - one can set thread priority, affinity, etc
-    const std::function<void()> _worker_warmup_cb;
-
-    // auto periodic sink flush parameter
-    const std::chrono::milliseconds _flush_interval_ms;
-
-    // worker thread teardown callback
-    const std::function<void()> _worker_teardown_cb;
-
-    // worker thread
-    std::thread _worker_thread;
-
-    void push_msg(async_msg &&new_msg);
-
-    // worker thread main loop
-    void worker_loop();
-
-    // pop next message from the queue and process it. will set the last_pop to the pop time
-    // return false if termination of the queue is required
-    bool process_next_msg(log_clock::time_point &last_pop, log_clock::time_point &last_flush);
-
-    void handle_flush_interval(log_clock::time_point &now, log_clock::time_point &last_flush);
-
-    // sleep,yield or return immediately using the time passed since last message as a hint
-    static void sleep_or_yield(const spdlog::log_clock::time_point &now, const log_clock::time_point &last_op_time);
-
-    // wait until the queue is empty
-    void wait_empty_q();
-};
-} // namespace details
-} // namespace spdlog
-
-///////////////////////////////////////////////////////////////////////////////
-// async_sink class implementation
-///////////////////////////////////////////////////////////////////////////////
-inline spdlog::details::async_log_helper::async_log_helper(formatter_ptr formatter, std::vector<sink_ptr> sinks, size_t queue_size,
-    log_err_handler err_handler, const async_overflow_policy overflow_policy, std::function<void()> worker_warmup_cb,
-    const std::chrono::milliseconds &flush_interval_ms, std::function<void()> worker_teardown_cb)
-    : _formatter(std::move(formatter))
-    , _sinks(std::move(sinks))
-    , _q(queue_size)
-    , _err_handler(std::move(err_handler))
-    , _flush_requested(false)
-    , _terminate_requested(false)
-    , _overflow_policy(overflow_policy)
-    , _worker_warmup_cb(std::move(worker_warmup_cb))
-    , _flush_interval_ms(flush_interval_ms)
-    , _worker_teardown_cb(std::move(worker_teardown_cb))
-{
-    _worker_thread = std::thread(&async_log_helper::worker_loop, this);
-}
-
-// Send to the worker thread termination message(level=off)
-// and wait for it to finish gracefully
-inline spdlog::details::async_log_helper::~async_log_helper()
-{
-    try
-    {
-        push_msg(async_msg(async_msg_type::terminate));
-        _worker_thread.join();
-    }
-    catch (...) // don't crash in destructor
-    {
-    }
-}
-
-// Try to push and block until succeeded (if the policy is not to discard when the queue is full)
-inline void spdlog::details::async_log_helper::log(const details::log_msg &msg)
-{
-    push_msg(async_msg(msg));
-}
-
-inline void spdlog::details::async_log_helper::push_msg(details::async_log_helper::async_msg &&new_msg)
-{
-    if (!_q.enqueue(std::move(new_msg)) && _overflow_policy != async_overflow_policy::discard_log_msg)
-    {
-        auto last_op_time = details::os::now();
-        auto now = last_op_time;
-        do
-        {
-            now = details::os::now();
-            sleep_or_yield(now, last_op_time);
-        } while (!_q.enqueue(std::move(new_msg)));
-    }
-}
-
-// optionally wait for the queue be empty and request flush from the sinks
-inline void spdlog::details::async_log_helper::flush(bool wait_for_q)
-{
-    push_msg(async_msg(async_msg_type::flush));
-    if (wait_for_q)
-    {
-        wait_empty_q(); // return when queue is empty
-    }
-}
-
-inline void spdlog::details::async_log_helper::worker_loop()
-{
-    if (_worker_warmup_cb)
-    {
-        _worker_warmup_cb();
-    }
-    auto last_pop = details::os::now();
-    auto last_flush = last_pop;
-    auto active = true;
-    while (active)
-    {
-        try
-        {
-            active = process_next_msg(last_pop, last_flush);
-        }
-        catch (const std::exception &ex)
-        {
-            _err_handler(ex.what());
-        }
-        catch (...)
-        {
-            _err_handler("Unknown exeption in async logger worker loop.");
-        }
-    }
-    if (_worker_teardown_cb)
-    {
-        _worker_teardown_cb();
-    }
-}
-
-// process next message in the queue
-// return true if this thread should still be active (while no terminate msg was received)
-inline bool spdlog::details::async_log_helper::process_next_msg(log_clock::time_point &last_pop, log_clock::time_point &last_flush)
-{
-    async_msg incoming_async_msg;
-
-    if (_q.dequeue(incoming_async_msg))
-    {
-        last_pop = details::os::now();
-        switch (incoming_async_msg.msg_type)
-        {
-        case async_msg_type::flush:
-            _flush_requested = true;
-            break;
-
-        case async_msg_type::terminate:
-            _flush_requested = true;
-            _terminate_requested = true;
-            break;
-
-        default:
-            log_msg incoming_log_msg;
-            incoming_async_msg.fill_log_msg(incoming_log_msg);
-            _formatter->format(incoming_log_msg);
-            for (auto &s : _sinks)
-            {
-                if (s->should_log(incoming_log_msg.level))
-                {
-                    s->log(incoming_log_msg);
-                }
-            }
-        }
-        return true;
-    }
-
-    // Handle empty queue..
-    // This is the only place where the queue can terminate or flush to avoid losing messages already in the queue
-    auto now = details::os::now();
-    handle_flush_interval(now, last_flush);
-    sleep_or_yield(now, last_pop);
-    return !_terminate_requested;
-}
-
-// flush all sinks if _flush_interval_ms has expired
-inline void spdlog::details::async_log_helper::handle_flush_interval(log_clock::time_point &now, log_clock::time_point &last_flush)
-{
-    auto should_flush =
-        _flush_requested || (_flush_interval_ms != std::chrono::milliseconds::zero() && now - last_flush >= _flush_interval_ms);
-    if (should_flush)
-    {
-        for (auto &s : _sinks)
-        {
-            s->flush();
-        }
-        now = last_flush = details::os::now();
-        _flush_requested = false;
-    }
-}
-
-inline void spdlog::details::async_log_helper::set_formatter(formatter_ptr msg_formatter)
-{
-    _formatter = std::move(msg_formatter);
-}
-
-// spin, yield or sleep. use the time passed since last message as a hint
-inline void spdlog::details::async_log_helper::sleep_or_yield(
-    const spdlog::log_clock::time_point &now, const spdlog::log_clock::time_point &last_op_time)
-{
-    using std::chrono::microseconds;
-    using std::chrono::milliseconds;
-
-    auto time_since_op = now - last_op_time;
-
-    // spin upto 50 micros
-    if (time_since_op <= microseconds(50))
-    {
-        return;
-    }
-
-    // yield upto 150 micros
-    if (time_since_op <= microseconds(100))
-    {
-        return std::this_thread::yield();
-    }
-
-    // sleep for 20 ms upto 200 ms
-    if (time_since_op <= milliseconds(200))
-    {
-        return details::os::sleep_for_millis(20);
-    }
-
-    // sleep for 500 ms
-    return details::os::sleep_for_millis(500);
-}
-
-// wait for the queue to be empty
-inline void spdlog::details::async_log_helper::wait_empty_q()
-{
-    auto last_op = details::os::now();
-    while (!_q.is_empty())
-    {
-        sleep_or_yield(details::os::now(), last_op);
-    }
-}
-
-inline void spdlog::details::async_log_helper::set_error_handler(spdlog::log_err_handler err_handler)
-{
-    _err_handler = std::move(err_handler);
-}

include/spdlog/details/async_logger_impl.h

@@ -5,91 +5,96 @@
 
 #pragma once
 
-// Async Logger implementation
-// Use an async_sink (queue per logger) to perform the logging in a worker thread
+// async logger implementation
+// uses a thread pool to perform the actual logging
 
-#include "../async_logger.h"
-#include "../details/async_log_helper.h"
+#include "spdlog/details/thread_pool.h"
 
 #include <chrono>
-#include <functional>
 #include <memory>
 #include <string>
 
-template<class It>
-inline spdlog::async_logger::async_logger(const std::string &logger_name, const It &begin, const It &end, size_t queue_size,
-    const async_overflow_policy overflow_policy, const std::function<void()> &worker_warmup_cb,
-    const std::chrono::milliseconds &flush_interval_ms, const std::function<void()> &worker_teardown_cb)
-    : logger(logger_name, begin, end)
-    , _async_log_helper(new details::async_log_helper(
-          _formatter, _sinks, queue_size, _err_handler, overflow_policy, worker_warmup_cb, flush_interval_ms, worker_teardown_cb))
+template<typename It>
+inline spdlog::async_logger::async_logger(
+    std::string logger_name, const It &begin, const It &end, std::weak_ptr<details::thread_pool> tp, async_overflow_policy overflow_policy)
+    : logger(std::move(logger_name), begin, end)
+    , thread_pool_(tp)
+    , overflow_policy_(overflow_policy)
 {
 }
 
-inline spdlog::async_logger::async_logger(const std::string &logger_name, sinks_init_list sinks_list, size_t queue_size,
-    const async_overflow_policy overflow_policy, const std::function<void()> &worker_warmup_cb,
-    const std::chrono::milliseconds &flush_interval_ms, const std::function<void()> &worker_teardown_cb)
-    : async_logger(logger_name, sinks_list.begin(), sinks_list.end(), queue_size, overflow_policy, worker_warmup_cb, flush_interval_ms,
-          worker_teardown_cb)
+inline spdlog::async_logger::async_logger(
+    std::string logger_name, sinks_init_list sinks_list, std::weak_ptr<details::thread_pool> tp, async_overflow_policy overflow_policy)
+    : async_logger(std::move(logger_name), sinks_list.begin(), sinks_list.end(), tp, overflow_policy)
 {
 }
 
-inline spdlog::async_logger::async_logger(const std::string &logger_name, sink_ptr single_sink, size_t queue_size,
-    const async_overflow_policy overflow_policy, const std::function<void()> &worker_warmup_cb,
-    const std::chrono::milliseconds &flush_interval_ms, const std::function<void()> &worker_teardown_cb)
-    : async_logger(
-          logger_name, {std::move(single_sink)}, queue_size, overflow_policy, worker_warmup_cb, flush_interval_ms, worker_teardown_cb)
+inline spdlog::async_logger::async_logger(
+    std::string logger_name, sink_ptr single_sink, std::weak_ptr<details::thread_pool> tp, async_overflow_policy overflow_policy)
+    : async_logger(std::move(logger_name), {single_sink}, tp, overflow_policy)
 {
 }
 
-inline void spdlog::async_logger::flush()
+// send the log message to the thread pool
+inline void spdlog::async_logger::sink_it_(details::log_msg &msg)
 {
-    _async_log_helper->flush(true);
+#if defined(SPDLOG_ENABLE_MESSAGE_COUNTER)
+    incr_msg_counter_(msg);
+#endif
+    if (auto pool_ptr = thread_pool_.lock())
+    {
+        pool_ptr->post_log(shared_from_this(), std::move(msg), overflow_policy_);
+    }
+    else
+    {
+        throw spdlog_ex("async log: thread pool doens't exist anymore");
+    }
 }
 
-// Error handler
-inline void spdlog::async_logger::set_error_handler(spdlog::log_err_handler err_handler)
+// send flush request to the thread pool
+inline void spdlog::async_logger::flush_()
 {
-    _err_handler = err_handler;
-    _async_log_helper->set_error_handler(err_handler);
-}
-inline spdlog::log_err_handler spdlog::async_logger::error_handler()
-{
-    return _err_handler;
+    if (auto pool_ptr = thread_pool_.lock())
+    {
+        pool_ptr->post_flush(shared_from_this(), overflow_policy_);
+    }
+    else
+    {
+        throw spdlog_ex("async flush: thread pool doesn't exist anymore");
+    }
 }
 
-inline void spdlog::async_logger::_set_formatter(spdlog::formatter_ptr msg_formatter)
-{
-    _formatter = msg_formatter;
-    _async_log_helper->set_formatter(_formatter);
-}
-
-inline void spdlog::async_logger::_set_pattern(const std::string &pattern, pattern_time_type pattern_time)
-{
-    _formatter = std::make_shared<pattern_formatter>(pattern, pattern_time);
-    _async_log_helper->set_formatter(_formatter);
-}
-
-inline void spdlog::async_logger::_sink_it(details::log_msg &msg)
+//
+// backend functions - called from the thread pool to do the actual job
+//
+inline void spdlog::async_logger::backend_log_(details::log_msg &incoming_log_msg)
 {
     try
     {
-#if defined(SPDLOG_ENABLE_MESSAGE_COUNTER)
-        _incr_msg_counter(msg);
-#endif
-        _async_log_helper->log(msg);
-        if (_should_flush_on(msg))
+        for (auto &s : sinks_)
         {
-            _async_log_helper->flush(false); // do async flush
+            if (s->should_log(incoming_log_msg.level))
+            {
+                s->log(incoming_log_msg);
+            }
         }
     }
-    catch (const std::exception &ex)
+    SPDLOG_CATCH_AND_HANDLE
+
+    if (should_flush_(incoming_log_msg))
     {
-        _err_handler(ex.what());
-    }
-    catch (...)
-    {
-        _err_handler("Unknown exception in logger " + _name);
-        throw;
+        backend_flush_();
     }
 }
+
+inline void spdlog::async_logger::backend_flush_()
+{
+    try
+    {
+        for (auto &sink : sinks_)
+        {
+            sink->flush();
+        }
+    }
+    SPDLOG_CATCH_AND_HANDLE
+}

include/spdlog/details/circular_q.h

@@ -0,0 +1,62 @@
+//
+// Copyright(c) 2018 Gabi Melman.
+// Distributed under the MIT License (http://opensource.org/licenses/MIT)
+//
+
+// cirucal q view of std::vector.
+#pragma once
+
+namespace spdlog {
+namespace details {
+template<typename T>
+class circular_q
+{
+public:
+    using item_type = T;
+
+    explicit circular_q(size_t max_items)
+        : max_items_(max_items + 1) // one item is reserved as marker for full q
+        , v_(max_items_)
+    {
+    }
+
+    // push back, overrun (oldest) item if no room left
+    void push_back(T &&item)
+    {
+        v_[tail_] = std::move(item);
+        tail_ = (tail_ + 1) % max_items_;
+
+        if (tail_ == head_) // overrun last item if full
+        {
+            head_ = (head_ + 1) % max_items_;
+        }
+    }
+
+    // Pop item from front.
+    // If there are no elements in the container, the behavior is undefined.
+    void pop_front(T &popped_item)
+    {
+        popped_item = std::move(v_[head_]);
+        head_ = (head_ + 1) % max_items_;
+    }
+
+    bool empty()
+    {
+        return tail_ == head_;
+    }
+
+    bool full()
+    {
+        // head is ahead of the tail by 1
+        return ((tail_ + 1) % max_items_) == head_;
+    }
+
+private:
+    size_t max_items_;
+    typename std::vector<T>::size_type head_ = 0;
+    typename std::vector<T>::size_type tail_ = 0;
+
+    std::vector<T> v_;
+};
+} // namespace details
+} // namespace spdlog

include/spdlog/details/console_globals.h

@@ -0,0 +1,61 @@
+#pragma once
+//
+// Copyright(c) 2018 Gabi Melman.
+// Distributed under the MIT License (http://opensource.org/licenses/MIT)
+//
+
+#include "spdlog/details/null_mutex.h"
+#include "stdio.h"
+#include <mutex>
+
+namespace spdlog {
+namespace details {
+struct console_stdout
+{
+    static FILE *stream()
+    {
+        return stdout;
+    }
+#ifdef _WIN32
+    static HANDLE handle()
+    {
+        return ::GetStdHandle(STD_OUTPUT_HANDLE);
+    }
+#endif
+};
+
+struct console_stderr
+{
+    static FILE *stream()
+    {
+        return stderr;
+    }
+#ifdef _WIN32
+    static HANDLE handle()
+    {
+        return ::GetStdHandle(STD_ERROR_HANDLE);
+    }
+#endif
+};
+
+struct console_mutex
+{
+    using mutex_t = std::mutex;
+    static mutex_t &mutex()
+    {
+        static mutex_t s_mutex;
+        return s_mutex;
+    }
+};
+
+struct console_nullmutex
+{
+    using mutex_t = null_mutex;
+    static mutex_t &mutex()
+    {
+        static mutex_t s_mutex;
+        return s_mutex;
+    }
+};
+} // namespace details
+} // namespace spdlog

include/spdlog/details/file_helper.h

@@ -6,7 +6,8 @@
 #pragma once
 
 // Helper class for file sink
-// When failing to open a file, retry several times(5) with small delay between the tries(10 ms)
+// When failing to open a file, retry several times(5) with small delay between
+// the tries(10 ms)
 // Throw spdlog_ex exception on errors
 
 #include "../details/log_msg.h"
@@ -46,7 +47,7 @@ public:
         _filename = fname;
         for (int tries = 0; tries < open_tries; ++tries)
         {
-            if (!os::fopen_s(&_fd, fname, mode))
+            if (!os::fopen_s(&fd_, fname, mode))
             {
                 return;
             }
@@ -68,23 +69,23 @@ public:
 
     void flush()
     {
-        std::fflush(_fd);
+        std::fflush(fd_);
     }
 
     void close()
     {
-        if (_fd != nullptr)
+        if (fd_ != nullptr)
         {
-            std::fclose(_fd);
-            _fd = nullptr;
+            std::fclose(fd_);
+            fd_ = nullptr;
         }
     }
 
-    void write(const log_msg &msg)
+    void write(const fmt::memory_buffer &buf)
     {
-        size_t msg_size = msg.formatted.size();
-        auto data = msg.formatted.data();
-        if (std::fwrite(data, 1, msg_size, _fd) != msg_size)
+        size_t msg_size = buf.size();
+        auto data = buf.data();
+        if (std::fwrite(data, 1, msg_size, fd_) != msg_size)
         {
             throw spdlog_ex("Failed writing to file " + os::filename_to_str(_filename), errno);
         }
@@ -92,11 +93,11 @@ public:
 
     size_t size() const
     {
-        if (_fd == nullptr)
+        if (fd_ == nullptr)
         {
             throw spdlog_ex("Cannot use size() on closed file " + os::filename_to_str(_filename));
         }
-        return os::filesize(_fd);
+        return os::filesize(fd_);
     }
 
     const filename_t &filename() const
@@ -126,7 +127,8 @@ public:
     {
         auto ext_index = fname.rfind('.');
 
-        // no valid extension found - return whole path and empty string as extension
+        // no valid extension found - return whole path and empty string as
+        // extension
         if (ext_index == filename_t::npos || ext_index == 0 || ext_index == fname.size() - 1)
         {
             return std::make_tuple(fname, spdlog::filename_t());
@@ -144,7 +146,7 @@ public:
     }
 
 private:
-    FILE *_fd{nullptr};
+    FILE *fd_{nullptr};
     filename_t _filename;
 };
 } // namespace details

include/spdlog/details/fmt_helper.h

@@ -0,0 +1,130 @@
+//
+// Created by gabi on 6/15/18.
+//
+
+#pragma once
+
+#include "chrono"
+#include "spdlog/fmt/fmt.h"
+
+// Some fmt helpers to efficiently format and pad ints and strings
+namespace spdlog {
+namespace details {
+namespace fmt_helper {
+
+template<size_t Buffer_Size>
+inline void append_str(const std::string &str, fmt::basic_memory_buffer<char, Buffer_Size> &dest)
+{
+    auto *str_ptr = str.data();
+    dest.append(str_ptr, str_ptr + str.size());
+}
+
+template<size_t Buffer_Size>
+inline void append_c_str(const char *c_str, fmt::basic_memory_buffer<char, Buffer_Size> &dest)
+{
+    char ch;
+    while ((ch = *c_str) != '\0')
+    {
+        dest.push_back(ch);
+        ++c_str;
+    }
+}
+
+template<size_t Buffer_Size1, size_t Buffer_Size2>
+inline void append_buf(const fmt::basic_memory_buffer<char, Buffer_Size1> &buf, fmt::basic_memory_buffer<char, Buffer_Size2> &dest)
+{
+    auto *buf_ptr = buf.data();
+    dest.append(buf_ptr, buf_ptr + buf.size());
+}
+
+template<typename T, size_t Buffer_Size>
+inline void append_int(T n, fmt::basic_memory_buffer<char, Buffer_Size> &dest)
+{
+    fmt::format_int i(n);
+    dest.append(i.data(), i.data() + i.size());
+}
+
+template<size_t Buffer_Size>
+inline void pad2(int n, fmt::basic_memory_buffer<char, Buffer_Size> &dest)
+{
+    if (n > 99)
+    {
+        append_int(n, dest);
+        return;
+    }
+    if (n > 9) // 10-99
+    {
+        dest.push_back('0' + static_cast<char>(n / 10));
+        dest.push_back('0' + static_cast<char>(n % 10));
+        return;
+    }
+    if (n >= 0) // 0-9
+    {
+        dest.push_back('0');
+        dest.push_back('0' + static_cast<char>(n));
+        return;
+    }
+    // negatives (unlikely, but just in case, let fmt deal with it)
+    fmt::format_to(dest, "{:02}", n);
+}
+
+template<size_t Buffer_Size>
+inline void pad3(int n, fmt::basic_memory_buffer<char, Buffer_Size> &dest)
+{
+    if (n > 999)
+    {
+        append_int(n, dest);
+        return;
+    }
+
+    if (n > 99) // 100-999
+    {
+        append_int(n / 100, dest);
+        pad2(n % 100, dest);
+        return;
+    }
+    if (n > 9) // 10-99
+    {
+        dest.push_back('0');
+        dest.push_back('0' + static_cast<char>(n / 10));
+        dest.push_back('0' + static_cast<char>(n % 10));
+        return;
+    }
+    if (n >= 0)
+    {
+        dest.push_back('0');
+        dest.push_back('0');
+        dest.push_back('0' + static_cast<char>(n));
+        return;
+    }
+    // negatives (unlikely, but just in case let fmt deal with it)
+    fmt::format_to(dest, "{:03}", n);
+}
+
+template<size_t Buffer_Size>
+inline void pad6(size_t n, fmt::basic_memory_buffer<char, Buffer_Size> &dest)
+{
+    if (n > 99999)
+    {
+        append_int(n, dest);
+        return;
+    }
+    pad3(static_cast<int>(n / 1000), dest);
+    pad3(static_cast<int>(n % 1000), dest);
+}
+
+// return fraction of a second of the given time_point.
+// e.g.
+// fraction<std::milliseconds>(tp) -> will return the millis part of the second
+template<typename ToDuration>
+inline ToDuration time_fraction(const log_clock::time_point &tp)
+{
+    using namespace std::chrono;
+    auto duration = tp.time_since_epoch();
+    auto secs = duration_cast<seconds>(duration);
+    return duration_cast<ToDuration>(duration) - duration_cast<ToDuration>(secs);
+}
+
+} // namespace fmt_helper
+} // namespace details
+} // namespace spdlog

include/spdlog/details/log_msg.h

@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "../common.h"
-#include "../details/os.h"
+#include "spdlog/common.h"
+#include "spdlog/details/os.h"
 
 #include <string>
 #include <utility>
@@ -30,19 +30,18 @@ struct log_msg
     }
 
     log_msg(const log_msg &other) = delete;
-    log_msg &operator=(log_msg &&other) = delete;
     log_msg(log_msg &&other) = delete;
+    log_msg &operator=(log_msg &&other) = delete;
 
     const std::string *logger_name{nullptr};
     level::level_enum level;
     log_clock::time_point time;
     size_t thread_id;
-    fmt::MemoryWriter raw;
-    fmt::MemoryWriter formatted;
+    fmt::memory_buffer raw;
     size_t msg_id{0};
-    // wrap this range with color codes
-    size_t color_range_start{0};
-    size_t color_range_end{0};
+    // info about wrapping the formatted text with color
+    mutable size_t color_range_start{0};
+    mutable size_t color_range_end{0};
 };
 } // namespace details
 } // namespace spdlog

include/spdlog/details/logger_impl.h

@@ -5,49 +5,49 @@
 
 #pragma once
 
-#include "../logger.h"
-#include "../sinks/stdout_sinks.h"
-
 #include <memory>
 #include <string>
 
 // create logger with given name, sinks and the default pattern formatter
 // all other ctors will call this one
-template<class It>
+template<typename It>
 inline spdlog::logger::logger(std::string logger_name, const It &begin, const It &end)
-    : _name(std::move(logger_name))
-    , _sinks(begin, end)
-    , _formatter(std::make_shared<pattern_formatter>("%+"))
-    , _level(level::info)
-    , _flush_level(level::off)
-    , _last_err_time(0)
-    , _msg_counter(1) // message counter will start from 1. 0-message id will be reserved for controll messages
+    : name_(std::move(logger_name))
+    , sinks_(begin, end)
+    , level_(level::info)
+    , flush_level_(level::off)
+    , last_err_time_(0)
+    , msg_counter_(1) // message counter will start from 1. 0-message id will be
+                      // reserved for controll messages
 {
-    _err_handler = [this](const std::string &msg) { this->_default_err_handler(msg); };
+    err_handler_ = [this](const std::string &msg) { this->default_err_handler_(msg); };
 }
 
 // ctor with sinks as init list
-inline spdlog::logger::logger(const std::string &logger_name, sinks_init_list sinks_list)
-    : logger(logger_name, sinks_list.begin(), sinks_list.end())
+inline spdlog::logger::logger(std::string logger_name, sinks_init_list sinks_list)
+    : logger(std::move(logger_name), sinks_list.begin(), sinks_list.end())
 {
 }
 
 // ctor with single sink
-inline spdlog::logger::logger(const std::string &logger_name, spdlog::sink_ptr single_sink)
-    : logger(logger_name, {std::move(single_sink)})
+inline spdlog::logger::logger(std::string logger_name, spdlog::sink_ptr single_sink)
+    : logger(std::move(logger_name), {std::move(single_sink)})
 {
 }
 
 inline spdlog::logger::~logger() = default;
 
-inline void spdlog::logger::set_formatter(spdlog::formatter_ptr msg_formatter)
+inline void spdlog::logger::set_formatter(std::unique_ptr<spdlog::formatter> f)
 {
-    _set_formatter(std::move(msg_formatter));
+    for (auto &sink : sinks_)
+    {
+        sink->set_formatter(f->clone());
+    }
 }
 
-inline void spdlog::logger::set_pattern(const std::string &pattern, pattern_time_type pattern_time)
+inline void spdlog::logger::set_pattern(std::string pattern, pattern_time_type time_type)
 {
-    _set_pattern(pattern, pattern_time);
+    set_formatter(std::unique_ptr<spdlog::formatter>(new pattern_formatter(std::move(pattern), time_type)));
 }
 
 template<typename... Args>
@@ -60,24 +60,11 @@ inline void spdlog::logger::log(level::level_enum lvl, const char *fmt, const Ar
 
     try
     {
-        details::log_msg log_msg(&_name, lvl);
-
-#if defined(SPDLOG_FMT_PRINTF)
-        fmt::printf(log_msg.raw, fmt, args...);
-#else
-        log_msg.raw.write(fmt, args...);
-#endif
-        _sink_it(log_msg);
-    }
-    catch (const std::exception &ex)
-    {
-        _err_handler(ex.what());
-    }
-    catch (...)
-    {
-        _err_handler("Unknown exception in logger " + _name);
-        throw;
+        details::log_msg log_msg(&name_, lvl);
+        fmt::format_to(log_msg.raw, fmt, args...);
+        sink_it_(log_msg);
     }
+    SPDLOG_CATCH_AND_HANDLE
 }
 
 template<typename... Args>
@@ -89,19 +76,11 @@ inline void spdlog::logger::log(level::level_enum lvl, const char *msg)
     }
     try
     {
-        details::log_msg log_msg(&_name, lvl);
-        log_msg.raw << msg;
-        _sink_it(log_msg);
-    }
-    catch (const std::exception &ex)
-    {
-        _err_handler(ex.what());
-    }
-    catch (...)
-    {
-        _err_handler("Unknown exception in logger " + _name);
-        throw;
+        details::log_msg log_msg(&name_, lvl);
+        fmt::format_to(log_msg.raw, "{}", msg);
+        sink_it_(log_msg);
     }
+    SPDLOG_CATCH_AND_HANDLE
 }
 
 template<typename T>
@@ -113,55 +92,47 @@ inline void spdlog::logger::log(level::level_enum lvl, const T &msg)
     }
     try
     {
-        details::log_msg log_msg(&_name, lvl);
-        log_msg.raw << msg;
-        _sink_it(log_msg);
-    }
-    catch (const std::exception &ex)
-    {
-        _err_handler(ex.what());
-    }
-    catch (...)
-    {
-        _err_handler("Unknown exception in logger " + _name);
-        throw;
+        details::log_msg log_msg(&name_, lvl);
+        fmt::format_to(log_msg.raw, "{}", msg);
+        sink_it_(log_msg);
     }
+    SPDLOG_CATCH_AND_HANDLE
 }
 
-template<typename Arg1, typename... Args>
-inline void spdlog::logger::trace(const char *fmt, const Arg1 &arg1, const Args &... args)
+template<typename... Args>
+inline void spdlog::logger::trace(const char *fmt, const Args &... args)
 {
-    log(level::trace, fmt, arg1, args...);
+    log(level::trace, fmt, args...);
 }
 
-template<typename Arg1, typename... Args>
-inline void spdlog::logger::debug(const char *fmt, const Arg1 &arg1, const Args &... args)
+template<typename... Args>
+inline void spdlog::logger::debug(const char *fmt, const Args &... args)
 {
-    log(level::debug, fmt, arg1, args...);
+    log(level::debug, fmt, args...);
 }
 
-template<typename Arg1, typename... Args>
-inline void spdlog::logger::info(const char *fmt, const Arg1 &arg1, const Args &... args)
+template<typename... Args>
+inline void spdlog::logger::info(const char *fmt, const Args &... args)
 {
-    log(level::info, fmt, arg1, args...);
+    log(level::info, fmt, args...);
 }
 
-template<typename Arg1, typename... Args>
-inline void spdlog::logger::warn(const char *fmt, const Arg1 &arg1, const Args &... args)
+template<typename... Args>
+inline void spdlog::logger::warn(const char *fmt, const Args &... args)
 {
-    log(level::warn, fmt, arg1, args...);
+    log(level::warn, fmt, args...);
 }
 
-template<typename Arg1, typename... Args>
-inline void spdlog::logger::error(const char *fmt, const Arg1 &arg1, const Args &... args)
+template<typename... Args>
+inline void spdlog::logger::error(const char *fmt, const Args &... args)
 {
-    log(level::err, fmt, arg1, args...);
+    log(level::err, fmt, args...);
 }
 
-template<typename Arg1, typename... Args>
-inline void spdlog::logger::critical(const char *fmt, const Arg1 &arg1, const Args &... args)
+template<typename... Args>
+inline void spdlog::logger::critical(const char *fmt, const Args &... args)
 {
-    log(level::critical, fmt, arg1, args...);
+    log(level::critical, fmt, args...);
 }
 
 template<typename T>
@@ -201,24 +172,25 @@ inline void spdlog::logger::critical(const T &msg)
 }
 
 #ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT
-#include <codecvt>
-#include <locale>
-
-template<typename... Args>
-inline void spdlog::logger::log(level::level_enum lvl, const wchar_t *msg)
-{
-    std::wstring_convert<std::codecvt_utf8<wchar_t>> conv;
-
-    log(lvl, conv.to_bytes(msg));
-}
-
 template<typename... Args>
 inline void spdlog::logger::log(level::level_enum lvl, const wchar_t *fmt, const Args &... args)
 {
-    fmt::WMemoryWriter wWriter;
+    if (!should_log(lvl))
+    {
+        return;
+    }
 
-    wWriter.write(fmt, args...);
-    log(lvl, wWriter.c_str());
+    decltype(wstring_converter_)::byte_string utf8_string;
+
+    try
+    {
+        {
+            std::lock_guard<std::mutex> lock(wstring_converter_mutex_);
+            utf8_string = wstring_converter_.to_bytes(fmt);
+        }
+        log(lvl, utf8_string.c_str(), args...);
+    }
+    SPDLOG_CATCH_AND_HANDLE
 }
 
 template<typename... Args>
@@ -264,49 +236,64 @@ inline void spdlog::logger::critical(const wchar_t *fmt, const Args &... args)
 //
 inline const std::string &spdlog::logger::name() const
 {
-    return _name;
+    return name_;
 }
 
 inline void spdlog::logger::set_level(spdlog::level::level_enum log_level)
 {
-    _level.store(log_level);
+    level_.store(log_level);
 }
 
 inline void spdlog::logger::set_error_handler(spdlog::log_err_handler err_handler)
 {
-    _err_handler = std::move(err_handler);
+    err_handler_ = std::move(err_handler);
 }
 
 inline spdlog::log_err_handler spdlog::logger::error_handler()
 {
-    return _err_handler;
+    return err_handler_;
+}
+
+inline void spdlog::logger::flush()
+{
+    try
+    {
+        flush_();
+    }
+    SPDLOG_CATCH_AND_HANDLE
 }
 
 inline void spdlog::logger::flush_on(level::level_enum log_level)
 {
-    _flush_level.store(log_level);
+    flush_level_.store(log_level);
+}
+
+inline bool spdlog::logger::should_flush_(const details::log_msg &msg)
+{
+    auto flush_level = flush_level_.load(std::memory_order_relaxed);
+    return (msg.level >= flush_level) && (msg.level != level::off);
 }
 
 inline spdlog::level::level_enum spdlog::logger::level() const
 {
-    return static_cast<spdlog::level::level_enum>(_level.load(std::memory_order_relaxed));
+    return static_cast<spdlog::level::level_enum>(level_.load(std::memory_order_relaxed));
 }
 
 inline bool spdlog::logger::should_log(spdlog::level::level_enum msg_level) const
 {
-    return msg_level >= _level.load(std::memory_order_relaxed);
+    return msg_level >= level_.load(std::memory_order_relaxed);
 }
 
 //
-// protected virtual called at end of each user log call (if enabled) by the line_logger
+// protected virtual called at end of each user log call (if enabled) by the
+// line_logger
 //
-inline void spdlog::logger::_sink_it(details::log_msg &msg)
+inline void spdlog::logger::sink_it_(details::log_msg &msg)
 {
 #if defined(SPDLOG_ENABLE_MESSAGE_COUNTER)
-    _incr_msg_counter(msg);
+    incr_msg_counter_(msg);
 #endif
-    _formatter->format(msg);
-    for (auto &sink : _sinks)
+    for (auto &sink : sinks_)
     {
         if (sink->should_log(msg.level))
         {
@@ -314,58 +301,45 @@ inline void spdlog::logger::_sink_it(details::log_msg &msg)
         }
     }
 
-    if (_should_flush_on(msg))
+    if (should_flush_(msg))
     {
         flush();
     }
 }
 
-inline void spdlog::logger::_set_pattern(const std::string &pattern, pattern_time_type pattern_time)
+inline void spdlog::logger::flush_()
 {
-    _formatter = std::make_shared<pattern_formatter>(pattern, pattern_time);
-}
-
-inline void spdlog::logger::_set_formatter(formatter_ptr msg_formatter)
-{
-    _formatter = std::move(msg_formatter);
-}
-
-inline void spdlog::logger::flush()
-{
-    for (auto &sink : _sinks)
+    for (auto &sink : sinks_)
     {
         sink->flush();
     }
 }
 
-inline void spdlog::logger::_default_err_handler(const std::string &msg)
+inline void spdlog::logger::default_err_handler_(const std::string &msg)
 {
     auto now = time(nullptr);
-    if (now - _last_err_time < 60)
+    if (now - last_err_time_ < 60)
     {
         return;
     }
+    last_err_time_ = now;
     auto tm_time = details::os::localtime(now);
     char date_buf[100];
     std::strftime(date_buf, sizeof(date_buf), "%Y-%m-%d %H:%M:%S", &tm_time);
-    details::log_msg err_msg;
-    err_msg.formatted.write("[*** LOG ERROR ***] [{}] [{}] [{}]{}", name(), msg, date_buf, details::os::default_eol);
-    sinks::stderr_sink_mt::instance()->log(err_msg);
-    _last_err_time = now;
+    fmt::print(stderr, "[*** LOG ERROR ***] [{}] [{}] {}\n", date_buf, name(), msg);
 }
 
-inline bool spdlog::logger::_should_flush_on(const details::log_msg &msg)
+inline void spdlog::logger::incr_msg_counter_(details::log_msg &msg)
 {
-    const auto flush_level = _flush_level.load(std::memory_order_relaxed);
-    return (msg.level >= flush_level) && (msg.level != level::off);
-}
-
-inline void spdlog::logger::_incr_msg_counter(details::log_msg &msg)
-{
-    msg.msg_id = _msg_counter.fetch_add(1, std::memory_order_relaxed);
+    msg.msg_id = msg_counter_.fetch_add(1, std::memory_order_relaxed);
 }
 
 inline const std::vector<spdlog::sink_ptr> &spdlog::logger::sinks() const
 {
-    return _sinks;
+    return sinks_;
+}
+
+inline std::vector<spdlog::sink_ptr> &spdlog::logger::sinks()
+{
+    return sinks_;
 }

include/spdlog/details/mpmc_blocking_q.h

@@ -0,0 +1,115 @@
+#pragma once
+
+//
+// Copyright(c) 2018 Gabi Melman.
+// Distributed under the MIT License (http://opensource.org/licenses/MIT)
+//
+
+// multi producer-multi consumer blocking queue.
+// enqueue(..) - will block until room found to put the new message.
+// enqueue_nowait(..) - will return immediately with false if no room left in
+// the queue.
+// dequeue_for(..) - will block until the queue is not empty or timeout have
+// passed.
+
+#include "spdlog/details/circular_q.h"
+
+#include <condition_variable>
+#include <mutex>
+
+namespace spdlog {
+namespace details {
+
+template<typename T>
+class mpmc_blocking_queue
+{
+public:
+    using item_type = T;
+    explicit mpmc_blocking_queue(size_t max_items)
+        : q_(max_items)
+    {
+    }
+
+#ifndef __MINGW32__
+    // try to enqueue and block if no room left
+    void enqueue(T &&item)
+    {
+        {
+            std::unique_lock<std::mutex> lock(queue_mutex_);
+            pop_cv_.wait(lock, [this] { return !this->q_.full(); });
+            q_.push_back(std::move(item));
+        }
+        push_cv_.notify_one();
+    }
+
+    // enqueue immediately. overrun oldest message in the queue if no room left.
+    void enqueue_nowait(T &&item)
+    {
+        {
+            std::unique_lock<std::mutex> lock(queue_mutex_);
+            q_.push_back(std::move(item));
+        }
+        push_cv_.notify_one();
+    }
+
+    // try to dequeue item. if no item found. wait upto timeout and try again
+    // Return true, if succeeded dequeue item, false otherwise
+    bool dequeue_for(T &popped_item, std::chrono::milliseconds wait_duration)
+    {
+        {
+            std::unique_lock<std::mutex> lock(queue_mutex_);
+            if (!push_cv_.wait_for(lock, wait_duration, [this] { return !this->q_.empty(); }))
+            {
+                return false;
+            }
+            q_.pop_front(popped_item);
+        }
+        pop_cv_.notify_one();
+        return true;
+    }
+
+#else
+    // apparently mingw deadlocks if the mutex is released before cv.notify_one(),
+    // so release the mutex at the very end each function.
+
+    // try to enqueue and block if no room left
+    void enqueue(T &&item)
+    {
+        std::unique_lock<std::mutex> lock(queue_mutex_);
+        pop_cv_.wait(lock, [this] { return !this->q_.full(); });
+        q_.push_back(std::move(item));
+        push_cv_.notify_one();
+    }
+
+    // enqueue immediately. overrun oldest message in the queue if no room left.
+    void enqueue_nowait(T &&item)
+    {
+        std::unique_lock<std::mutex> lock(queue_mutex_);
+        q_.push_back(std::move(item));
+        push_cv_.notify_one();
+    }
+
+    // try to dequeue item. if no item found. wait upto timeout and try again
+    // Return true, if succeeded dequeue item, false otherwise
+    bool dequeue_for(T &popped_item, std::chrono::milliseconds wait_duration)
+    {
+        std::unique_lock<std::mutex> lock(queue_mutex_);
+        if (!push_cv_.wait_for(lock, wait_duration, [this] { return !this->q_.empty(); }))
+        {
+            return false;
+        }
+        q_.pop_front(popped_item);
+        pop_cv_.notify_one();
+        return true;
+    }
+
+#endif
+
+private:
+    std::mutex queue_mutex_;
+    std::condition_variable push_cv_;
+    std::condition_variable pop_cv_;
+    spdlog::details::circular_q<T> q_;
+};
+} // namespace details
+} // namespace spdlog

include/spdlog/details/mpmc_bounded_q.h

@@ -1,183 +0,0 @@
-/*
-A modified version of Bounded MPMC queue by Dmitry Vyukov.
-
-Original code from:
-http://www.1024cores.net/home/lock-free-algorithms/queues/bounded-mpmc-queue
-
-licensed by Dmitry Vyukov under the terms below:
-
-Simplified BSD license
-
-Copyright (c) 2010-2011 Dmitry Vyukov. All rights reserved.
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-1. Redistributions of source code must retain the above copyright notice, this list of
-conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list
-of conditions and the following disclaimer in the documentation and/or other materials
-provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY DMITRY VYUKOV "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-SHALL DMITRY VYUKOV OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
-OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-The views and conclusions contained in the software and documentation are those of the authors and
-should not be interpreted as representing official policies, either expressed or implied, of Dmitry Vyukov.
-*/
-
-/*
-The code in its current form adds the license below:
-
-Copyright(c) 2015 Gabi Melman.
-Distributed under the MIT License (http://opensource.org/licenses/MIT)
-
-*/
-
-#pragma once
-
-#include "../common.h"
-
-#include <atomic>
-#include <utility>
-
-namespace spdlog {
-namespace details {
-
-template<typename T>
-class mpmc_bounded_queue
-{
-public:
-    using item_type = T;
-
-    explicit mpmc_bounded_queue(size_t buffer_size)
-        : max_size_(buffer_size)
-        , buffer_(new cell_t[buffer_size])
-        , buffer_mask_(buffer_size - 1)
-    {
-        // queue size must be power of two
-        if (!((buffer_size >= 2) && ((buffer_size & (buffer_size - 1)) == 0)))
-        {
-            throw spdlog_ex("async logger queue size must be power of two");
-        }
-
-        for (size_t i = 0; i != buffer_size; i += 1)
-        {
-            buffer_[i].sequence_.store(i, std::memory_order_relaxed);
-        }
-        enqueue_pos_.store(0, std::memory_order_relaxed);
-        dequeue_pos_.store(0, std::memory_order_relaxed);
-    }
-
-    ~mpmc_bounded_queue()
-    {
-        delete[] buffer_;
-    }
-
-    mpmc_bounded_queue(mpmc_bounded_queue const &) = delete;
-    void operator=(mpmc_bounded_queue const &) = delete;
-
-    bool enqueue(T &&data)
-    {
-        cell_t *cell;
-        size_t pos = enqueue_pos_.load(std::memory_order_relaxed);
-        for (;;)
-        {
-            cell = &buffer_[pos & buffer_mask_];
-            size_t seq = cell->sequence_.load(std::memory_order_acquire);
-            intptr_t dif = static_cast<intptr_t>(seq) - static_cast<intptr_t>(pos);
-            if (dif == 0)
-            {
-                if (enqueue_pos_.compare_exchange_weak(pos, pos + 1, std::memory_order_relaxed))
-                {
-                    break;
-                }
-            }
-            else if (dif < 0)
-            {
-                return false;
-            }
-            else
-            {
-                pos = enqueue_pos_.load(std::memory_order_relaxed);
-            }
-        }
-        cell->data_ = std::move(data);
-        cell->sequence_.store(pos + 1, std::memory_order_release);
-        return true;
-    }
-
-    bool dequeue(T &data)
-    {
-        cell_t *cell;
-        size_t pos = dequeue_pos_.load(std::memory_order_relaxed);
-        for (;;)
-        {
-            cell = &buffer_[pos & buffer_mask_];
-            size_t seq = cell->sequence_.load(std::memory_order_acquire);
-            intptr_t dif = static_cast<intptr_t>(seq) - static_cast<intptr_t>(pos + 1);
-            if (dif == 0)
-            {
-                if (dequeue_pos_.compare_exchange_weak(pos, pos + 1, std::memory_order_relaxed))
-                {
-                    break;
-                }
-            }
-            else if (dif < 0)
-            {
-                return false;
-            }
-            else
-            {
-                pos = dequeue_pos_.load(std::memory_order_relaxed);
-            }
-        }
-        data = std::move(cell->data_);
-        cell->sequence_.store(pos + buffer_mask_ + 1, std::memory_order_release);
-        return true;
-    }
-
-    bool is_empty()
-    {
-        size_t front, front1, back;
-        // try to take a consistent snapshot of front/tail.
-        do
-        {
-            front = enqueue_pos_.load(std::memory_order_acquire);
-            back = dequeue_pos_.load(std::memory_order_acquire);
-            front1 = enqueue_pos_.load(std::memory_order_relaxed);
-        } while (front != front1);
-        return back == front;
-    }
-
-private:
-    struct cell_t
-    {
-        std::atomic<size_t> sequence_;
-        T data_;
-    };
-
-    size_t const max_size_;
-
-    static size_t const cacheline_size = 64;
-    using cacheline_pad_t = char[cacheline_size];
-
-    cacheline_pad_t pad0_;
-    cell_t *const buffer_;
-    size_t const buffer_mask_;
-    cacheline_pad_t pad1_;
-    std::atomic<size_t> enqueue_pos_;
-    cacheline_pad_t pad2_;
-    std::atomic<size_t> dequeue_pos_;
-    cacheline_pad_t pad3_;
-};
-
-} // namespace details
-} // namespace spdlog

include/spdlog/details/os.h

@@ -236,7 +236,7 @@ inline size_t filesize(FILE *f)
 
 #else // unix
     int fd = fileno(f);
-    // 64 bits(but not in osx or cygwin, where fstat64 is deprecated)
+// 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;
     if (fstat64(fd, &st) == 0)
@@ -282,7 +282,7 @@ inline int utc_minutes_offset(const std::tm &tm = details::os::localtime())
     return offset;
 #else
 
-#if defined(sun) || defined(__sun)
+#if defined(sun) || defined(__sun) || defined(_AIX)
     // 'tm_gmtoff' field is BSD extension and it's missing on SunOS/Solaris
     struct helper
     {
@@ -321,7 +321,8 @@ inline int utc_minutes_offset(const std::tm &tm = details::os::localtime())
 }
 
 // Return current thread id as size_t
-// It exists because the std::this_thread::get_id() is much slower(especially under VS 2013)
+// It exists because the std::this_thread::get_id() is much slower(especially
+// under VS 2013)
 inline size_t _thread_id()
 {
 #ifdef _WIN32
@@ -383,54 +384,6 @@ inline std::string filename_to_str(const filename_t &filename)
 }
 #endif
 
-inline std::string errno_to_string(char[256], char *res)
-{
-    return std::string(res);
-}
-
-inline std::string errno_to_string(char buf[256], int res)
-{
-    if (res == 0)
-    {
-        return std::string(buf);
-    }
-    return "Unknown error";
-}
-
-// Return errno string (thread safe)
-inline std::string errno_str(int err_num)
-{
-    char buf[256];
-    SPDLOG_CONSTEXPR auto buf_size = sizeof(buf);
-
-#ifdef _WIN32
-    if (strerror_s(buf, buf_size, err_num) == 0)
-    {
-        return std::string(buf);
-    }
-    else
-    {
-        return "Unknown error";
-    }
-
-#elif defined(__FreeBSD__) || defined(__APPLE__) || defined(ANDROID) || defined(__SUNPRO_CC) ||                                            \
-    ((_POSIX_C_SOURCE >= 200112L) && !defined(_GNU_SOURCE)) // posix version
-
-    if (strerror_r(err_num, buf, buf_size) == 0)
-    {
-        return std::string(buf);
-    }
-    else
-    {
-        return "Unknown error";
-    }
-
-#else // gnu version (might not use the given buf, so its retval pointer must be used)
-    auto err = strerror_r(err_num, buf, buf_size); // let compiler choose type
-    return errno_to_string(buf, err);              // use overloading to select correct stringify function
-#endif
-}
-
 inline int pid()
 {
 

include/spdlog/details/pattern_formatter.h

@@ -0,0 +1,772 @@
+//
+// Copyright(c) 2015 Gabi Melman.
+// Distributed under the MIT License (http://opensource.org/licenses/MIT)
+//
+
+#pragma once
+
+#include "spdlog/details/fmt_helper.h"
+#include "spdlog/details/log_msg.h"
+#include "spdlog/details/os.h"
+#include "spdlog/fmt/fmt.h"
+#include "spdlog/formatter.h"
+
+#include <array>
+#include <chrono>
+#include <ctime>
+#include <memory>
+#include <mutex>
+#include <string>
+#include <thread>
+#include <utility>
+#include <vector>
+
+namespace spdlog {
+namespace details {
+
+class flag_formatter
+{
+public:
+    virtual ~flag_formatter() = default;
+    virtual void format(const details::log_msg &msg, const std::tm &tm_time, fmt::memory_buffer &dest) = 0;
+};
+
+///////////////////////////////////////////////////////////////////////
+// name & level pattern appenders
+///////////////////////////////////////////////////////////////////////
+class name_formatter : public flag_formatter
+{
+    void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override
+    {
+        fmt_helper::append_str(*msg.logger_name, dest);
+    }
+};
+
+// log level appender
+class level_formatter : public flag_formatter
+{
+    void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override
+    {
+        fmt_helper::append_c_str(level::to_c_str(msg.level), dest);
+    }
+};
+
+// short log level appender
+class short_level_formatter : public flag_formatter
+{
+    void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override
+    {
+        fmt_helper::append_c_str(level::to_short_c_str(msg.level), dest);
+    }
+};
+
+///////////////////////////////////////////////////////////////////////
+// Date time pattern appenders
+///////////////////////////////////////////////////////////////////////
+
+static const char *ampm(const tm &t)
+{
+    return t.tm_hour >= 12 ? "PM" : "AM";
+}
+
+static unsigned int to12h(const tm &t)
+{
+    return t.tm_hour > 12 ? t.tm_hour - 12 : t.tm_hour;
+}
+
+// Abbreviated weekday name
+static const char *days[]{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
+class a_formatter : public flag_formatter
+{
+    void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override
+    {
+        fmt_helper::append_c_str(days[tm_time.tm_wday], dest);
+    }
+};
+
+// Full weekday name
+static const char *full_days[]{"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"};
+class A_formatter : public flag_formatter
+{
+    void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override
+    {
+        fmt_helper::append_c_str(full_days[tm_time.tm_wday], dest);
+    }
+};
+
+// Abbreviated month
+static const char *months[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec"};
+class b_formatter : public flag_formatter
+{
+    void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override
+    {
+        fmt_helper::append_c_str(months[tm_time.tm_mon], dest);
+    }
+};
+
+// Full month name
+static const char *full_months[]{
+    "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"};
+class B_formatter : public flag_formatter
+{
+    void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override
+    {
+        fmt_helper::append_c_str(full_months[tm_time.tm_mon], dest);
+    }
+};
+
+// Date and time representation (Thu Aug 23 15:35:46 2014)
+class c_formatter SPDLOG_FINAL : public flag_formatter
+{
+    void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override
+    {
+        // fmt::format_to(dest, "{} {} {} ", days[tm_time.tm_wday],
+        // months[tm_time.tm_mon], tm_time.tm_mday);
+        // date
+        fmt_helper::append_str(days[tm_time.tm_wday], dest);
+        dest.push_back(' ');
+        fmt_helper::append_str(months[tm_time.tm_mon], dest);
+        dest.push_back(' ');
+        fmt_helper::append_int(tm_time.tm_mday, dest);
+        dest.push_back(' ');
+        // time
+
+        fmt_helper::pad2(tm_time.tm_hour, dest);
+        dest.push_back(':');
+        fmt_helper::pad2(tm_time.tm_min, dest);
+        dest.push_back(':');
+        fmt_helper::pad2(tm_time.tm_sec, dest);
+        dest.push_back(' ');
+        fmt_helper::append_int(tm_time.tm_year + 1900, dest);
+    }
+};
+
+// year - 2 digit
+class C_formatter SPDLOG_FINAL : public flag_formatter
+{
+    void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override
+    {
+        fmt_helper::pad2(tm_time.tm_year % 100, dest);
+    }
+};
+
+// Short MM/DD/YY date, equivalent to %m/%d/%y 08/23/01
+class D_formatter SPDLOG_FINAL : public flag_formatter
+{
+    void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override
+    {
+        fmt_helper::pad2(tm_time.tm_mon + 1, dest);
+        dest.push_back('/');
+        fmt_helper::pad2(tm_time.tm_mday, dest);
+        dest.push_back('/');
+        fmt_helper::pad2(tm_time.tm_year % 100, dest);
+    }
+};
+
+// year - 4 digit
+class Y_formatter SPDLOG_FINAL : public flag_formatter
+{
+    void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override
+    {
+        fmt_helper::append_int(tm_time.tm_year + 1900, dest);
+    }
+};
+
+// month 1-12
+class m_formatter SPDLOG_FINAL : public flag_formatter
+{
+    void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override
+    {
+        fmt_helper::pad2(tm_time.tm_mon + 1, dest);
+    }
+};
+
+// day of month 1-31
+class d_formatter SPDLOG_FINAL : public flag_formatter
+{
+    void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override
+    {
+        fmt_helper::pad2(tm_time.tm_mday, dest);
+    }
+};
+
+// hours in 24 format 0-23
+class H_formatter SPDLOG_FINAL : public flag_formatter
+{
+    void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override
+    {
+        fmt_helper::pad2(tm_time.tm_hour, dest);
+    }
+};
+
+// hours in 12 format 1-12
+class I_formatter SPDLOG_FINAL : public flag_formatter
+{
+    void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override
+    {
+        fmt_helper::pad2(to12h(tm_time), dest);
+    }
+};
+
+// minutes 0-59
+class M_formatter SPDLOG_FINAL : public flag_formatter
+{
+    void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override
+    {
+        fmt_helper::pad2(tm_time.tm_min, dest);
+    }
+};
+
+// seconds 0-59
+class S_formatter SPDLOG_FINAL : public flag_formatter
+{
+    void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override
+    {
+        fmt_helper::pad2(tm_time.tm_sec, dest);
+    }
+};
+
+// milliseconds
+class e_formatter SPDLOG_FINAL : public flag_formatter
+{
+    void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override
+    {
+        auto millis = fmt_helper::time_fraction<std::chrono::milliseconds>(msg.time);
+        fmt_helper::pad3(static_cast<int>(millis.count()), dest);
+    }
+};
+
+// microseconds
+class f_formatter SPDLOG_FINAL : public flag_formatter
+{
+    void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override
+    {
+        auto micros = fmt_helper::time_fraction<std::chrono::microseconds>(msg.time);
+        fmt_helper::pad6(static_cast<int>(micros.count()), dest);
+    }
+};
+
+// nanoseconds
+class F_formatter SPDLOG_FINAL : public flag_formatter
+{
+    void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override
+    {
+        auto ns = fmt_helper::time_fraction<std::chrono::nanoseconds>(msg.time);
+        fmt::format_to(dest, "{:09}", ns.count());
+    }
+};
+
+// seconds since epoch
+class E_formatter SPDLOG_FINAL : public flag_formatter
+{
+    void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override
+    {
+        auto duration = msg.time.time_since_epoch();
+        auto seconds = std::chrono::duration_cast<std::chrono::seconds>(duration).count();
+        fmt_helper::append_int(seconds, dest);
+    }
+};
+
+// AM/PM
+class p_formatter SPDLOG_FINAL : public flag_formatter
+{
+    void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override
+    {
+        fmt_helper::append_c_str(ampm(tm_time), dest);
+    }
+};
+
+// 12 hour clock 02:55:02 pm
+class r_formatter SPDLOG_FINAL : public flag_formatter
+{
+    void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override
+    {
+        fmt_helper::pad2(to12h(tm_time), dest);
+        dest.push_back(':');
+        fmt_helper::pad2(tm_time.tm_min, dest);
+        dest.push_back(':');
+        fmt_helper::pad2(tm_time.tm_sec, dest);
+        dest.push_back(' ');
+        fmt_helper::append_c_str(ampm(tm_time), dest);
+    }
+};
+
+// 24-hour HH:MM time, equivalent to %H:%M
+class R_formatter SPDLOG_FINAL : public flag_formatter
+{
+    void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override
+    {
+        fmt_helper::pad2(tm_time.tm_hour, dest);
+        dest.push_back(':');
+        fmt_helper::pad2(tm_time.tm_min, dest);
+    }
+};
+
+// ISO 8601 time format (HH:MM:SS), equivalent to %H:%M:%S
+class T_formatter SPDLOG_FINAL : public flag_formatter
+{
+    void format(const details::log_msg &, const std::tm &tm_time, fmt::memory_buffer &dest) override
+    {
+        // fmt::format_to(dest, "{:02}:{:02}:{:02}", tm_time.tm_hour,
+        // tm_time.tm_min, tm_time.tm_sec);
+        fmt_helper::pad2(tm_time.tm_hour, dest);
+        dest.push_back(':');
+        fmt_helper::pad2(tm_time.tm_min, dest);
+        dest.push_back(':');
+        fmt_helper::pad2(tm_time.tm_sec, dest);
+    }
+};
+
+// ISO 8601 offset from UTC in timezone (+-HH:MM)
+class z_formatter SPDLOG_FINAL : public flag_formatter
+{
+public:
+    const std::chrono::seconds cache_refresh = std::chrono::seconds(5);
+
+    z_formatter() = default;
+    z_formatter(const z_formatter &) = delete;
+    z_formatter &operator=(const z_formatter &) = delete;
+
+    void format(const details::log_msg &msg, const std::tm &tm_time, fmt::memory_buffer &dest) override
+    {
+#ifdef _WIN32
+        int total_minutes = get_cached_offset(msg, tm_time);
+#else
+        // No need to chache under gcc,
+        // it is very fast (already stored in tm.tm_gmtoff)
+        (void)(msg);
+        int total_minutes = os::utc_minutes_offset(tm_time);
+#endif
+        bool is_negative = total_minutes < 0;
+        if (is_negative)
+        {
+            total_minutes = -total_minutes;
+            dest.push_back('-');
+        }
+        else
+        {
+            dest.push_back('+');
+        }
+
+        fmt_helper::pad2(total_minutes / 60, dest); // hours
+        dest.push_back(':');
+        fmt_helper::pad2(total_minutes % 60, dest); // minutes
+    }
+
+private:
+    log_clock::time_point last_update_{std::chrono::seconds(0)};
+#ifdef _WIN32
+    int offset_minutes_{0};
+
+    int get_cached_offset(const log_msg &msg, const std::tm &tm_time)
+    {
+        if (msg.time - last_update_ >= cache_refresh)
+        {
+            offset_minutes_ = os::utc_minutes_offset(tm_time);
+            last_update_ = msg.time;
+        }
+        return offset_minutes_;
+    }
+#endif
+};
+
+// Thread id
+class t_formatter SPDLOG_FINAL : public flag_formatter
+{
+    void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override
+    {
+        fmt_helper::pad6(msg.thread_id, dest);
+    }
+};
+
+// Current pid
+class pid_formatter SPDLOG_FINAL : public flag_formatter
+{
+    void format(const details::log_msg &, const std::tm &, fmt::memory_buffer &dest) override
+    {
+        fmt_helper::append_int(details::os::pid(), dest);
+    }
+};
+
+// message counter formatter
+class i_formatter SPDLOG_FINAL : public flag_formatter
+{
+    void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override
+    {
+        fmt_helper::pad6(msg.msg_id, dest);
+    }
+};
+
+class v_formatter SPDLOG_FINAL : public flag_formatter
+{
+    void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override
+    {
+        fmt_helper::append_buf(msg.raw, dest);
+    }
+};
+
+class ch_formatter SPDLOG_FINAL : public flag_formatter
+{
+public:
+    explicit ch_formatter(char ch)
+        : ch_(ch)
+    {
+    }
+    void format(const details::log_msg &, const std::tm &, fmt::memory_buffer &dest) override
+    {
+        dest.push_back(ch_);
+    }
+
+private:
+    char ch_;
+};
+
+// aggregate user chars to display as is
+class aggregate_formatter SPDLOG_FINAL : public flag_formatter
+{
+public:
+    aggregate_formatter() = default;
+
+    void add_ch(char ch)
+    {
+        str_ += ch;
+    }
+    void format(const details::log_msg &, const std::tm &, fmt::memory_buffer &dest) override
+    {
+        fmt_helper::append_str(str_, dest);
+    }
+
+private:
+    std::string str_;
+};
+
+// mark the color range. expect it to be in the form of "%^colored text%$"
+class color_start_formatter SPDLOG_FINAL : public flag_formatter
+{
+    void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override
+    {
+        msg.color_range_start = dest.size();
+    }
+};
+class color_stop_formatter SPDLOG_FINAL : public flag_formatter
+{
+    void format(const details::log_msg &msg, const std::tm &, fmt::memory_buffer &dest) override
+    {
+        msg.color_range_end = dest.size();
+    }
+};
+
+// Full info formatter
+// pattern: [%Y-%m-%d %H:%M:%S.%e] [%n] [%l] %v
+class full_formatter SPDLOG_FINAL : public flag_formatter
+{
+    void format(const details::log_msg &msg, const std::tm &tm_time, fmt::memory_buffer &dest) override
+    {
+        using namespace std::chrono;
+#ifndef SPDLOG_NO_DATETIME
+
+        // cache the date/time part for the next second.
+        auto duration = msg.time.time_since_epoch();
+        auto secs = duration_cast<seconds>(duration);
+
+        if (cache_timestamp_ != secs || cached_datetime_.size() == 0)
+        {
+            cached_datetime_.resize(0);
+            cached_datetime_.push_back('[');
+            fmt_helper::append_int(tm_time.tm_year + 1900, cached_datetime_);
+            cached_datetime_.push_back('-');
+
+            fmt_helper::pad2(tm_time.tm_mon + 1, cached_datetime_);
+            cached_datetime_.push_back('-');
+
+            fmt_helper::pad2(tm_time.tm_mday, cached_datetime_);
+            cached_datetime_.push_back(' ');
+
+            fmt_helper::pad2(tm_time.tm_hour, cached_datetime_);
+            cached_datetime_.push_back(':');
+
+            fmt_helper::pad2(tm_time.tm_min, cached_datetime_);
+            cached_datetime_.push_back(':');
+
+            fmt_helper::pad2(tm_time.tm_sec, cached_datetime_);
+            cached_datetime_.push_back('.');
+
+            cache_timestamp_ = secs;
+        }
+        fmt_helper::append_buf(cached_datetime_, dest);
+
+        auto millis = fmt_helper::time_fraction<milliseconds>(msg.time);
+        fmt_helper::pad3(static_cast<int>(millis.count()), dest);
+        dest.push_back(']');
+        dest.push_back(' ');
+
+#else // no datetime needed
+        (void)tm_time;
+#endif
+
+#ifndef SPDLOG_NO_NAME
+        dest.push_back('[');
+        fmt_helper::append_str(*msg.logger_name, dest);
+        dest.push_back(']');
+        dest.push_back(' ');
+#endif
+
+        dest.push_back('[');
+        // wrap the level name with color
+        msg.color_range_start = dest.size();
+        fmt_helper::append_c_str(level::to_c_str(msg.level), dest);
+        msg.color_range_end = dest.size();
+        dest.push_back(']');
+        dest.push_back(' ');
+        fmt_helper::append_buf(msg.raw, dest);
+    }
+
+private:
+    std::chrono::seconds cache_timestamp_{0};
+    fmt::basic_memory_buffer<char, 128> cached_datetime_;
+};
+
+} // namespace details
+
+class pattern_formatter SPDLOG_FINAL : public formatter
+{
+public:
+    explicit pattern_formatter(
+        std::string pattern, pattern_time_type time_type = pattern_time_type::local, std::string eol = spdlog::details::os::default_eol)
+        : pattern_(std::move(pattern))
+        , eol_(std::move(eol))
+        , pattern_time_type_(time_type)
+        , last_log_secs_(0)
+    {
+        std::memset(&cached_tm_, 0, sizeof(cached_tm_));
+        compile_pattern_(pattern_);
+    }
+
+    pattern_formatter(const pattern_formatter &other) = delete;
+    pattern_formatter &operator=(const pattern_formatter &other) = delete;
+
+    virtual std::unique_ptr<formatter> clone() const override
+    {
+        return std::unique_ptr<formatter>(new pattern_formatter(pattern_, pattern_time_type_, eol_));
+    }
+
+    void format(const details::log_msg &msg, fmt::memory_buffer &dest) override
+    {
+#ifndef SPDLOG_NO_DATETIME
+        auto secs = std::chrono::duration_cast<std::chrono::seconds>(msg.time.time_since_epoch());
+        if (secs != last_log_secs_)
+        {
+            cached_tm_ = get_time_(msg);
+            last_log_secs_ = secs;
+        }
+#endif
+        for (auto &f : formatters_)
+        {
+            f->format(msg, cached_tm_, dest);
+        }
+        // write eol
+        details::fmt_helper::append_str(eol_, dest);
+    }
+
+private:
+    std::string pattern_;
+    std::string eol_;
+    pattern_time_type pattern_time_type_;
+    std::tm cached_tm_;
+    std::chrono::seconds last_log_secs_;
+
+    std::vector<std::unique_ptr<details::flag_formatter>> formatters_;
+
+    std::tm get_time_(const details::log_msg &msg)
+    {
+        if (pattern_time_type_ == pattern_time_type::local)
+        {
+            return details::os::localtime(log_clock::to_time_t(msg.time));
+        }
+        return details::os::gmtime(log_clock::to_time_t(msg.time));
+    }
+
+    void handle_flag_(char flag)
+    {
+        switch (flag)
+        {
+        // logger name
+        case 'n':
+            formatters_.emplace_back(new details::name_formatter());
+            break;
+
+        case 'l':
+            formatters_.emplace_back(new details::level_formatter());
+            break;
+
+        case 'L':
+            formatters_.emplace_back(new details::short_level_formatter());
+            break;
+
+        case ('t'):
+            formatters_.emplace_back(new details::t_formatter());
+            break;
+
+        case ('v'):
+            formatters_.emplace_back(new details::v_formatter());
+            break;
+
+        case ('a'):
+            formatters_.emplace_back(new details::a_formatter());
+            break;
+
+        case ('A'):
+            formatters_.emplace_back(new details::A_formatter());
+            break;
+
+        case ('b'):
+        case ('h'):
+            formatters_.emplace_back(new details::b_formatter());
+            break;
+
+        case ('B'):
+            formatters_.emplace_back(new details::B_formatter());
+            break;
+        case ('c'):
+            formatters_.emplace_back(new details::c_formatter());
+            break;
+
+        case ('C'):
+            formatters_.emplace_back(new details::C_formatter());
+            break;
+
+        case ('Y'):
+            formatters_.emplace_back(new details::Y_formatter());
+            break;
+
+        case ('D'):
+        case ('x'):
+            formatters_.emplace_back(new details::D_formatter());
+            break;
+
+        case ('m'):
+            formatters_.emplace_back(new details::m_formatter());
+            break;
+
+        case ('d'):
+            formatters_.emplace_back(new details::d_formatter());
+            break;
+
+        case ('H'):
+            formatters_.emplace_back(new details::H_formatter());
+            break;
+
+        case ('I'):
+            formatters_.emplace_back(new details::I_formatter());
+            break;
+
+        case ('M'):
+            formatters_.emplace_back(new details::M_formatter());
+            break;
+
+        case ('S'):
+            formatters_.emplace_back(new details::S_formatter());
+            break;
+
+        case ('e'):
+            formatters_.emplace_back(new details::e_formatter());
+            break;
+
+        case ('f'):
+            formatters_.emplace_back(new details::f_formatter());
+            break;
+        case ('F'):
+            formatters_.emplace_back(new details::F_formatter());
+            break;
+
+        case ('E'):
+            formatters_.emplace_back(new details::E_formatter());
+            break;
+
+        case ('p'):
+            formatters_.emplace_back(new details::p_formatter());
+            break;
+
+        case ('r'):
+            formatters_.emplace_back(new details::r_formatter());
+            break;
+
+        case ('R'):
+            formatters_.emplace_back(new details::R_formatter());
+            break;
+
+        case ('T'):
+        case ('X'):
+            formatters_.emplace_back(new details::T_formatter());
+            break;
+
+        case ('z'):
+            formatters_.emplace_back(new details::z_formatter());
+            break;
+
+        case ('+'):
+            formatters_.emplace_back(new details::full_formatter());
+            break;
+
+        case ('P'):
+            formatters_.emplace_back(new details::pid_formatter());
+            break;
+
+        case ('i'):
+            formatters_.emplace_back(new details::i_formatter());
+            break;
+
+        case ('^'):
+            formatters_.emplace_back(new details::color_start_formatter());
+            break;
+
+        case ('$'):
+            formatters_.emplace_back(new details::color_stop_formatter());
+            break;
+
+        default: // Unknown flag appears as is
+            formatters_.emplace_back(new details::ch_formatter('%'));
+            formatters_.emplace_back(new details::ch_formatter(flag));
+            break;
+        }
+    }
+
+    void compile_pattern_(const std::string &pattern)
+    {
+        auto end = pattern.end();
+        std::unique_ptr<details::aggregate_formatter> user_chars;
+        formatters_.clear();
+        for (auto it = pattern.begin(); it != end; ++it)
+        {
+            if (*it == '%')
+            {
+                if (user_chars) // append user chars found so far
+                {
+                    formatters_.push_back(std::move(user_chars));
+                }
+                // if(
+                if (++it != end)
+                {
+                    handle_flag_(*it);
+                }
+                else
+                {
+                    break;
+                }
+            }
+            else // chars not following the % sign should be displayed as is
+            {
+                if (!user_chars)
+                {
+                    user_chars = std::unique_ptr<details::aggregate_formatter>(new details::aggregate_formatter());
+                }
+                user_chars->add_ch(*it);
+            }
+        }
+        if (user_chars) // append raw chars found so far
+        {
+            formatters_.push_back(std::move(user_chars));
+        }
+    }
+};
+} // namespace spdlog

include/spdlog/details/pattern_formatter_impl.h

@@ -1,707 +0,0 @@
-//
-// Copyright(c) 2015 Gabi Melman.
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-//
-
-#pragma once
-
-#include "../details/log_msg.h"
-#include "../details/os.h"
-#include "../fmt/fmt.h"
-#include "../formatter.h"
-
-#include <array>
-#include <chrono>
-#include <ctime>
-#include <memory>
-#include <mutex>
-#include <string>
-#include <thread>
-#include <utility>
-#include <vector>
-
-namespace spdlog {
-namespace details {
-class flag_formatter
-{
-public:
-    virtual ~flag_formatter() = default;
-    virtual void format(details::log_msg &msg, const std::tm &tm_time) = 0;
-};
-
-///////////////////////////////////////////////////////////////////////
-// name & level pattern appenders
-///////////////////////////////////////////////////////////////////////
-class name_formatter : public flag_formatter
-{
-    void format(details::log_msg &msg, const std::tm &) override
-    {
-        msg.formatted << *msg.logger_name;
-    }
-};
-
-// log level appender
-class level_formatter : public flag_formatter
-{
-    void format(details::log_msg &msg, const std::tm &) override
-    {
-        msg.formatted << level::to_str(msg.level);
-    }
-};
-
-// short log level appender
-class short_level_formatter : public flag_formatter
-{
-    void format(details::log_msg &msg, const std::tm &) override
-    {
-        msg.formatted << level::to_short_str(msg.level);
-    }
-};
-
-///////////////////////////////////////////////////////////////////////
-// Date time pattern appenders
-///////////////////////////////////////////////////////////////////////
-
-static const char *ampm(const tm &t)
-{
-    return t.tm_hour >= 12 ? "PM" : "AM";
-}
-
-static int to12h(const tm &t)
-{
-    return t.tm_hour > 12 ? t.tm_hour - 12 : t.tm_hour;
-}
-
-// Abbreviated weekday name
-static const std::string days[]{"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};
-class a_formatter : public flag_formatter
-{
-    void format(details::log_msg &msg, const std::tm &tm_time) override
-    {
-        msg.formatted << days[tm_time.tm_wday];
-    }
-};
-
-// Full weekday name
-static const std::string full_days[]{"Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"};
-class A_formatter : public flag_formatter
-{
-    void format(details::log_msg &msg, const std::tm &tm_time) override
-    {
-        msg.formatted << full_days[tm_time.tm_wday];
-    }
-};
-
-// Abbreviated month
-static const std::string months[]{"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sept", "Oct", "Nov", "Dec"};
-class b_formatter : public flag_formatter
-{
-    void format(details::log_msg &msg, const std::tm &tm_time) override
-    {
-        msg.formatted << months[tm_time.tm_mon];
-    }
-};
-
-// Full month name
-static const std::string full_months[]{
-    "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"};
-class B_formatter : public flag_formatter
-{
-    void format(details::log_msg &msg, const std::tm &tm_time) override
-    {
-        msg.formatted << full_months[tm_time.tm_mon];
-    }
-};
-
-// write 2 ints separated by sep with padding of 2
-static fmt::MemoryWriter &pad_n_join(fmt::MemoryWriter &w, int v1, int v2, char sep)
-{
-    w << fmt::pad(v1, 2, '0') << sep << fmt::pad(v2, 2, '0');
-    return w;
-}
-
-// write 3 ints separated by sep with padding of 2
-static fmt::MemoryWriter &pad_n_join(fmt::MemoryWriter &w, int v1, int v2, int v3, char sep)
-{
-    w << fmt::pad(v1, 2, '0') << sep << fmt::pad(v2, 2, '0') << sep << fmt::pad(v3, 2, '0');
-    return w;
-}
-
-// Date and time representation (Thu Aug 23 15:35:46 2014)
-class c_formatter SPDLOG_FINAL : public flag_formatter
-{
-    void format(details::log_msg &msg, const std::tm &tm_time) override
-    {
-        msg.formatted << days[tm_time.tm_wday] << ' ' << months[tm_time.tm_mon] << ' ' << tm_time.tm_mday << ' ';
-        pad_n_join(msg.formatted, tm_time.tm_hour, tm_time.tm_min, tm_time.tm_sec, ':') << ' ' << tm_time.tm_year + 1900;
-    }
-};
-
-// year - 2 digit
-class C_formatter SPDLOG_FINAL : public flag_formatter
-{
-    void format(details::log_msg &msg, const std::tm &tm_time) override
-    {
-        msg.formatted << fmt::pad(tm_time.tm_year % 100, 2, '0');
-    }
-};
-
-// Short MM/DD/YY date, equivalent to %m/%d/%y 08/23/01
-class D_formatter SPDLOG_FINAL : public flag_formatter
-{
-    void format(details::log_msg &msg, const std::tm &tm_time) override
-    {
-        pad_n_join(msg.formatted, tm_time.tm_mon + 1, tm_time.tm_mday, tm_time.tm_year % 100, '/');
-    }
-};
-
-// year - 4 digit
-class Y_formatter SPDLOG_FINAL : public flag_formatter
-{
-    void format(details::log_msg &msg, const std::tm &tm_time) override
-    {
-        msg.formatted << tm_time.tm_year + 1900;
-    }
-};
-
-// month 1-12
-class m_formatter SPDLOG_FINAL : public flag_formatter
-{
-    void format(details::log_msg &msg, const std::tm &tm_time) override
-    {
-        msg.formatted << fmt::pad(tm_time.tm_mon + 1, 2, '0');
-    }
-};
-
-// day of month 1-31
-class d_formatter SPDLOG_FINAL : public flag_formatter
-{
-    void format(details::log_msg &msg, const std::tm &tm_time) override
-    {
-        msg.formatted << fmt::pad(tm_time.tm_mday, 2, '0');
-    }
-};
-
-// hours in 24 format 0-23
-class H_formatter SPDLOG_FINAL : public flag_formatter
-{
-    void format(details::log_msg &msg, const std::tm &tm_time) override
-    {
-        msg.formatted << fmt::pad(tm_time.tm_hour, 2, '0');
-    }
-};
-
-// hours in 12 format 1-12
-class I_formatter SPDLOG_FINAL : public flag_formatter
-{
-    void format(details::log_msg &msg, const std::tm &tm_time) override
-    {
-        msg.formatted << fmt::pad(to12h(tm_time), 2, '0');
-    }
-};
-
-// minutes 0-59
-class M_formatter SPDLOG_FINAL : public flag_formatter
-{
-    void format(details::log_msg &msg, const std::tm &tm_time) override
-    {
-        msg.formatted << fmt::pad(tm_time.tm_min, 2, '0');
-    }
-};
-
-// seconds 0-59
-class S_formatter SPDLOG_FINAL : public flag_formatter
-{
-    void format(details::log_msg &msg, const std::tm &tm_time) override
-    {
-        msg.formatted << fmt::pad(tm_time.tm_sec, 2, '0');
-    }
-};
-
-// milliseconds
-class e_formatter SPDLOG_FINAL : public flag_formatter
-{
-    void format(details::log_msg &msg, const std::tm &) override
-    {
-        auto duration = msg.time.time_since_epoch();
-        auto millis = std::chrono::duration_cast<std::chrono::milliseconds>(duration).count() % 1000;
-        msg.formatted << fmt::pad(static_cast<int>(millis), 3, '0');
-    }
-};
-
-// microseconds
-class f_formatter SPDLOG_FINAL : public flag_formatter
-{
-    void format(details::log_msg &msg, const std::tm &) override
-    {
-        auto duration = msg.time.time_since_epoch();
-        auto micros = std::chrono::duration_cast<std::chrono::microseconds>(duration).count() % 1000000;
-        msg.formatted << fmt::pad(static_cast<int>(micros), 6, '0');
-    }
-};
-
-// nanoseconds
-class F_formatter SPDLOG_FINAL : public flag_formatter
-{
-    void format(details::log_msg &msg, const std::tm &) override
-    {
-        auto duration = msg.time.time_since_epoch();
-        auto ns = std::chrono::duration_cast<std::chrono::nanoseconds>(duration).count() % 1000000000;
-        msg.formatted << fmt::pad(static_cast<int>(ns), 9, '0');
-    }
-};
-
-class E_formatter SPDLOG_FINAL : public flag_formatter
-{
-    void format(details::log_msg &msg, const std::tm &) override
-    {
-        auto duration = msg.time.time_since_epoch();
-        auto seconds = std::chrono::duration_cast<std::chrono::seconds>(duration).count();
-        msg.formatted << seconds;
-    }
-};
-
-// AM/PM
-class p_formatter SPDLOG_FINAL : public flag_formatter
-{
-    void format(details::log_msg &msg, const std::tm &tm_time) override
-    {
-        msg.formatted << ampm(tm_time);
-    }
-};
-
-// 12 hour clock 02:55:02 pm
-class r_formatter SPDLOG_FINAL : public flag_formatter
-{
-    void format(details::log_msg &msg, const std::tm &tm_time) override
-    {
-        pad_n_join(msg.formatted, to12h(tm_time), tm_time.tm_min, tm_time.tm_sec, ':') << ' ' << ampm(tm_time);
-    }
-};
-
-// 24-hour HH:MM time, equivalent to %H:%M
-class R_formatter SPDLOG_FINAL : public flag_formatter
-{
-    void format(details::log_msg &msg, const std::tm &tm_time) override
-    {
-        pad_n_join(msg.formatted, tm_time.tm_hour, tm_time.tm_min, ':');
-    }
-};
-
-// ISO 8601 time format (HH:MM:SS), equivalent to %H:%M:%S
-class T_formatter SPDLOG_FINAL : public flag_formatter
-{
-    void format(details::log_msg &msg, const std::tm &tm_time) override
-    {
-        pad_n_join(msg.formatted, tm_time.tm_hour, tm_time.tm_min, tm_time.tm_sec, ':');
-    }
-};
-
-// ISO 8601 offset from UTC in timezone (+-HH:MM)
-class z_formatter SPDLOG_FINAL : public flag_formatter
-{
-public:
-    const std::chrono::seconds cache_refresh = std::chrono::seconds(5);
-
-    z_formatter() = default;
-    z_formatter(const z_formatter &) = delete;
-    z_formatter &operator=(const z_formatter &) = delete;
-
-    void format(details::log_msg &msg, const std::tm &tm_time) override
-    {
-#ifdef _WIN32
-        int total_minutes = get_cached_offset(msg, tm_time);
-#else
-        // No need to chache under gcc,
-        // it is very fast (already stored in tm.tm_gmtoff)
-        int total_minutes = os::utc_minutes_offset(tm_time);
-#endif
-        bool is_negative = total_minutes < 0;
-        char sign;
-        if (is_negative)
-        {
-            total_minutes = -total_minutes;
-            sign = '-';
-        }
-        else
-        {
-            sign = '+';
-        }
-
-        int h = total_minutes / 60;
-        int m = total_minutes % 60;
-        msg.formatted << sign;
-        pad_n_join(msg.formatted, h, m, ':');
-    }
-
-private:
-    log_clock::time_point _last_update{std::chrono::seconds(0)};
-    int _offset_minutes{0};
-    std::mutex _mutex;
-
-    int get_cached_offset(const log_msg &msg, const std::tm &tm_time)
-    {
-        std::lock_guard<std::mutex> l(_mutex);
-        if (msg.time - _last_update >= cache_refresh)
-        {
-            _offset_minutes = os::utc_minutes_offset(tm_time);
-            _last_update = msg.time;
-        }
-        return _offset_minutes;
-    }
-};
-
-// Thread id
-class t_formatter SPDLOG_FINAL : public flag_formatter
-{
-    void format(details::log_msg &msg, const std::tm &) override
-    {
-        msg.formatted << msg.thread_id;
-    }
-};
-
-// Current pid
-class pid_formatter SPDLOG_FINAL : public flag_formatter
-{
-    void format(details::log_msg &msg, const std::tm &) override
-    {
-        msg.formatted << details::os::pid();
-    }
-};
-
-// message counter formatter
-class i_formatter SPDLOG_FINAL : public flag_formatter
-{
-    void format(details::log_msg &msg, const std::tm &) override
-    {
-        msg.formatted << fmt::pad(msg.msg_id, 6, '0');
-    }
-};
-
-class v_formatter SPDLOG_FINAL : public flag_formatter
-{
-    void format(details::log_msg &msg, const std::tm &) override
-    {
-        msg.formatted << fmt::StringRef(msg.raw.data(), msg.raw.size());
-    }
-};
-
-class ch_formatter SPDLOG_FINAL : public flag_formatter
-{
-public:
-    explicit ch_formatter(char ch)
-        : _ch(ch)
-    {
-    }
-    void format(details::log_msg &msg, const std::tm &) override
-    {
-        msg.formatted << _ch;
-    }
-
-private:
-    char _ch;
-};
-
-// aggregate user chars to display as is
-class aggregate_formatter SPDLOG_FINAL : public flag_formatter
-{
-public:
-    aggregate_formatter() = default;
-
-    void add_ch(char ch)
-    {
-        _str += ch;
-    }
-    void format(details::log_msg &msg, const std::tm &) override
-    {
-        msg.formatted << _str;
-    }
-
-private:
-    std::string _str;
-};
-
-// mark the color range. expect it to be in the form of "%^colored text%$"
-class color_start_formatter SPDLOG_FINAL : public flag_formatter
-{
-    void format(details::log_msg &msg, const std::tm &) override
-    {
-        msg.color_range_start = msg.formatted.size();
-    }
-};
-class color_stop_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
-{
-    void format(details::log_msg &msg, const std::tm &tm_time) override
-    {
-#ifndef SPDLOG_NO_DATETIME
-        auto duration = msg.time.time_since_epoch();
-        auto millis = std::chrono::duration_cast<std::chrono::milliseconds>(duration).count() % 1000;
-
-        /* Slower version(while still very fast - about 3.2 million lines/sec under 10 threads),
-        msg.formatted.write("[{:d}-{:02d}-{:02d} {:02d}:{:02d}:{:02d}.{:03d}] [{}] [{}] {} ",
-        tm_time.tm_year + 1900,
-        tm_time.tm_mon + 1,
-        tm_time.tm_mday,
-        tm_time.tm_hour,
-        tm_time.tm_min,
-        tm_time.tm_sec,
-        static_cast<int>(millis),
-        msg.logger_name,
-        level::to_str(msg.level),
-        msg.raw.str());*/
-
-        // Faster (albeit uglier) way to format the line (5.6 million lines/sec under 10 threads)
-        msg.formatted << '[' << static_cast<unsigned int>(tm_time.tm_year + 1900) << '-'
-                      << fmt::pad(static_cast<unsigned int>(tm_time.tm_mon + 1), 2, '0') << '-'
-                      << fmt::pad(static_cast<unsigned int>(tm_time.tm_mday), 2, '0') << ' '
-                      << fmt::pad(static_cast<unsigned int>(tm_time.tm_hour), 2, '0') << ':'
-                      << fmt::pad(static_cast<unsigned int>(tm_time.tm_min), 2, '0') << ':'
-                      << fmt::pad(static_cast<unsigned int>(tm_time.tm_sec), 2, '0') << '.'
-                      << fmt::pad(static_cast<unsigned int>(millis), 3, '0') << "] ";
-
-        // no datetime needed
-#else
-        (void)tm_time;
-#endif
-
-#ifndef SPDLOG_NO_NAME
-        msg.formatted << '[' << *msg.logger_name << "] ";
-#endif
-
-        msg.formatted << '[';
-        // wrap the level name with color
-        msg.color_range_start = msg.formatted.size();
-        msg.formatted << level::to_str(msg.level);
-        msg.color_range_end = msg.formatted.size();
-        msg.formatted << "] " << fmt::StringRef(msg.raw.data(), msg.raw.size());
-    }
-};
-
-} // namespace details
-} // namespace spdlog
-///////////////////////////////////////////////////////////////////////////////
-// pattern_formatter inline impl
-///////////////////////////////////////////////////////////////////////////////
-inline spdlog::pattern_formatter::pattern_formatter(const std::string &pattern, pattern_time_type pattern_time, std::string eol)
-    : _eol(std::move(eol))
-    , _pattern_time(pattern_time)
-{
-    compile_pattern(pattern);
-}
-
-inline void spdlog::pattern_formatter::compile_pattern(const std::string &pattern)
-{
-    auto end = pattern.end();
-    std::unique_ptr<details::aggregate_formatter> user_chars;
-    for (auto it = pattern.begin(); it != end; ++it)
-    {
-        if (*it == '%')
-        {
-            if (user_chars) // append user chars found so far
-            {
-                _formatters.push_back(std::move(user_chars));
-            }
-            // if(
-            if (++it != end)
-            {
-                handle_flag(*it);
-            }
-            else
-            {
-                break;
-            }
-        }
-        else // chars not following the % sign should be displayed as is
-        {
-            if (!user_chars)
-            {
-                user_chars = std::unique_ptr<details::aggregate_formatter>(new details::aggregate_formatter());
-            }
-            user_chars->add_ch(*it);
-        }
-    }
-    if (user_chars) // append raw chars found so far
-    {
-        _formatters.push_back(std::move(user_chars));
-    }
-}
-inline void spdlog::pattern_formatter::handle_flag(char flag)
-{
-    switch (flag)
-    {
-    // logger name
-    case 'n':
-        _formatters.emplace_back(new details::name_formatter());
-        break;
-
-    case 'l':
-        _formatters.emplace_back(new details::level_formatter());
-        break;
-
-    case 'L':
-        _formatters.emplace_back(new details::short_level_formatter());
-        break;
-
-    case ('t'):
-        _formatters.emplace_back(new details::t_formatter());
-        break;
-
-    case ('v'):
-        _formatters.emplace_back(new details::v_formatter());
-        break;
-
-    case ('a'):
-        _formatters.emplace_back(new details::a_formatter());
-        break;
-
-    case ('A'):
-        _formatters.emplace_back(new details::A_formatter());
-        break;
-
-    case ('b'):
-    case ('h'):
-        _formatters.emplace_back(new details::b_formatter());
-        break;
-
-    case ('B'):
-        _formatters.emplace_back(new details::B_formatter());
-        break;
-    case ('c'):
-        _formatters.emplace_back(new details::c_formatter());
-        break;
-
-    case ('C'):
-        _formatters.emplace_back(new details::C_formatter());
-        break;
-
-    case ('Y'):
-        _formatters.emplace_back(new details::Y_formatter());
-        break;
-
-    case ('D'):
-    case ('x'):
-
-        _formatters.emplace_back(new details::D_formatter());
-        break;
-
-    case ('m'):
-        _formatters.emplace_back(new details::m_formatter());
-        break;
-
-    case ('d'):
-        _formatters.emplace_back(new details::d_formatter());
-        break;
-
-    case ('H'):
-        _formatters.emplace_back(new details::H_formatter());
-        break;
-
-    case ('I'):
-        _formatters.emplace_back(new details::I_formatter());
-        break;
-
-    case ('M'):
-        _formatters.emplace_back(new details::M_formatter());
-        break;
-
-    case ('S'):
-        _formatters.emplace_back(new details::S_formatter());
-        break;
-
-    case ('e'):
-        _formatters.emplace_back(new details::e_formatter());
-        break;
-
-    case ('f'):
-        _formatters.emplace_back(new details::f_formatter());
-        break;
-    case ('F'):
-        _formatters.emplace_back(new details::F_formatter());
-        break;
-
-    case ('E'):
-        _formatters.emplace_back(new details::E_formatter());
-        break;
-
-    case ('p'):
-        _formatters.emplace_back(new details::p_formatter());
-        break;
-
-    case ('r'):
-        _formatters.emplace_back(new details::r_formatter());
-        break;
-
-    case ('R'):
-        _formatters.emplace_back(new details::R_formatter());
-        break;
-
-    case ('T'):
-    case ('X'):
-        _formatters.emplace_back(new details::T_formatter());
-        break;
-
-    case ('z'):
-        _formatters.emplace_back(new details::z_formatter());
-        break;
-
-    case ('+'):
-        _formatters.emplace_back(new details::full_formatter());
-        break;
-
-    case ('P'):
-        _formatters.emplace_back(new details::pid_formatter());
-        break;
-
-    case ('i'):
-        _formatters.emplace_back(new details::i_formatter());
-        break;
-
-    case ('^'):
-        _formatters.emplace_back(new details::color_start_formatter());
-        break;
-
-    case ('$'):
-        _formatters.emplace_back(new details::color_stop_formatter());
-        break;
-
-    default: // Unknown flag appears as is
-        _formatters.emplace_back(new details::ch_formatter('%'));
-        _formatters.emplace_back(new details::ch_formatter(flag));
-        break;
-    }
-}
-
-inline std::tm spdlog::pattern_formatter::get_time(details::log_msg &msg)
-{
-    if (_pattern_time == pattern_time_type::local)
-    {
-        return details::os::localtime(log_clock::to_time_t(msg.time));
-    }
-    return details::os::gmtime(log_clock::to_time_t(msg.time));
-}
-
-inline void spdlog::pattern_formatter::format(details::log_msg &msg)
-{
-
-#ifndef SPDLOG_NO_DATETIME
-    auto tm_time = get_time(msg);
-#else
-    std::tm tm_time;
-#endif
-    for (auto &f : _formatters)
-    {
-        f->format(msg, tm_time);
-    }
-    // write eol
-    msg.formatted << _eol;
-}

include/spdlog/details/periodic_worker.h

@@ -0,0 +1,71 @@
+
+//
+// Copyright(c) 2018 Gabi Melman.
+// Distributed under the MIT License (http://opensource.org/licenses/MIT)
+//
+
+#pragma once
+
+// periodic worker thread - periodically executes the given callback function.
+//
+// RAII over the owned thread:
+//    creates the thread on construction.
+//    stops and joins the thread on destruction.
+
+#include <chrono>
+#include <condition_variable>
+#include <functional>
+#include <mutex>
+#include <thread>
+namespace spdlog {
+namespace details {
+
+class periodic_worker
+{
+public:
+    periodic_worker(std::function<void()> callback_fun, std::chrono::seconds interval)
+    {
+        active_ = (interval > std::chrono::seconds::zero());
+        if (!active_)
+        {
+            return;
+        }
+
+        worker_thread_ = std::thread([this, callback_fun, interval]() {
+            for (;;)
+            {
+                std::unique_lock<std::mutex> lock(this->mutex_);
+                if (this->cv_.wait_for(lock, interval, [this] { return !this->active_; }))
+                {
+                    return; // active_ == false, so exit this thread
+                }
+                callback_fun();
+            }
+        });
+    }
+
+    periodic_worker(const periodic_worker &) = delete;
+    periodic_worker &operator=(const periodic_worker &) = delete;
+
+    // stop the worker thread and join it
+    ~periodic_worker()
+    {
+        if (worker_thread_.joinable())
+        {
+            {
+                std::lock_guard<std::mutex> lock(mutex_);
+                active_ = false;
+            }
+            cv_.notify_one();
+            worker_thread_.join();
+        }
+    }
+
+private:
+    bool active_;
+    std::thread worker_thread_;
+    std::mutex mutex_;
+    std::condition_variable cv_;
+};
+} // namespace details
+} // namespace spdlog

include/spdlog/details/registry.h

@@ -10,254 +10,209 @@
 // If user requests a non existing logger, nullptr will be returned
 // This class is thread safe
 
-#include "../async_logger.h"
-#include "../common.h"
-#include "../details/null_mutex.h"
-#include "../logger.h"
+#include "spdlog/common.h"
+#include "spdlog/details/periodic_worker.h"
+#include "spdlog/logger.h"
 
 #include <chrono>
 #include <functional>
 #include <memory>
-#include <mutex>
 #include <string>
 #include <unordered_map>
 
 namespace spdlog {
 namespace details {
-template<class Mutex>
-class registry_t
+class thread_pool;
+
+class registry
 {
 public:
-    registry_t<Mutex>(const registry_t<Mutex> &) = delete;
-    registry_t<Mutex> &operator=(const registry_t<Mutex> &) = delete;
+    registry(const registry &) = delete;
+    registry &operator=(const registry &) = delete;
 
-    void register_logger(std::shared_ptr<logger> logger)
+    void register_logger(std::shared_ptr<logger> new_logger)
     {
-        std::lock_guard<Mutex> lock(_mutex);
-        auto logger_name = logger->name();
-        throw_if_exists(logger_name);
-        _loggers[logger_name] = logger;
+        std::lock_guard<std::mutex> lock(logger_map_mutex_);
+        auto logger_name = new_logger->name();
+        throw_if_exists_(logger_name);
+        loggers_[logger_name] = new_logger;
+    }
+
+    void register_and_init(std::shared_ptr<logger> new_logger)
+    {
+        std::lock_guard<std::mutex> lock(logger_map_mutex_);
+        auto logger_name = new_logger->name();
+        throw_if_exists_(logger_name);
+
+        // set the global formatter pattern
+        new_logger->set_formatter(formatter_->clone());
+
+        if (err_handler_)
+        {
+            new_logger->set_error_handler(err_handler_);
+        }
+
+        new_logger->set_level(level_);
+        new_logger->flush_on(flush_level_);
+
+        // add to registry
+        loggers_[logger_name] = new_logger;
     }
 
     std::shared_ptr<logger> get(const std::string &logger_name)
     {
-        std::lock_guard<Mutex> lock(_mutex);
-        auto found = _loggers.find(logger_name);
-        return found == _loggers.end() ? nullptr : found->second;
+        std::lock_guard<std::mutex> lock(logger_map_mutex_);
+        auto found = loggers_.find(logger_name);
+        return found == loggers_.end() ? nullptr : found->second;
     }
 
-    template<class It>
-    std::shared_ptr<logger> create(const std::string &logger_name, const It &sinks_begin, const It &sinks_end)
+    void set_tp(std::shared_ptr<thread_pool> tp)
     {
-        std::lock_guard<Mutex> lock(_mutex);
-        throw_if_exists(logger_name);
-        std::shared_ptr<logger> new_logger;
-        if (_async_mode)
+        std::lock_guard<std::recursive_mutex> lock(tp_mutex_);
+        tp_ = std::move(tp);
+    }
+
+    std::shared_ptr<thread_pool> get_tp()
+    {
+        std::lock_guard<std::recursive_mutex> lock(tp_mutex_);
+        return tp_;
+    }
+
+    // Set global formatter. Each sink in each logger will get a clone of this object
+    void set_formatter(std::unique_ptr<formatter> formatter)
+    {
+        std::lock_guard<std::mutex> lock(logger_map_mutex_);
+        formatter_ = std::move(formatter);
+        for (auto &l : loggers_)
         {
-            new_logger = std::make_shared<async_logger>(logger_name, sinks_begin, sinks_end, _async_q_size, _overflow_policy,
-                _worker_warmup_cb, _flush_interval_ms, _worker_teardown_cb);
-        }
-        else
-        {
-            new_logger = std::make_shared<logger>(logger_name, sinks_begin, sinks_end);
-        }
-
-        if (_formatter)
-        {
-            new_logger->set_formatter(_formatter);
-        }
-
-        if (_err_handler)
-        {
-            new_logger->set_error_handler(_err_handler);
-        }
-
-        new_logger->set_level(_level);
-        new_logger->flush_on(_flush_level);
-
-        // Add to registry
-        _loggers[logger_name] = new_logger;
-        return new_logger;
-    }
-
-    template<class It>
-    std::shared_ptr<async_logger> create_async(const std::string &logger_name, size_t queue_size,
-        const async_overflow_policy overflow_policy, const std::function<void()> &worker_warmup_cb,
-        const std::chrono::milliseconds &flush_interval_ms, const std::function<void()> &worker_teardown_cb, const It &sinks_begin,
-        const It &sinks_end)
-    {
-        std::lock_guard<Mutex> lock(_mutex);
-        throw_if_exists(logger_name);
-        auto new_logger = std::make_shared<async_logger>(
-            logger_name, sinks_begin, sinks_end, queue_size, overflow_policy, worker_warmup_cb, flush_interval_ms, worker_teardown_cb);
-
-        if (_formatter)
-        {
-            new_logger->set_formatter(_formatter);
-        }
-
-        if (_err_handler)
-        {
-            new_logger->set_error_handler(_err_handler);
-        }
-
-        new_logger->set_level(_level);
-        new_logger->flush_on(_flush_level);
-
-        // Add to registry
-        _loggers[logger_name] = new_logger;
-        return new_logger;
-    }
-
-    void apply_all(std::function<void(std::shared_ptr<logger>)> fun)
-    {
-        std::lock_guard<Mutex> lock(_mutex);
-        for (auto &l : _loggers)
-        {
-            fun(l.second);
-        }
-    }
-
-    void drop(const std::string &logger_name)
-    {
-        std::lock_guard<Mutex> lock(_mutex);
-        _loggers.erase(logger_name);
-    }
-
-    void drop_all()
-    {
-        std::lock_guard<Mutex> lock(_mutex);
-        _loggers.clear();
-    }
-
-    std::shared_ptr<logger> create(const std::string &logger_name, sinks_init_list sinks)
-    {
-        return create(logger_name, sinks.begin(), sinks.end());
-    }
-
-    std::shared_ptr<logger> create(const std::string &logger_name, sink_ptr sink)
-    {
-        return create(logger_name, {sink});
-    }
-
-    std::shared_ptr<async_logger> create_async(const std::string &logger_name, size_t queue_size,
-        const async_overflow_policy overflow_policy, const std::function<void()> &worker_warmup_cb,
-        const std::chrono::milliseconds &flush_interval_ms, const std::function<void()> &worker_teardown_cb, sinks_init_list sinks)
-    {
-        return create_async(
-            logger_name, queue_size, overflow_policy, worker_warmup_cb, flush_interval_ms, worker_teardown_cb, sinks.begin(), sinks.end());
-    }
-
-    std::shared_ptr<async_logger> create_async(const std::string &logger_name, size_t queue_size,
-        const async_overflow_policy overflow_policy, const std::function<void()> &worker_warmup_cb,
-        const std::chrono::milliseconds &flush_interval_ms, const std::function<void()> &worker_teardown_cb, sink_ptr sink)
-    {
-        return create_async(logger_name, queue_size, overflow_policy, worker_warmup_cb, flush_interval_ms, worker_teardown_cb, {sink});
-    }
-
-    void formatter(formatter_ptr f)
-    {
-        std::lock_guard<Mutex> lock(_mutex);
-        _formatter = f;
-        for (auto &l : _loggers)
-        {
-            l.second->set_formatter(_formatter);
-        }
-    }
-
-    void set_pattern(const std::string &pattern)
-    {
-        std::lock_guard<Mutex> lock(_mutex);
-        _formatter = std::make_shared<pattern_formatter>(pattern);
-        for (auto &l : _loggers)
-        {
-            l.second->set_formatter(_formatter);
+            l.second->set_formatter(formatter_->clone());
         }
     }
 
     void set_level(level::level_enum log_level)
     {
-        std::lock_guard<Mutex> lock(_mutex);
-        for (auto &l : _loggers)
+        std::lock_guard<std::mutex> lock(logger_map_mutex_);
+        for (auto &l : loggers_)
         {
             l.second->set_level(log_level);
         }
-        _level = log_level;
+        level_ = log_level;
     }
 
     void flush_on(level::level_enum log_level)
     {
-        std::lock_guard<Mutex> lock(_mutex);
-        for (auto &l : _loggers)
+        std::lock_guard<std::mutex> lock(logger_map_mutex_);
+        for (auto &l : loggers_)
         {
             l.second->flush_on(log_level);
         }
-        _flush_level = log_level;
+        flush_level_ = log_level;
+    }
+
+    void flush_every(std::chrono::seconds interval)
+    {
+        std::lock_guard<std::mutex> lock(flusher_mutex_);
+        std::function<void()> clbk(std::bind(&registry::flush_all, this));
+        periodic_flusher_.reset(new periodic_worker(clbk, interval));
     }
 
     void set_error_handler(log_err_handler handler)
     {
-        for (auto &l : _loggers)
+        std::lock_guard<std::mutex> lock(logger_map_mutex_);
+        for (auto &l : loggers_)
         {
             l.second->set_error_handler(handler);
         }
-        _err_handler = handler;
+        err_handler_ = handler;
     }
 
-    void set_async_mode(size_t q_size, const async_overflow_policy overflow_policy, const std::function<void()> &worker_warmup_cb,
-        const std::chrono::milliseconds &flush_interval_ms, const std::function<void()> &worker_teardown_cb)
+    void apply_all(std::function<void(std::shared_ptr<logger>)> fun)
     {
-        std::lock_guard<Mutex> lock(_mutex);
-        _async_mode = true;
-        _async_q_size = q_size;
-        _overflow_policy = overflow_policy;
-        _worker_warmup_cb = worker_warmup_cb;
-        _flush_interval_ms = flush_interval_ms;
-        _worker_teardown_cb = worker_teardown_cb;
+        std::lock_guard<std::mutex> lock(logger_map_mutex_);
+        for (auto &l : loggers_)
+        {
+            fun(l.second);
+        }
     }
 
-    void set_sync_mode()
+    void flush_all()
     {
-        std::lock_guard<Mutex> lock(_mutex);
-        _async_mode = false;
+        std::lock_guard<std::mutex> lock(logger_map_mutex_);
+        for (auto &l : loggers_)
+        {
+            l.second->flush();
+        }
     }
 
-    static registry_t<Mutex> &instance()
+    void drop(const std::string &logger_name)
     {
-        static registry_t<Mutex> s_instance;
+        std::lock_guard<std::mutex> lock(logger_map_mutex_);
+        loggers_.erase(logger_name);
+    }
+
+    void drop_all()
+    {
+        std::lock_guard<std::mutex> lock(logger_map_mutex_);
+        loggers_.clear();
+    }
+
+    // clean all reasources and threads started by the registry
+    void shutdown()
+    {
+        {
+            std::lock_guard<std::mutex> lock(flusher_mutex_);
+            periodic_flusher_.reset();
+        }
+
+        drop_all();
+
+        {
+            std::lock_guard<std::recursive_mutex> lock(tp_mutex_);
+            tp_.reset();
+        }
+    }
+
+    std::recursive_mutex &tp_mutex()
+    {
+        return tp_mutex_;
+    }
+
+    static registry &instance()
+    {
+        static registry s_instance;
         return s_instance;
     }
 
 private:
-    registry_t<Mutex>() = default;
-
-    void throw_if_exists(const std::string &logger_name)
+    registry()
+        : formatter_(new pattern_formatter("%+"))
     {
-        if (_loggers.find(logger_name) != _loggers.end())
+    }
+
+    ~registry()
+    {
+        /*std::lock_guard<std::mutex> lock(flusher_mutex_);
+        periodic_flusher_.reset();*/
+    }
+
+    void throw_if_exists_(const std::string &logger_name)
+    {
+        if (loggers_.find(logger_name) != loggers_.end())
         {
             throw spdlog_ex("logger with name '" + logger_name + "' already exists");
         }
     }
 
-    Mutex _mutex;
-    std::unordered_map<std::string, std::shared_ptr<logger>> _loggers;
-    formatter_ptr _formatter;
-    level::level_enum _level = level::info;
-    level::level_enum _flush_level = level::off;
-    log_err_handler _err_handler;
-    bool _async_mode = false;
-    size_t _async_q_size = 0;
-    async_overflow_policy _overflow_policy = async_overflow_policy::block_retry;
-    std::function<void()> _worker_warmup_cb;
-    std::chrono::milliseconds _flush_interval_ms{std::chrono::milliseconds::zero()};
-    std::function<void()> _worker_teardown_cb;
+    std::mutex logger_map_mutex_, flusher_mutex_;
+    std::recursive_mutex tp_mutex_;
+    std::unordered_map<std::string, std::shared_ptr<logger>> loggers_;
+    std::unique_ptr<formatter> formatter_;
+    level::level_enum level_ = level::info;
+    level::level_enum flush_level_ = level::off;
+    log_err_handler err_handler_;
+    std::shared_ptr<thread_pool> tp_;
+    std::unique_ptr<periodic_worker> periodic_flusher_;
 };
 
-#ifdef SPDLOG_NO_REGISTRY_MUTEX
-using registry = registry_t<spdlog::details::null_mutex>;
-#else
-using registry = registry_t<std::mutex>;
-#endif
-
 } // namespace details
 } // namespace spdlog

include/spdlog/details/spdlog_impl.h

@@ -1,278 +0,0 @@
-//
-// Copyright(c) 2015 Gabi Melman.
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-//
-
-#pragma once
-
-//
-// Global registry functions
-//
-#include "../details/registry.h"
-#include "../sinks/file_sinks.h"
-#include "../sinks/stdout_sinks.h"
-#include "../spdlog.h"
-#ifdef SPDLOG_ENABLE_SYSLOG
-#include "../sinks/syslog_sink.h"
-#endif
-
-#if defined _WIN32 && !defined(__cplusplus_winrt)
-#include "../sinks/wincolor_sink.h"
-#else
-#include "../sinks/ansicolor_sink.h"
-#endif
-
-#ifdef __ANDROID__
-#include "../sinks/android_sink.h"
-#endif
-
-#include <chrono>
-#include <functional>
-#include <memory>
-#include <string>
-
-inline void spdlog::register_logger(std::shared_ptr<logger> logger)
-{
-    return details::registry::instance().register_logger(std::move(logger));
-}
-
-inline std::shared_ptr<spdlog::logger> spdlog::get(const std::string &name)
-{
-    return details::registry::instance().get(name);
-}
-
-inline void spdlog::drop(const std::string &name)
-{
-    details::registry::instance().drop(name);
-}
-
-// Create multi/single threaded simple file logger
-inline std::shared_ptr<spdlog::logger> spdlog::basic_logger_mt(const std::string &logger_name, const filename_t &filename, bool truncate)
-{
-    return create<spdlog::sinks::simple_file_sink_mt>(logger_name, filename, truncate);
-}
-
-inline std::shared_ptr<spdlog::logger> spdlog::basic_logger_st(const std::string &logger_name, const filename_t &filename, bool truncate)
-{
-    return create<spdlog::sinks::simple_file_sink_st>(logger_name, filename, truncate);
-}
-
-// Create multi/single threaded rotating file logger
-inline std::shared_ptr<spdlog::logger> spdlog::rotating_logger_mt(
-    const std::string &logger_name, const filename_t &filename, size_t max_file_size, size_t max_files)
-{
-    return create<spdlog::sinks::rotating_file_sink_mt>(logger_name, filename, max_file_size, max_files);
-}
-
-inline std::shared_ptr<spdlog::logger> spdlog::rotating_logger_st(
-    const std::string &logger_name, const filename_t &filename, size_t max_file_size, size_t max_files)
-{
-    return create<spdlog::sinks::rotating_file_sink_st>(logger_name, filename, max_file_size, max_files);
-}
-
-// Create file logger which creates new file at midnight):
-inline std::shared_ptr<spdlog::logger> spdlog::daily_logger_mt(
-    const std::string &logger_name, const filename_t &filename, int hour, int minute)
-{
-    return create<spdlog::sinks::daily_file_sink_mt>(logger_name, filename, hour, minute);
-}
-
-inline std::shared_ptr<spdlog::logger> spdlog::daily_logger_st(
-    const std::string &logger_name, const filename_t &filename, int hour, int minute)
-{
-    return create<spdlog::sinks::daily_file_sink_st>(logger_name, filename, hour, minute);
-}
-
-//
-// stdout/stderr loggers
-//
-inline std::shared_ptr<spdlog::logger> spdlog::stdout_logger_mt(const std::string &logger_name)
-{
-    return spdlog::details::registry::instance().create(logger_name, spdlog::sinks::stdout_sink_mt::instance());
-}
-
-inline std::shared_ptr<spdlog::logger> spdlog::stdout_logger_st(const std::string &logger_name)
-{
-    return spdlog::details::registry::instance().create(logger_name, spdlog::sinks::stdout_sink_st::instance());
-}
-
-inline std::shared_ptr<spdlog::logger> spdlog::stderr_logger_mt(const std::string &logger_name)
-{
-    return spdlog::details::registry::instance().create(logger_name, spdlog::sinks::stderr_sink_mt::instance());
-}
-
-inline std::shared_ptr<spdlog::logger> spdlog::stderr_logger_st(const std::string &logger_name)
-{
-    return spdlog::details::registry::instance().create(logger_name, spdlog::sinks::stderr_sink_st::instance());
-}
-
-//
-// stdout/stderr color loggers
-//
-#if defined _WIN32 && !defined(__cplusplus_winrt)
-
-inline std::shared_ptr<spdlog::logger> spdlog::stdout_color_mt(const std::string &logger_name)
-{
-    auto sink = std::make_shared<spdlog::sinks::wincolor_stdout_sink_mt>();
-    return spdlog::details::registry::instance().create(logger_name, sink);
-}
-
-inline std::shared_ptr<spdlog::logger> spdlog::stdout_color_st(const std::string &logger_name)
-{
-    auto sink = std::make_shared<spdlog::sinks::wincolor_stdout_sink_st>();
-    return spdlog::details::registry::instance().create(logger_name, sink);
-}
-
-inline std::shared_ptr<spdlog::logger> spdlog::stderr_color_mt(const std::string &logger_name)
-{
-    auto sink = std::make_shared<spdlog::sinks::wincolor_stderr_sink_mt>();
-    return spdlog::details::registry::instance().create(logger_name, sink);
-}
-
-inline std::shared_ptr<spdlog::logger> spdlog::stderr_color_st(const std::string &logger_name)
-{
-    auto sink = std::make_shared<spdlog::sinks::wincolor_stderr_sink_st>();
-    return spdlog::details::registry::instance().create(logger_name, sink);
-}
-
-#else // ansi terminal colors
-
-inline std::shared_ptr<spdlog::logger> spdlog::stdout_color_mt(const std::string &logger_name)
-{
-    auto sink = std::make_shared<spdlog::sinks::ansicolor_stdout_sink_mt>();
-    return spdlog::details::registry::instance().create(logger_name, sink);
-}
-
-inline std::shared_ptr<spdlog::logger> spdlog::stdout_color_st(const std::string &logger_name)
-{
-    auto sink = std::make_shared<spdlog::sinks::ansicolor_stdout_sink_st>();
-    return spdlog::details::registry::instance().create(logger_name, sink);
-}
-
-inline std::shared_ptr<spdlog::logger> spdlog::stderr_color_mt(const std::string &logger_name)
-{
-    auto sink = std::make_shared<spdlog::sinks::ansicolor_stderr_sink_mt>();
-    return spdlog::details::registry::instance().create(logger_name, sink);
-}
-
-inline std::shared_ptr<spdlog::logger> spdlog::stderr_color_st(const std::string &logger_name)
-{
-    auto sink = std::make_shared<spdlog::sinks::ansicolor_stderr_sink_st>();
-    return spdlog::details::registry::instance().create(logger_name, sink);
-}
-#endif
-
-#ifdef SPDLOG_ENABLE_SYSLOG
-// Create syslog logger
-inline std::shared_ptr<spdlog::logger> spdlog::syslog_logger(
-    const std::string &logger_name, const std::string &syslog_ident, int syslog_option, int syslog_facility)
-{
-    return create<spdlog::sinks::syslog_sink>(logger_name, syslog_ident, syslog_option, syslog_facility);
-}
-#endif
-
-#ifdef __ANDROID__
-inline std::shared_ptr<spdlog::logger> spdlog::android_logger(const std::string &logger_name, const std::string &tag)
-{
-    return create<spdlog::sinks::android_sink>(logger_name, tag);
-}
-#endif
-
-// Create and register a logger a single sink
-inline std::shared_ptr<spdlog::logger> spdlog::create(const std::string &logger_name, const spdlog::sink_ptr &sink)
-{
-    return details::registry::instance().create(logger_name, sink);
-}
-
-// Create logger with multiple sinks
-inline std::shared_ptr<spdlog::logger> spdlog::create(const std::string &logger_name, spdlog::sinks_init_list sinks)
-{
-    return details::registry::instance().create(logger_name, sinks);
-}
-
-template<typename Sink, typename... Args>
-inline std::shared_ptr<spdlog::logger> spdlog::create(const std::string &logger_name, Args... args)
-{
-    sink_ptr sink = std::make_shared<Sink>(args...);
-    return details::registry::instance().create(logger_name, {sink});
-}
-
-template<class It>
-inline std::shared_ptr<spdlog::logger> spdlog::create(const std::string &logger_name, const It &sinks_begin, const It &sinks_end)
-{
-    return details::registry::instance().create(logger_name, sinks_begin, sinks_end);
-}
-
-// Create and register an async logger with a single sink
-inline std::shared_ptr<spdlog::logger> spdlog::create_async(const std::string &logger_name, const sink_ptr &sink, size_t queue_size,
-    const async_overflow_policy overflow_policy, const std::function<void()> &worker_warmup_cb,
-    const std::chrono::milliseconds &flush_interval_ms, const std::function<void()> &worker_teardown_cb)
-{
-    return details::registry::instance().create_async(
-        logger_name, queue_size, overflow_policy, worker_warmup_cb, flush_interval_ms, worker_teardown_cb, sink);
-}
-
-// Create and register an async logger with multiple sinks
-inline std::shared_ptr<spdlog::logger> spdlog::create_async(const std::string &logger_name, sinks_init_list sinks, size_t queue_size,
-    const async_overflow_policy overflow_policy, const std::function<void()> &worker_warmup_cb,
-    const std::chrono::milliseconds &flush_interval_ms, const std::function<void()> &worker_teardown_cb)
-{
-    return details::registry::instance().create_async(
-        logger_name, queue_size, overflow_policy, worker_warmup_cb, flush_interval_ms, worker_teardown_cb, sinks);
-}
-
-template<class It>
-inline std::shared_ptr<spdlog::logger> spdlog::create_async(const std::string &logger_name, const It &sinks_begin, const It &sinks_end,
-    size_t queue_size, const async_overflow_policy overflow_policy, const std::function<void()> &worker_warmup_cb,
-    const std::chrono::milliseconds &flush_interval_ms, const std::function<void()> &worker_teardown_cb)
-{
-    return details::registry::instance().create_async(
-        logger_name, queue_size, overflow_policy, worker_warmup_cb, flush_interval_ms, worker_teardown_cb, sinks_begin, sinks_end);
-}
-
-inline void spdlog::set_formatter(spdlog::formatter_ptr f)
-{
-    details::registry::instance().formatter(std::move(f));
-}
-
-inline void spdlog::set_pattern(const std::string &format_string)
-{
-    return details::registry::instance().set_pattern(format_string);
-}
-
-inline void spdlog::set_level(level::level_enum log_level)
-{
-    return details::registry::instance().set_level(log_level);
-}
-
-inline void spdlog::flush_on(level::level_enum log_level)
-{
-    return details::registry::instance().flush_on(log_level);
-}
-
-inline void spdlog::set_error_handler(log_err_handler handler)
-{
-    return details::registry::instance().set_error_handler(std::move(handler));
-}
-
-inline void spdlog::set_async_mode(size_t queue_size, const async_overflow_policy overflow_policy,
-    const std::function<void()> &worker_warmup_cb, const std::chrono::milliseconds &flush_interval_ms,
-    const std::function<void()> &worker_teardown_cb)
-{
-    details::registry::instance().set_async_mode(queue_size, overflow_policy, worker_warmup_cb, flush_interval_ms, worker_teardown_cb);
-}
-
-inline void spdlog::set_sync_mode()
-{
-    details::registry::instance().set_sync_mode();
-}
-
-inline void spdlog::apply_all(std::function<void(std::shared_ptr<logger>)> fun)
-{
-    details::registry::instance().apply_all(std::move(fun));
-}
-
-inline void spdlog::drop_all()
-{
-    details::registry::instance().drop_all();
-}

include/spdlog/details/thread_pool.h

@@ -0,0 +1,220 @@
+#pragma once
+
+#include "spdlog/details/log_msg.h"
+#include "spdlog/details/mpmc_blocking_q.h"
+#include "spdlog/details/os.h"
+
+#include <chrono>
+#include <memory>
+#include <thread>
+#include <vector>
+
+namespace spdlog {
+namespace details {
+
+using async_logger_ptr = std::shared_ptr<spdlog::async_logger>;
+
+enum class async_msg_type
+{
+    log,
+    flush,
+    terminate
+};
+
+// Async msg to move to/from the queue
+// Movable only. should never be copied
+struct async_msg
+{
+    async_msg_type msg_type;
+    level::level_enum level;
+    log_clock::time_point time;
+    size_t thread_id;
+    fmt::basic_memory_buffer<char, 176> raw;
+
+    size_t msg_id;
+    async_logger_ptr worker_ptr;
+
+    async_msg() = default;
+    ~async_msg() = default;
+
+    // should only be moved in or out of the queue..
+    async_msg(const async_msg &) = delete;
+
+// support for vs2013 move
+#if defined(_MSC_VER) && _MSC_VER <= 1800
+    async_msg(async_msg &&other) SPDLOG_NOEXCEPT : msg_type(other.msg_type),
+                                                   level(other.level),
+                                                   time(other.time),
+                                                   thread_id(other.thread_id),
+                                                   raw(move(other.raw)),
+                                                   msg_id(other.msg_id),
+                                                   worker_ptr(std::move(other.worker_ptr))
+    {
+    }
+
+    async_msg &operator=(async_msg &&other) SPDLOG_NOEXCEPT
+    {
+        msg_type = other.msg_type;
+        level = other.level;
+        time = other.time;
+        thread_id = other.thread_id;
+        raw = std::move(other.raw);
+        msg_id = other.msg_id;
+        worker_ptr = std::move(other.worker_ptr);
+        return *this;
+    }
+#else // (_MSC_VER) && _MSC_VER <= 1800
+    async_msg(async_msg &&other) = default;
+    async_msg &operator=(async_msg &&other) = default;
+#endif
+
+    // construct from log_msg with given type
+    async_msg(async_logger_ptr &&worker, async_msg_type the_type, details::log_msg &&m)
+        : msg_type(the_type)
+        , level(m.level)
+        , time(m.time)
+        , thread_id(m.thread_id)
+        , msg_id(m.msg_id)
+        , worker_ptr(std::forward<async_logger_ptr>(worker))
+    {
+        fmt_helper::append_buf(m.raw, raw);
+    }
+
+    async_msg(async_logger_ptr &&worker, async_msg_type the_type)
+        : async_msg(std::forward<async_logger_ptr>(worker), the_type, details::log_msg())
+    {
+    }
+
+    explicit async_msg(async_msg_type the_type)
+        : async_msg(nullptr, the_type, details::log_msg())
+    {
+    }
+
+    // copy into log_msg
+    void to_log_msg(log_msg &msg)
+    {
+        msg.logger_name = &worker_ptr->name();
+        msg.level = level;
+        msg.time = time;
+        msg.thread_id = thread_id;
+        fmt_helper::append_buf(raw, msg.raw);
+        msg.msg_id = msg_id;
+        msg.color_range_start = 0;
+        msg.color_range_end = 0;
+    }
+};
+
+class thread_pool
+{
+public:
+    using item_type = async_msg;
+    using q_type = details::mpmc_blocking_queue<item_type>;
+
+    thread_pool(size_t q_max_items, size_t threads_n)
+        : q_(q_max_items)
+    {
+        // std::cout << "thread_pool()  q_size_bytes: " << q_size_bytes <<
+        // "\tthreads_n: " << threads_n << std::endl;
+        if (threads_n == 0 || threads_n > 1000)
+        {
+            throw spdlog_ex("spdlog::thread_pool(): invalid threads_n param (valid "
+                            "range is 1-1000)");
+        }
+        for (size_t i = 0; i < threads_n; i++)
+        {
+            threads_.emplace_back(std::bind(&thread_pool::worker_loop_, this));
+        }
+    }
+
+    // message all threads to terminate gracefully join them
+    ~thread_pool()
+    {
+        try
+        {
+            for (size_t i = 0; i < threads_.size(); i++)
+            {
+                post_async_msg_(async_msg(async_msg_type::terminate), async_overflow_policy::block);
+            }
+
+            for (auto &t : threads_)
+            {
+                t.join();
+            }
+        }
+        catch (...)
+        {
+        }
+    }
+
+    void post_log(async_logger_ptr &&worker_ptr, details::log_msg &&msg, async_overflow_policy overflow_policy)
+    {
+        async_msg async_m(std::forward<async_logger_ptr>(worker_ptr), async_msg_type::log, std::forward<log_msg>(msg));
+        post_async_msg_(std::move(async_m), overflow_policy);
+    }
+
+    void post_flush(async_logger_ptr &&worker_ptr, async_overflow_policy overflow_policy)
+    {
+        post_async_msg_(async_msg(std::move(worker_ptr), async_msg_type::flush), overflow_policy);
+    }
+
+private:
+    q_type q_;
+
+    std::vector<std::thread> threads_;
+
+    void post_async_msg_(async_msg &&new_msg, async_overflow_policy overflow_policy)
+    {
+        if (overflow_policy == async_overflow_policy::block)
+        {
+            q_.enqueue(std::move(new_msg));
+        }
+        else
+        {
+            q_.enqueue_nowait(std::move(new_msg));
+        }
+    }
+
+    void worker_loop_()
+    {
+        while (process_next_msg_()) {};
+    }
+
+    // process next message in the queue
+    // return true if this thread should still be active (while no terminate msg
+    // was received)
+    bool process_next_msg_()
+    {
+        async_msg incoming_async_msg;
+        bool dequeued = q_.dequeue_for(incoming_async_msg, std::chrono::seconds(10));
+        if (!dequeued)
+        {
+            return true;
+        }
+
+        switch (incoming_async_msg.msg_type)
+        {
+        case async_msg_type::flush:
+        {
+            incoming_async_msg.worker_ptr->backend_flush_();
+            return true;
+        }
+
+        case async_msg_type::terminate:
+        {
+            return false;
+        }
+
+        default:
+        {
+            log_msg msg;
+            incoming_async_msg.to_log_msg(msg);
+            incoming_async_msg.worker_ptr->backend_log_(msg);
+            return true;
+        }
+        }
+        return true; // should not be reached
+    }
+};
+
+} // namespace details
+} // namespace spdlog

include/spdlog/fmt/bundled/colors.h

@@ -0,0 +1,257 @@
+// Formatting library for C++ - the core API
+//
+// Copyright (c) 2012 - present, Victor Zverovich
+// All rights reserved.
+//
+// For the license information refer to format.h.
+//
+// Copyright (c) 2018 - present, Remotion (Igor Schulz)
+// All Rights Reserved
+// {fmt} support for rgb color output.
+
+#ifndef FMT_COLORS_H_
+#define FMT_COLORS_H_
+
+#include "format.h"
+
+FMT_BEGIN_NAMESPACE
+
+// rgb is a struct for red, green and blue colors.
+// We use rgb as name because some editors will show it as color direct in the
+// editor.
+struct rgb
+{
+    FMT_CONSTEXPR_DECL rgb()
+        : r(0)
+        , g(0)
+        , b(0)
+    {
+    }
+    FMT_CONSTEXPR_DECL rgb(uint8_t r_, uint8_t g_, uint8_t b_)
+        : r(r_)
+        , g(g_)
+        , b(b_)
+    {
+    }
+    FMT_CONSTEXPR_DECL rgb(uint32_t hex)
+        : r((hex >> 16) & 0xFF)
+        , g((hex >> 8) & 0xFF)
+        , b((hex)&0xFF)
+    {
+    }
+    uint8_t r;
+    uint8_t g;
+    uint8_t b;
+};
+
+namespace internal {
+
+FMT_CONSTEXPR inline void to_esc(uint8_t c, char out[], int offset)
+{
+    out[offset + 0] = static_cast<char>('0' + c / 100);
+    out[offset + 1] = static_cast<char>('0' + c / 10 % 10);
+    out[offset + 2] = static_cast<char>('0' + c % 10);
+}
+
+} // namespace internal
+
+FMT_FUNC void vprint_rgb(rgb fd, string_view format, format_args args)
+{
+    char escape_fd[] = "\x1b[38;2;000;000;000m";
+    static FMT_CONSTEXPR_DECL const char RESET_COLOR[] = "\x1b[0m";
+    internal::to_esc(fd.r, escape_fd, 7);
+    internal::to_esc(fd.g, escape_fd, 11);
+    internal::to_esc(fd.b, escape_fd, 15);
+
+    std::fputs(escape_fd, stdout);
+    vprint(format, args);
+    std::fputs(RESET_COLOR, stdout);
+}
+
+FMT_FUNC void vprint_rgb(rgb fd, rgb bg, string_view format, format_args args)
+{
+    char escape_fd[] = "\x1b[38;2;000;000;000m"; // foreground color
+    char escape_bg[] = "\x1b[48;2;000;000;000m"; // background color
+    static FMT_CONSTEXPR_DECL const char RESET_COLOR[] = "\x1b[0m";
+    internal::to_esc(fd.r, escape_fd, 7);
+    internal::to_esc(fd.g, escape_fd, 11);
+    internal::to_esc(fd.b, escape_fd, 15);
+
+    internal::to_esc(bg.r, escape_bg, 7);
+    internal::to_esc(bg.g, escape_bg, 11);
+    internal::to_esc(bg.b, escape_bg, 15);
+
+    std::fputs(escape_fd, stdout);
+    std::fputs(escape_bg, stdout);
+    vprint(format, args);
+    std::fputs(RESET_COLOR, stdout);
+}
+
+template<typename... Args>
+inline void print_rgb(rgb fd, string_view format_str, const Args &... args)
+{
+    vprint_rgb(fd, format_str, make_format_args(args...));
+}
+
+// rgb foreground color
+template<typename... Args>
+inline void print(rgb fd, string_view format_str, const Args &... args)
+{
+    vprint_rgb(fd, format_str, make_format_args(args...));
+}
+
+// rgb foreground color and background color
+template<typename... Args>
+inline void print(rgb fd, rgb bg, string_view format_str, const Args &... args)
+{
+    vprint_rgb(fd, bg, format_str, make_format_args(args...));
+}
+
+enum class color : uint32_t
+{
+    alice_blue = 0xF0F8FF,              // rgb(240,248,255)
+    antique_white = 0xFAEBD7,           // rgb(250,235,215)
+    aqua = 0x00FFFF,                    // rgb(0,255,255)
+    aquamarine = 0x7FFFD4,              // rgb(127,255,212)
+    azure = 0xF0FFFF,                   // rgb(240,255,255)
+    beige = 0xF5F5DC,                   // rgb(245,245,220)
+    bisque = 0xFFE4C4,                  // rgb(255,228,196)
+    black = 0x000000,                   // rgb(0,0,0)
+    blanched_almond = 0xFFEBCD,         // rgb(255,235,205)
+    blue = 0x0000FF,                    // rgb(0,0,255)
+    blue_violet = 0x8A2BE2,             // rgb(138,43,226)
+    brown = 0xA52A2A,                   // rgb(165,42,42)
+    burly_wood = 0xDEB887,              // rgb(222,184,135)
+    cadet_blue = 0x5F9EA0,              // rgb(95,158,160)
+    chartreuse = 0x7FFF00,              // rgb(127,255,0)
+    chocolate = 0xD2691E,               // rgb(210,105,30)
+    coral = 0xFF7F50,                   // rgb(255,127,80)
+    cornflower_blue = 0x6495ED,         // rgb(100,149,237)
+    cornsilk = 0xFFF8DC,                // rgb(255,248,220)
+    crimson = 0xDC143C,                 // rgb(220,20,60)
+    cyan = 0x00FFFF,                    // rgb(0,255,255)
+    dark_blue = 0x00008B,               // rgb(0,0,139)
+    dark_cyan = 0x008B8B,               // rgb(0,139,139)
+    dark_golden_rod = 0xB8860B,         // rgb(184,134,11)
+    dark_gray = 0xA9A9A9,               // rgb(169,169,169)
+    dark_green = 0x006400,              // rgb(0,100,0)
+    dark_khaki = 0xBDB76B,              // rgb(189,183,107)
+    dark_magenta = 0x8B008B,            // rgb(139,0,139)
+    dark_olive_green = 0x556B2F,        // rgb(85,107,47)
+    dark_orange = 0xFF8C00,             // rgb(255,140,0)
+    dark_orchid = 0x9932CC,             // rgb(153,50,204)
+    dark_red = 0x8B0000,                // rgb(139,0,0)
+    dark_salmon = 0xE9967A,             // rgb(233,150,122)
+    dark_sea_green = 0x8FBC8F,          // rgb(143,188,143)
+    dark_slate_blue = 0x483D8B,         // rgb(72,61,139)
+    dark_slate_gray = 0x2F4F4F,         // rgb(47,79,79)
+    dark_turquoise = 0x00CED1,          // rgb(0,206,209)
+    dark_violet = 0x9400D3,             // rgb(148,0,211)
+    deep_pink = 0xFF1493,               // rgb(255,20,147)
+    deep_sky_blue = 0x00BFFF,           // rgb(0,191,255)
+    dim_gray = 0x696969,                // rgb(105,105,105)
+    dodger_blue = 0x1E90FF,             // rgb(30,144,255)
+    fire_brick = 0xB22222,              // rgb(178,34,34)
+    floral_white = 0xFFFAF0,            // rgb(255,250,240)
+    forest_green = 0x228B22,            // rgb(34,139,34)
+    fuchsia = 0xFF00FF,                 // rgb(255,0,255)
+    gainsboro = 0xDCDCDC,               // rgb(220,220,220)
+    ghost_white = 0xF8F8FF,             // rgb(248,248,255)
+    gold = 0xFFD700,                    // rgb(255,215,0)
+    golden_rod = 0xDAA520,              // rgb(218,165,32)
+    gray = 0x808080,                    // rgb(128,128,128)
+    green = 0x008000,                   // rgb(0,128,0)
+    green_yellow = 0xADFF2F,            // rgb(173,255,47)
+    honey_dew = 0xF0FFF0,               // rgb(240,255,240)
+    hot_pink = 0xFF69B4,                // rgb(255,105,180)
+    indian_red = 0xCD5C5C,              // rgb(205,92,92)
+    indigo = 0x4B0082,                  // rgb(75,0,130)
+    ivory = 0xFFFFF0,                   // rgb(255,255,240)
+    khaki = 0xF0E68C,                   // rgb(240,230,140)
+    lavender = 0xE6E6FA,                // rgb(230,230,250)
+    lavender_blush = 0xFFF0F5,          // rgb(255,240,245)
+    lawn_green = 0x7CFC00,              // rgb(124,252,0)
+    lemon_chiffon = 0xFFFACD,           // rgb(255,250,205)
+    light_blue = 0xADD8E6,              // rgb(173,216,230)
+    light_coral = 0xF08080,             // rgb(240,128,128)
+    light_cyan = 0xE0FFFF,              // rgb(224,255,255)
+    light_golden_rod_yellow = 0xFAFAD2, // rgb(250,250,210)
+    light_gray = 0xD3D3D3,              // rgb(211,211,211)
+    light_green = 0x90EE90,             // rgb(144,238,144)
+    light_pink = 0xFFB6C1,              // rgb(255,182,193)
+    light_salmon = 0xFFA07A,            // rgb(255,160,122)
+    light_sea_green = 0x20B2AA,         // rgb(32,178,170)
+    light_sky_blue = 0x87CEFA,          // rgb(135,206,250)
+    light_slate_gray = 0x778899,        // rgb(119,136,153)
+    light_steel_blue = 0xB0C4DE,        // rgb(176,196,222)
+    light_yellow = 0xFFFFE0,            // rgb(255,255,224)
+    lime = 0x00FF00,                    // rgb(0,255,0)
+    lime_green = 0x32CD32,              // rgb(50,205,50)
+    linen = 0xFAF0E6,                   // rgb(250,240,230)
+    magenta = 0xFF00FF,                 // rgb(255,0,255)
+    maroon = 0x800000,                  // rgb(128,0,0)
+    medium_aqua_marine = 0x66CDAA,      // rgb(102,205,170)
+    medium_blue = 0x0000CD,             // rgb(0,0,205)
+    medium_orchid = 0xBA55D3,           // rgb(186,85,211)
+    medium_purple = 0x9370DB,           // rgb(147,112,219)
+    medium_sea_green = 0x3CB371,        // rgb(60,179,113)
+    medium_slate_blue = 0x7B68EE,       // rgb(123,104,238)
+    medium_spring_green = 0x00FA9A,     // rgb(0,250,154)
+    medium_turquoise = 0x48D1CC,        // rgb(72,209,204)
+    medium_violet_red = 0xC71585,       // rgb(199,21,133)
+    midnight_blue = 0x191970,           // rgb(25,25,112)
+    mint_cream = 0xF5FFFA,              // rgb(245,255,250)
+    misty_rose = 0xFFE4E1,              // rgb(255,228,225)
+    moccasin = 0xFFE4B5,                // rgb(255,228,181)
+    navajo_white = 0xFFDEAD,            // rgb(255,222,173)
+    navy = 0x000080,                    // rgb(0,0,128)
+    old_lace = 0xFDF5E6,                // rgb(253,245,230)
+    olive = 0x808000,                   // rgb(128,128,0)
+    olive_drab = 0x6B8E23,              // rgb(107,142,35)
+    orange = 0xFFA500,                  // rgb(255,165,0)
+    orange_red = 0xFF4500,              // rgb(255,69,0)
+    orchid = 0xDA70D6,                  // rgb(218,112,214)
+    pale_golden_rod = 0xEEE8AA,         // rgb(238,232,170)
+    pale_green = 0x98FB98,              // rgb(152,251,152)
+    pale_turquoise = 0xAFEEEE,          // rgb(175,238,238)
+    pale_violet_red = 0xDB7093,         // rgb(219,112,147)
+    papaya_whip = 0xFFEFD5,             // rgb(255,239,213)
+    peach_puff = 0xFFDAB9,              // rgb(255,218,185)
+    peru = 0xCD853F,                    // rgb(205,133,63)
+    pink = 0xFFC0CB,                    // rgb(255,192,203)
+    plum = 0xDDA0DD,                    // rgb(221,160,221)
+    powder_blue = 0xB0E0E6,             // rgb(176,224,230)
+    purple = 0x800080,                  // rgb(128,0,128)
+    rebecca_purple = 0x663399,          // rgb(102,51,153)
+    red = 0xFF0000,                     // rgb(255,0,0)
+    rosy_brown = 0xBC8F8F,              // rgb(188,143,143)
+    royal_blue = 0x4169E1,              // rgb(65,105,225)
+    saddle_brown = 0x8B4513,            // rgb(139,69,19)
+    salmon = 0xFA8072,                  // rgb(250,128,114)
+    sandy_brown = 0xF4A460,             // rgb(244,164,96)
+    sea_green = 0x2E8B57,               // rgb(46,139,87)
+    sea_shell = 0xFFF5EE,               // rgb(255,245,238)
+    sienna = 0xA0522D,                  // rgb(160,82,45)
+    silver = 0xC0C0C0,                  // rgb(192,192,192)
+    sky_blue = 0x87CEEB,                // rgb(135,206,235)
+    slate_blue = 0x6A5ACD,              // rgb(106,90,205)
+    slate_gray = 0x708090,              // rgb(112,128,144)
+    snow = 0xFFFAFA,                    // rgb(255,250,250)
+    spring_green = 0x00FF7F,            // rgb(0,255,127)
+    steel_blue = 0x4682B4,              // rgb(70,130,180)
+    tan = 0xD2B48C,                     // rgb(210,180,140)
+    teal = 0x008080,                    // rgb(0,128,128)
+    thistle = 0xD8BFD8,                 // rgb(216,191,216)
+    tomato = 0xFF6347,                  // rgb(255,99,71)
+    turquoise = 0x40E0D0,               // rgb(64,224,208)
+    violet = 0xEE82EE,                  // rgb(238,130,238)
+    wheat = 0xF5DEB3,                   // rgb(245,222,179)
+    white = 0xFFFFFF,                   // rgb(255,255,255)
+    white_smoke = 0xF5F5F5,             // rgb(245,245,245)
+    yellow = 0xFFFF00,                  // rgb(255,255,0)
+    yellow_green = 0x9ACD32,            // rgb(154,205,50)
+};                                      // enum class colors
+
+FMT_END_NAMESPACE
+
+#endif // FMT_COLORS_H_

include/spdlog/fmt/bundled/format-inl.h

@@ -0,0 +1,578 @@
+// Formatting library for C++
+//
+// Copyright (c) 2012 - 2016, Victor Zverovich
+// All rights reserved.
+//
+// For the license information refer to format.h.
+
+#ifndef FMT_FORMAT_INL_H_
+#define FMT_FORMAT_INL_H_
+
+#include "format.h"
+
+#include <string.h>
+
+#include <cctype>
+#include <cerrno>
+#include <climits>
+#include <cmath>
+#include <cstdarg>
+#include <cstddef> // for std::ptrdiff_t
+#include <locale>
+
+#if defined(_WIN32) && defined(__MINGW32__)
+#include <cstring>
+#endif
+
+#if FMT_USE_WINDOWS_H
+#if !defined(FMT_HEADER_ONLY) && !defined(WIN32_LEAN_AND_MEAN)
+#define WIN32_LEAN_AND_MEAN
+#endif
+#if defined(NOMINMAX) || defined(FMT_WIN_MINMAX)
+#include <windows.h>
+#else
+#define NOMINMAX
+#include <windows.h>
+#undef NOMINMAX
+#endif
+#endif
+
+#if FMT_EXCEPTIONS
+#define FMT_TRY try
+#define FMT_CATCH(x) catch (x)
+#else
+#define FMT_TRY if (true)
+#define FMT_CATCH(x) if (false)
+#endif
+
+#ifdef _MSC_VER
+#pragma warning(push)
+#pragma warning(disable : 4127) // conditional expression is constant
+#pragma warning(disable : 4702) // unreachable code
+// Disable deprecation warning for strerror. The latter is not called but
+// MSVC fails to detect it.
+#pragma warning(disable : 4996)
+#endif
+
+// Dummy implementations of strerror_r and strerror_s called if corresponding
+// system functions are not available.
+inline fmt::internal::null<> strerror_r(int, char *, ...)
+{
+    return fmt::internal::null<>();
+}
+inline fmt::internal::null<> strerror_s(char *, std::size_t, ...)
+{
+    return fmt::internal::null<>();
+}
+
+FMT_BEGIN_NAMESPACE
+
+namespace {
+
+#ifndef _MSC_VER
+#define FMT_SNPRINTF snprintf
+#else // _MSC_VER
+inline int fmt_snprintf(char *buffer, size_t size, const char *format, ...)
+{
+    va_list args;
+    va_start(args, format);
+    int result = vsnprintf_s(buffer, size, _TRUNCATE, format, args);
+    va_end(args);
+    return result;
+}
+#define FMT_SNPRINTF fmt_snprintf
+#endif // _MSC_VER
+
+#if defined(_WIN32) && defined(__MINGW32__) && !defined(__NO_ISOCEXT)
+#define FMT_SWPRINTF snwprintf
+#else
+#define FMT_SWPRINTF swprintf
+#endif // defined(_WIN32) && defined(__MINGW32__) && !defined(__NO_ISOCEXT)
+
+typedef void (*FormatFunc)(internal::buffer &, int, string_view);
+
+// Portable thread-safe version of strerror.
+// Sets buffer to point to a string describing the error code.
+// This can be either a pointer to a string stored in buffer,
+// or a pointer to some static immutable string.
+// Returns one of the following values:
+//   0      - success
+//   ERANGE - buffer is not large enough to store the error message
+//   other  - failure
+// Buffer should be at least of size 1.
+int safe_strerror(int error_code, char *&buffer, std::size_t buffer_size) FMT_NOEXCEPT
+{
+    FMT_ASSERT(buffer != FMT_NULL && buffer_size != 0, "invalid buffer");
+
+    class dispatcher
+    {
+    private:
+        int error_code_;
+        char *&buffer_;
+        std::size_t buffer_size_;
+
+        // A noop assignment operator to avoid bogus warnings.
+        void operator=(const dispatcher &) {}
+
+        // Handle the result of XSI-compliant version of strerror_r.
+        int handle(int result)
+        {
+            // glibc versions before 2.13 return result in errno.
+            return result == -1 ? errno : result;
+        }
+
+        // Handle the result of GNU-specific version of strerror_r.
+        int handle(char *message)
+        {
+            // If the buffer is full then the message is probably truncated.
+            if (message == buffer_ && strlen(buffer_) == buffer_size_ - 1)
+                return ERANGE;
+            buffer_ = message;
+            return 0;
+        }
+
+        // Handle the case when strerror_r is not available.
+        int handle(internal::null<>)
+        {
+            return fallback(strerror_s(buffer_, buffer_size_, error_code_));
+        }
+
+        // Fallback to strerror_s when strerror_r is not available.
+        int fallback(int result)
+        {
+            // If the buffer is full then the message is probably truncated.
+            return result == 0 && strlen(buffer_) == buffer_size_ - 1 ? ERANGE : result;
+        }
+
+        // Fallback to strerror if strerror_r and strerror_s are not available.
+        int fallback(internal::null<>)
+        {
+            errno = 0;
+            buffer_ = strerror(error_code_);
+            return errno;
+        }
+
+    public:
+        dispatcher(int err_code, char *&buf, std::size_t buf_size)
+            : error_code_(err_code)
+            , buffer_(buf)
+            , buffer_size_(buf_size)
+        {
+        }
+
+        int run()
+        {
+            return handle(strerror_r(error_code_, buffer_, buffer_size_));
+        }
+    };
+    return dispatcher(error_code, buffer, buffer_size).run();
+}
+
+void format_error_code(internal::buffer &out, int error_code, string_view message) FMT_NOEXCEPT
+{
+    // Report error code making sure that the output fits into
+    // inline_buffer_size to avoid dynamic memory allocation and potential
+    // bad_alloc.
+    out.resize(0);
+    static const char SEP[] = ": ";
+    static const char ERROR_STR[] = "error ";
+    // Subtract 2 to account for terminating null characters in SEP and ERROR_STR.
+    std::size_t error_code_size = sizeof(SEP) + sizeof(ERROR_STR) - 2;
+    typedef internal::int_traits<int>::main_type main_type;
+    main_type abs_value = static_cast<main_type>(error_code);
+    if (internal::is_negative(error_code))
+    {
+        abs_value = 0 - abs_value;
+        ++error_code_size;
+    }
+    error_code_size += internal::count_digits(abs_value);
+    writer w(out);
+    if (message.size() <= inline_buffer_size - error_code_size)
+    {
+        w.write(message);
+        w.write(SEP);
+    }
+    w.write(ERROR_STR);
+    w.write(error_code);
+    assert(out.size() <= inline_buffer_size);
+}
+
+void report_error(FormatFunc func, int error_code, string_view message) FMT_NOEXCEPT
+{
+    memory_buffer full_message;
+    func(full_message, error_code, message);
+    // Use Writer::data instead of Writer::c_str to avoid potential memory
+    // allocation.
+    std::fwrite(full_message.data(), full_message.size(), 1, stderr);
+    std::fputc('\n', stderr);
+}
+} // namespace
+
+class locale
+{
+private:
+    std::locale locale_;
+
+public:
+    explicit locale(std::locale loc = std::locale())
+        : locale_(loc)
+    {
+    }
+    std::locale get()
+    {
+        return locale_;
+    }
+};
+
+template<typename Char>
+FMT_FUNC Char internal::thousands_sep(locale_provider *lp)
+{
+    std::locale loc = lp ? lp->locale().get() : std::locale();
+    return std::use_facet<std::numpunct<Char>>(loc).thousands_sep();
+}
+
+FMT_FUNC void system_error::init(int err_code, string_view format_str, format_args args)
+{
+    error_code_ = err_code;
+    memory_buffer buffer;
+    format_system_error(buffer, err_code, vformat(format_str, args));
+    std::runtime_error &base = *this;
+    base = std::runtime_error(to_string(buffer));
+}
+
+namespace internal {
+template<typename T>
+int char_traits<char>::format_float(char *buffer, std::size_t size, const char *format, int precision, T value)
+{
+    return precision < 0 ? FMT_SNPRINTF(buffer, size, format, value) : FMT_SNPRINTF(buffer, size, format, precision, value);
+}
+
+template<typename T>
+int char_traits<wchar_t>::format_float(wchar_t *buffer, std::size_t size, const wchar_t *format, int precision, T value)
+{
+    return precision < 0 ? FMT_SWPRINTF(buffer, size, format, value) : FMT_SWPRINTF(buffer, size, format, precision, value);
+}
+
+template<typename T>
+const char basic_data<T>::DIGITS[] = "0001020304050607080910111213141516171819"
+                                     "2021222324252627282930313233343536373839"
+                                     "4041424344454647484950515253545556575859"
+                                     "6061626364656667686970717273747576777879"
+                                     "8081828384858687888990919293949596979899";
+
+#define FMT_POWERS_OF_10(factor)                                                                                                           \
+    factor * 10, factor * 100, factor * 1000, factor * 10000, factor * 100000, factor * 1000000, factor * 10000000, factor * 100000000,    \
+        factor * 1000000000
+
+template<typename T>
+const uint32_t basic_data<T>::POWERS_OF_10_32[] = {0, FMT_POWERS_OF_10(1)};
+
+template<typename T>
+const uint64_t basic_data<T>::POWERS_OF_10_64[] = {0, FMT_POWERS_OF_10(1), FMT_POWERS_OF_10(1000000000ull), 10000000000000000000ull};
+
+// Normalized 64-bit significands of pow(10, k), for k = -348, -340, ..., 340.
+// These are generated by support/compute-powers.py.
+template<typename T>
+const uint64_t basic_data<T>::POW10_SIGNIFICANDS[] = {0xfa8fd5a0081c0288, 0xbaaee17fa23ebf76, 0x8b16fb203055ac76, 0xcf42894a5dce35ea,
+    0x9a6bb0aa55653b2d, 0xe61acf033d1a45df, 0xab70fe17c79ac6ca, 0xff77b1fcbebcdc4f, 0xbe5691ef416bd60c, 0x8dd01fad907ffc3c,
+    0xd3515c2831559a83, 0x9d71ac8fada6c9b5, 0xea9c227723ee8bcb, 0xaecc49914078536d, 0x823c12795db6ce57, 0xc21094364dfb5637,
+    0x9096ea6f3848984f, 0xd77485cb25823ac7, 0xa086cfcd97bf97f4, 0xef340a98172aace5, 0xb23867fb2a35b28e, 0x84c8d4dfd2c63f3b,
+    0xc5dd44271ad3cdba, 0x936b9fcebb25c996, 0xdbac6c247d62a584, 0xa3ab66580d5fdaf6, 0xf3e2f893dec3f126, 0xb5b5ada8aaff80b8,
+    0x87625f056c7c4a8b, 0xc9bcff6034c13053, 0x964e858c91ba2655, 0xdff9772470297ebd, 0xa6dfbd9fb8e5b88f, 0xf8a95fcf88747d94,
+    0xb94470938fa89bcf, 0x8a08f0f8bf0f156b, 0xcdb02555653131b6, 0x993fe2c6d07b7fac, 0xe45c10c42a2b3b06, 0xaa242499697392d3,
+    0xfd87b5f28300ca0e, 0xbce5086492111aeb, 0x8cbccc096f5088cc, 0xd1b71758e219652c, 0x9c40000000000000, 0xe8d4a51000000000,
+    0xad78ebc5ac620000, 0x813f3978f8940984, 0xc097ce7bc90715b3, 0x8f7e32ce7bea5c70, 0xd5d238a4abe98068, 0x9f4f2726179a2245,
+    0xed63a231d4c4fb27, 0xb0de65388cc8ada8, 0x83c7088e1aab65db, 0xc45d1df942711d9a, 0x924d692ca61be758, 0xda01ee641a708dea,
+    0xa26da3999aef774a, 0xf209787bb47d6b85, 0xb454e4a179dd1877, 0x865b86925b9bc5c2, 0xc83553c5c8965d3d, 0x952ab45cfa97a0b3,
+    0xde469fbd99a05fe3, 0xa59bc234db398c25, 0xf6c69a72a3989f5c, 0xb7dcbf5354e9bece, 0x88fcf317f22241e2, 0xcc20ce9bd35c78a5,
+    0x98165af37b2153df, 0xe2a0b5dc971f303a, 0xa8d9d1535ce3b396, 0xfb9b7cd9a4a7443c, 0xbb764c4ca7a44410, 0x8bab8eefb6409c1a,
+    0xd01fef10a657842c, 0x9b10a4e5e9913129, 0xe7109bfba19c0c9d, 0xac2820d9623bf429, 0x80444b5e7aa7cf85, 0xbf21e44003acdd2d,
+    0x8e679c2f5e44ff8f, 0xd433179d9c8cb841, 0x9e19db92b4e31ba9, 0xeb96bf6ebadf77d9, 0xaf87023b9bf0ee6b};
+
+// Binary exponents of pow(10, k), for k = -348, -340, ..., 340, corresponding
+// to significands above.
+template<typename T>
+const int16_t basic_data<T>::POW10_EXPONENTS[] = {-1220, -1193, -1166, -1140, -1113, -1087, -1060, -1034, -1007, -980, -954, -927, -901,
+    -874, -847, -821, -794, -768, -741, -715, -688, -661, -635, -608, -582, -555, -529, -502, -475, -449, -422, -396, -369, -343, -316,
+    -289, -263, -236, -210, -183, -157, -130, -103, -77, -50, -24, 3, 30, 56, 83, 109, 136, 162, 189, 216, 242, 269, 295, 322, 348, 375,
+    402, 428, 455, 481, 508, 534, 561, 588, 614, 641, 667, 694, 720, 747, 774, 800, 827, 853, 880, 907, 933, 960, 986, 1013, 1039, 1066};
+
+template<typename T>
+const char basic_data<T>::RESET_COLOR[] = "\x1b[0m";
+template<typename T>
+const wchar_t basic_data<T>::WRESET_COLOR[] = L"\x1b[0m";
+
+FMT_FUNC fp operator*(fp x, fp y)
+{
+    // Multiply 32-bit parts of significands.
+    uint64_t mask = (1ULL << 32) - 1;
+    uint64_t a = x.f >> 32, b = x.f & mask;
+    uint64_t c = y.f >> 32, d = y.f & mask;
+    uint64_t ac = a * c, bc = b * c, ad = a * d, bd = b * d;
+    // Compute mid 64-bit of result and round.
+    uint64_t mid = (bd >> 32) + (ad & mask) + (bc & mask) + (1U << 31);
+    return fp(ac + (ad >> 32) + (bc >> 32) + (mid >> 32), x.e + y.e + 64);
+}
+
+FMT_FUNC fp get_cached_power(int min_exponent, int &pow10_exponent)
+{
+    const double one_over_log2_10 = 0.30102999566398114; // 1 / log2(10)
+    int index = static_cast<int>(std::ceil((min_exponent + fp::significand_size - 1) * one_over_log2_10));
+    // Decimal exponent of the first (smallest) cached power of 10.
+    const int first_dec_exp = -348;
+    // Difference between two consecutive decimal exponents in cached powers of
+    // 10.
+    const int dec_exp_step = 8;
+    index = (index - first_dec_exp - 1) / dec_exp_step + 1;
+    pow10_exponent = first_dec_exp + index * dec_exp_step;
+    return fp(data::POW10_SIGNIFICANDS[index], data::POW10_EXPONENTS[index]);
+}
+} // namespace internal
+
+#if FMT_USE_WINDOWS_H
+
+FMT_FUNC internal::utf8_to_utf16::utf8_to_utf16(string_view s)
+{
+    static const char ERROR_MSG[] = "cannot convert string from UTF-8 to UTF-16";
+    if (s.size() > INT_MAX)
+        FMT_THROW(windows_error(ERROR_INVALID_PARAMETER, ERROR_MSG));
+    int s_size = static_cast<int>(s.size());
+    if (s_size == 0)
+    {
+        // MultiByteToWideChar does not support zero length, handle separately.
+        buffer_.resize(1);
+        buffer_[0] = 0;
+        return;
+    }
+
+    int length = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, s.data(), s_size, FMT_NULL, 0);
+    if (length == 0)
+        FMT_THROW(windows_error(GetLastError(), ERROR_MSG));
+    buffer_.resize(length + 1);
+    length = MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, s.data(), s_size, &buffer_[0], length);
+    if (length == 0)
+        FMT_THROW(windows_error(GetLastError(), ERROR_MSG));
+    buffer_[length] = 0;
+}
+
+FMT_FUNC internal::utf16_to_utf8::utf16_to_utf8(wstring_view s)
+{
+    if (int error_code = convert(s))
+    {
+        FMT_THROW(windows_error(error_code, "cannot convert string from UTF-16 to UTF-8"));
+    }
+}
+
+FMT_FUNC int internal::utf16_to_utf8::convert(wstring_view s)
+{
+    if (s.size() > INT_MAX)
+        return ERROR_INVALID_PARAMETER;
+    int s_size = static_cast<int>(s.size());
+    if (s_size == 0)
+    {
+        // WideCharToMultiByte does not support zero length, handle separately.
+        buffer_.resize(1);
+        buffer_[0] = 0;
+        return 0;
+    }
+
+    int length = WideCharToMultiByte(CP_UTF8, 0, s.data(), s_size, FMT_NULL, 0, FMT_NULL, FMT_NULL);
+    if (length == 0)
+        return GetLastError();
+    buffer_.resize(length + 1);
+    length = WideCharToMultiByte(CP_UTF8, 0, s.data(), s_size, &buffer_[0], length, FMT_NULL, FMT_NULL);
+    if (length == 0)
+        return GetLastError();
+    buffer_[length] = 0;
+    return 0;
+}
+
+FMT_FUNC void windows_error::init(int err_code, string_view format_str, format_args args)
+{
+    error_code_ = err_code;
+    memory_buffer buffer;
+    internal::format_windows_error(buffer, err_code, vformat(format_str, args));
+    std::runtime_error &base = *this;
+    base = std::runtime_error(to_string(buffer));
+}
+
+FMT_FUNC void internal::format_windows_error(internal::buffer &out, int error_code, string_view message) FMT_NOEXCEPT
+{
+    FMT_TRY
+    {
+        wmemory_buffer buf;
+        buf.resize(inline_buffer_size);
+        for (;;)
+        {
+            wchar_t *system_message = &buf[0];
+            int result = FormatMessageW(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, FMT_NULL, error_code,
+                MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), system_message, static_cast<uint32_t>(buf.size()), FMT_NULL);
+            if (result != 0)
+            {
+                utf16_to_utf8 utf8_message;
+                if (utf8_message.convert(system_message) == ERROR_SUCCESS)
+                {
+                    writer w(out);
+                    w.write(message);
+                    w.write(": ");
+                    w.write(utf8_message);
+                    return;
+                }
+                break;
+            }
+            if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
+                break; // Can't get error message, report error code instead.
+            buf.resize(buf.size() * 2);
+        }
+    }
+    FMT_CATCH(...) {}
+    format_error_code(out, error_code, message);
+}
+
+#endif // FMT_USE_WINDOWS_H
+
+FMT_FUNC void format_system_error(internal::buffer &out, int error_code, string_view message) FMT_NOEXCEPT
+{
+    FMT_TRY
+    {
+        memory_buffer buf;
+        buf.resize(inline_buffer_size);
+        for (;;)
+        {
+            char *system_message = &buf[0];
+            int result = safe_strerror(error_code, system_message, buf.size());
+            if (result == 0)
+            {
+                writer w(out);
+                w.write(message);
+                w.write(": ");
+                w.write(system_message);
+                return;
+            }
+            if (result != ERANGE)
+                break; // Can't get error message, report error code instead.
+            buf.resize(buf.size() * 2);
+        }
+    }
+    FMT_CATCH(...) {}
+    format_error_code(out, error_code, message);
+}
+
+template<typename Char>
+void basic_fixed_buffer<Char>::grow(std::size_t)
+{
+    FMT_THROW(std::runtime_error("buffer overflow"));
+}
+
+FMT_FUNC void internal::error_handler::on_error(const char *message)
+{
+    FMT_THROW(format_error(message));
+}
+
+FMT_FUNC void report_system_error(int error_code, fmt::string_view message) FMT_NOEXCEPT
+{
+    report_error(format_system_error, error_code, message);
+}
+
+#if FMT_USE_WINDOWS_H
+FMT_FUNC void report_windows_error(int error_code, fmt::string_view message) FMT_NOEXCEPT
+{
+    report_error(internal::format_windows_error, error_code, message);
+}
+#endif
+
+FMT_FUNC void vprint(std::FILE *f, string_view format_str, format_args args)
+{
+    memory_buffer buffer;
+    vformat_to(buffer, format_str, args);
+    std::fwrite(buffer.data(), 1, buffer.size(), f);
+}
+
+FMT_FUNC void vprint(std::FILE *f, wstring_view format_str, wformat_args args)
+{
+    wmemory_buffer buffer;
+    vformat_to(buffer, format_str, args);
+    std::fwrite(buffer.data(), sizeof(wchar_t), buffer.size(), f);
+}
+
+FMT_FUNC void vprint(string_view format_str, format_args args)
+{
+    vprint(stdout, format_str, args);
+}
+
+FMT_FUNC void vprint(wstring_view format_str, wformat_args args)
+{
+    vprint(stdout, format_str, args);
+}
+
+#ifndef FMT_EXTENDED_COLORS
+FMT_FUNC void vprint_colored(color c, string_view format, format_args args)
+{
+    char escape[] = "\x1b[30m";
+    escape[3] = static_cast<char>('0' + c);
+    std::fputs(escape, stdout);
+    vprint(format, args);
+    std::fputs(internal::data::RESET_COLOR, stdout);
+}
+
+FMT_FUNC void vprint_colored(color c, wstring_view format, wformat_args args)
+{
+    wchar_t escape[] = L"\x1b[30m";
+    escape[3] = static_cast<wchar_t>('0' + c);
+    std::fputws(escape, stdout);
+    vprint(format, args);
+    std::fputws(internal::data::WRESET_COLOR, stdout);
+}
+#else
+namespace internal {
+FMT_CONSTEXPR void to_esc(uint8_t c, char out[], int offset)
+{
+    out[offset + 0] = static_cast<char>('0' + c / 100);
+    out[offset + 1] = static_cast<char>('0' + c / 10 % 10);
+    out[offset + 2] = static_cast<char>('0' + c % 10);
+}
+} // namespace internal
+
+FMT_FUNC void vprint_rgb(rgb fd, string_view format, format_args args)
+{
+    char escape_fd[] = "\x1b[38;2;000;000;000m";
+    internal::to_esc(fd.r, escape_fd, 7);
+    internal::to_esc(fd.g, escape_fd, 11);
+    internal::to_esc(fd.b, escape_fd, 15);
+
+    std::fputs(escape_fd, stdout);
+    vprint(format, args);
+    std::fputs(internal::data::RESET_COLOR, stdout);
+}
+
+FMT_FUNC void vprint_rgb(rgb fd, rgb bg, string_view format, format_args args)
+{
+    char escape_fd[] = "\x1b[38;2;000;000;000m"; // foreground color
+    char escape_bg[] = "\x1b[48;2;000;000;000m"; // background color
+    internal::to_esc(fd.r, escape_fd, 7);
+    internal::to_esc(fd.g, escape_fd, 11);
+    internal::to_esc(fd.b, escape_fd, 15);
+
+    internal::to_esc(bg.r, escape_bg, 7);
+    internal::to_esc(bg.g, escape_bg, 11);
+    internal::to_esc(bg.b, escape_bg, 15);
+
+    std::fputs(escape_fd, stdout);
+    std::fputs(escape_bg, stdout);
+    vprint(format, args);
+    std::fputs(internal::data::RESET_COLOR, stdout);
+}
+#endif
+
+FMT_FUNC locale locale_provider::locale()
+{
+    return fmt::locale();
+}
+
+FMT_END_NAMESPACE
+
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
+#endif // FMT_FORMAT_INL_H_

include/spdlog/fmt/bundled/format.cc

@@ -1,495 +0,0 @@
-/*
- Formatting library for C++
-
- Copyright (c) 2012 - 2016, Victor Zverovich
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright notice, this
-    list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "format.h"
-
-#include <string.h>
-
-#include <cctype>
-#include <cerrno>
-#include <climits>
-#include <cmath>
-#include <cstdarg>
-#include <cstddef>  // for std::ptrdiff_t
-
-#if defined(_WIN32) && defined(__MINGW32__)
-# include <cstring>
-#endif
-
-#if FMT_USE_WINDOWS_H
-# if !defined(FMT_HEADER_ONLY) && !defined(WIN32_LEAN_AND_MEAN)
-#  define WIN32_LEAN_AND_MEAN
-# endif
-# if defined(NOMINMAX) || defined(FMT_WIN_MINMAX)
-#  include <windows.h>
-# else
-#  define NOMINMAX
-#  include <windows.h>
-#  undef NOMINMAX
-# endif
-#endif
-
-#if FMT_EXCEPTIONS
-# define FMT_TRY try
-# define FMT_CATCH(x) catch (x)
-#else
-# define FMT_TRY if (true)
-# define FMT_CATCH(x) if (false)
-#endif
-
-#ifdef _MSC_VER
-# pragma warning(push)
-# pragma warning(disable: 4127)  // conditional expression is constant
-# pragma warning(disable: 4702)  // unreachable code
-// Disable deprecation warning for strerror. The latter is not called but
-// MSVC fails to detect it.
-# pragma warning(disable: 4996)
-#endif
-
-// Dummy implementations of strerror_r and strerror_s called if corresponding
-// system functions are not available.
-FMT_MAYBE_UNUSED
-static inline fmt::internal::Null<> strerror_r(int, char *, ...) {
-  return fmt::internal::Null<>();
-}
-FMT_MAYBE_UNUSED
-static inline fmt::internal::Null<> strerror_s(char *, std::size_t, ...) {
-  return fmt::internal::Null<>();
-}
-
-namespace fmt {
-
-FMT_FUNC internal::RuntimeError::~RuntimeError() FMT_DTOR_NOEXCEPT {}
-FMT_FUNC FormatError::~FormatError() FMT_DTOR_NOEXCEPT {}
-FMT_FUNC SystemError::~SystemError() FMT_DTOR_NOEXCEPT {}
-
-namespace {
-
-#ifndef _MSC_VER
-# define FMT_SNPRINTF snprintf
-#else  // _MSC_VER
-inline int fmt_snprintf(char *buffer, size_t size, const char *format, ...) {
-  va_list args;
-  va_start(args, format);
-  int result = vsnprintf_s(buffer, size, _TRUNCATE, format, args);
-  va_end(args);
-  return result;
-}
-# define FMT_SNPRINTF fmt_snprintf
-#endif  // _MSC_VER
-
-#if defined(_WIN32) && defined(__MINGW32__) && !defined(__NO_ISOCEXT)
-# define FMT_SWPRINTF snwprintf
-#else
-# define FMT_SWPRINTF swprintf
-#endif // defined(_WIN32) && defined(__MINGW32__) && !defined(__NO_ISOCEXT)
-
-const char RESET_COLOR[] = "\x1b[0m";
-
-typedef void (*FormatFunc)(Writer &, int, StringRef);
-
-// Portable thread-safe version of strerror.
-// Sets buffer to point to a string describing the error code.
-// This can be either a pointer to a string stored in buffer,
-// or a pointer to some static immutable string.
-// Returns one of the following values:
-//   0      - success
-//   ERANGE - buffer is not large enough to store the error message
-//   other  - failure
-// Buffer should be at least of size 1.
-int safe_strerror(
-    int error_code, char *&buffer, std::size_t buffer_size) FMT_NOEXCEPT {
-  FMT_ASSERT(buffer != FMT_NULL && buffer_size != 0, "invalid buffer");
-
-  class StrError {
-   private:
-    int error_code_;
-    char *&buffer_;
-    std::size_t buffer_size_;
-
-    // A noop assignment operator to avoid bogus warnings.
-    void operator=(const StrError &) {}
-
-    // Handle the result of XSI-compliant version of strerror_r.
-    int handle(int result) {
-      // glibc versions before 2.13 return result in errno.
-      return result == -1 ? errno : result;
-    }
-
-    // Handle the result of GNU-specific version of strerror_r.
-    int handle(char *message) {
-      // If the buffer is full then the message is probably truncated.
-      if (message == buffer_ && strlen(buffer_) == buffer_size_ - 1)
-        return ERANGE;
-      buffer_ = message;
-      return 0;
-    }
-
-    // Handle the case when strerror_r is not available.
-    int handle(internal::Null<>) {
-      return fallback(strerror_s(buffer_, buffer_size_, error_code_));
-    }
-
-    // Fallback to strerror_s when strerror_r is not available.
-    int fallback(int result) {
-      // If the buffer is full then the message is probably truncated.
-      return result == 0 && strlen(buffer_) == buffer_size_ - 1 ?
-            ERANGE : result;
-    }
-
-#ifdef __c2__
-# pragma clang diagnostic push
-# pragma clang diagnostic ignored "-Wdeprecated-declarations"
-#endif
-
-    // Fallback to strerror if strerror_r and strerror_s are not available.
-    int fallback(internal::Null<>) {
-      errno = 0;
-      buffer_ = strerror(error_code_);
-      return errno;
-    }
-
-#ifdef __c2__
-# pragma clang diagnostic pop
-#endif
-
-   public:
-    StrError(int err_code, char *&buf, std::size_t buf_size)
-      : error_code_(err_code), buffer_(buf), buffer_size_(buf_size) {}
-
-    int run() {
-      return handle(strerror_r(error_code_, buffer_, buffer_size_));
-    }
-  };
-  return StrError(error_code, buffer, buffer_size).run();
-}
-
-void format_error_code(Writer &out, int error_code,
-                       StringRef message) FMT_NOEXCEPT {
-  // Report error code making sure that the output fits into
-  // INLINE_BUFFER_SIZE to avoid dynamic memory allocation and potential
-  // bad_alloc.
-  out.clear();
-  static const char SEP[] = ": ";
-  static const char ERROR_STR[] = "error ";
-  // Subtract 2 to account for terminating null characters in SEP and ERROR_STR.
-  std::size_t error_code_size = sizeof(SEP) + sizeof(ERROR_STR) - 2;
-  typedef internal::IntTraits<int>::MainType MainType;
-  MainType abs_value = static_cast<MainType>(error_code);
-  if (internal::is_negative(error_code)) {
-    abs_value = 0 - abs_value;
-    ++error_code_size;
-  }
-  error_code_size += internal::count_digits(abs_value);
-  if (message.size() <= internal::INLINE_BUFFER_SIZE - error_code_size)
-    out << message << SEP;
-  out << ERROR_STR << error_code;
-  assert(out.size() <= internal::INLINE_BUFFER_SIZE);
-}
-
-void report_error(FormatFunc func, int error_code,
-                  StringRef message) FMT_NOEXCEPT {
-  MemoryWriter full_message;
-  func(full_message, error_code, message);
-  // Use Writer::data instead of Writer::c_str to avoid potential memory
-  // allocation.
-  std::fwrite(full_message.data(), full_message.size(), 1, stderr);
-  std::fputc('\n', stderr);
-}
-}  // namespace
-
-FMT_FUNC void SystemError::init(
-    int err_code, CStringRef format_str, ArgList args) {
-  error_code_ = err_code;
-  MemoryWriter w;
-  format_system_error(w, err_code, format(format_str, args));
-  std::runtime_error &base = *this;
-  base = std::runtime_error(w.str());
-}
-
-template <typename T>
-int internal::CharTraits<char>::format_float(
-    char *buffer, std::size_t size, const char *format,
-    unsigned width, int precision, T value) {
-  if (width == 0) {
-    return precision < 0 ?
-        FMT_SNPRINTF(buffer, size, format, value) :
-        FMT_SNPRINTF(buffer, size, format, precision, value);
-  }
-  return precision < 0 ?
-      FMT_SNPRINTF(buffer, size, format, width, value) :
-      FMT_SNPRINTF(buffer, size, format, width, precision, value);
-}
-
-template <typename T>
-int internal::CharTraits<wchar_t>::format_float(
-    wchar_t *buffer, std::size_t size, const wchar_t *format,
-    unsigned width, int precision, T value) {
-  if (width == 0) {
-    return precision < 0 ?
-        FMT_SWPRINTF(buffer, size, format, value) :
-        FMT_SWPRINTF(buffer, size, format, precision, value);
-  }
-  return precision < 0 ?
-      FMT_SWPRINTF(buffer, size, format, width, value) :
-      FMT_SWPRINTF(buffer, size, format, width, precision, value);
-}
-
-template <typename T>
-const char internal::BasicData<T>::DIGITS[] =
-    "0001020304050607080910111213141516171819"
-    "2021222324252627282930313233343536373839"
-    "4041424344454647484950515253545556575859"
-    "6061626364656667686970717273747576777879"
-    "8081828384858687888990919293949596979899";
-
-#define FMT_POWERS_OF_10(factor) \
-  factor * 10, \
-  factor * 100, \
-  factor * 1000, \
-  factor * 10000, \
-  factor * 100000, \
-  factor * 1000000, \
-  factor * 10000000, \
-  factor * 100000000, \
-  factor * 1000000000
-
-template <typename T>
-const uint32_t internal::BasicData<T>::POWERS_OF_10_32[] = {
-  0, FMT_POWERS_OF_10(1)
-};
-
-template <typename T>
-const uint64_t internal::BasicData<T>::POWERS_OF_10_64[] = {
-  0,
-  FMT_POWERS_OF_10(1),
-  FMT_POWERS_OF_10(ULongLong(1000000000)),
-  // Multiply several constants instead of using a single long long constant
-  // to avoid warnings about C++98 not supporting long long.
-  ULongLong(1000000000) * ULongLong(1000000000) * 10
-};
-
-FMT_FUNC void internal::report_unknown_type(char code, const char *type) {
-  (void)type;
-  if (std::isprint(static_cast<unsigned char>(code))) {
-    FMT_THROW(FormatError(
-        format("unknown format code '{}' for {}", code, type)));
-  }
-  FMT_THROW(FormatError(
-      format("unknown format code '\\x{:02x}' for {}",
-        static_cast<unsigned>(code), type)));
-}
-
-#if FMT_USE_WINDOWS_H
-
-FMT_FUNC internal::UTF8ToUTF16::UTF8ToUTF16(StringRef s) {
-  static const char ERROR_MSG[] = "cannot convert string from UTF-8 to UTF-16";
-  if (s.size() > INT_MAX)
-    FMT_THROW(WindowsError(ERROR_INVALID_PARAMETER, ERROR_MSG));
-  int s_size = static_cast<int>(s.size());
-  int length = MultiByteToWideChar(
-      CP_UTF8, MB_ERR_INVALID_CHARS, s.data(), s_size, FMT_NULL, 0);
-  if (length == 0)
-    FMT_THROW(WindowsError(GetLastError(), ERROR_MSG));
-  buffer_.resize(length + 1);
-  length = MultiByteToWideChar(
-    CP_UTF8, MB_ERR_INVALID_CHARS, s.data(), s_size, &buffer_[0], length);
-  if (length == 0)
-    FMT_THROW(WindowsError(GetLastError(), ERROR_MSG));
-  buffer_[length] = 0;
-}
-
-FMT_FUNC internal::UTF16ToUTF8::UTF16ToUTF8(WStringRef s) {
-  if (int error_code = convert(s)) {
-    FMT_THROW(WindowsError(error_code,
-        "cannot convert string from UTF-16 to UTF-8"));
-  }
-}
-
-FMT_FUNC int internal::UTF16ToUTF8::convert(WStringRef s) {
-  if (s.size() > INT_MAX)
-    return ERROR_INVALID_PARAMETER;
-  int s_size = static_cast<int>(s.size());
-  int length = WideCharToMultiByte(
-    CP_UTF8, 0, s.data(), s_size, FMT_NULL, 0, FMT_NULL, FMT_NULL);
-  if (length == 0)
-    return GetLastError();
-  buffer_.resize(length + 1);
-  length = WideCharToMultiByte(
-    CP_UTF8, 0, s.data(), s_size, &buffer_[0], length, FMT_NULL, FMT_NULL);
-  if (length == 0)
-    return GetLastError();
-  buffer_[length] = 0;
-  return 0;
-}
-
-FMT_FUNC void WindowsError::init(
-    int err_code, CStringRef format_str, ArgList args) {
-  error_code_ = err_code;
-  MemoryWriter w;
-  internal::format_windows_error(w, err_code, format(format_str, args));
-  std::runtime_error &base = *this;
-  base = std::runtime_error(w.str());
-}
-
-FMT_FUNC void internal::format_windows_error(
-    Writer &out, int error_code, StringRef message) FMT_NOEXCEPT {
-  FMT_TRY {
-    MemoryBuffer<wchar_t, INLINE_BUFFER_SIZE> buffer;
-    buffer.resize(INLINE_BUFFER_SIZE);
-    for (;;) {
-      wchar_t *system_message = &buffer[0];
-      int result = FormatMessageW(
-        FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-        FMT_NULL, error_code, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
-        system_message, static_cast<uint32_t>(buffer.size()), FMT_NULL);
-      if (result != 0) {
-        UTF16ToUTF8 utf8_message;
-        if (utf8_message.convert(system_message) == ERROR_SUCCESS) {
-          out << message << ": " << utf8_message;
-          return;
-        }
-        break;
-      }
-      if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
-        break;  // Can't get error message, report error code instead.
-      buffer.resize(buffer.size() * 2);
-    }
-  } FMT_CATCH(...) {}
-  fmt::format_error_code(out, error_code, message);  // 'fmt::' is for bcc32.
-}
-
-#endif  // FMT_USE_WINDOWS_H
-
-FMT_FUNC void format_system_error(
-    Writer &out, int error_code, StringRef message) FMT_NOEXCEPT {
-  FMT_TRY {
-    internal::MemoryBuffer<char, internal::INLINE_BUFFER_SIZE> buffer;
-    buffer.resize(internal::INLINE_BUFFER_SIZE);
-    for (;;) {
-      char *system_message = &buffer[0];
-      int result = safe_strerror(error_code, system_message, buffer.size());
-      if (result == 0) {
-        out << message << ": " << system_message;
-        return;
-      }
-      if (result != ERANGE)
-        break;  // Can't get error message, report error code instead.
-      buffer.resize(buffer.size() * 2);
-    }
-  } FMT_CATCH(...) {}
-  fmt::format_error_code(out, error_code, message);  // 'fmt::' is for bcc32.
-}
-
-template <typename Char>
-void internal::FixedBuffer<Char>::grow(std::size_t) {
-  FMT_THROW(std::runtime_error("buffer overflow"));
-}
-
-FMT_FUNC internal::Arg internal::FormatterBase::do_get_arg(
-    unsigned arg_index, const char *&error) {
-  internal::Arg arg = args_[arg_index];
-  switch (arg.type) {
-  case internal::Arg::NONE:
-    error = "argument index out of range";
-    break;
-  case internal::Arg::NAMED_ARG:
-    arg = *static_cast<const internal::Arg*>(arg.pointer);
-    break;
-  default:
-    /*nothing*/;
-  }
-  return arg;
-}
-
-FMT_FUNC void report_system_error(
-    int error_code, fmt::StringRef message) FMT_NOEXCEPT {
-  // 'fmt::' is for bcc32.
-  report_error(format_system_error, error_code, message);
-}
-
-#if FMT_USE_WINDOWS_H
-FMT_FUNC void report_windows_error(
-    int error_code, fmt::StringRef message) FMT_NOEXCEPT {
-  // 'fmt::' is for bcc32.
-  report_error(internal::format_windows_error, error_code, message);
-}
-#endif
-
-FMT_FUNC void print(std::FILE *f, CStringRef format_str, ArgList args) {
-  MemoryWriter w;
-  w.write(format_str, args);
-  std::fwrite(w.data(), 1, w.size(), f);
-}
-
-FMT_FUNC void print(CStringRef format_str, ArgList args) {
-  print(stdout, format_str, args);
-}
-
-FMT_FUNC void print_colored(Color c, CStringRef format, ArgList args) {
-  char escape[] = "\x1b[30m";
-  escape[3] = static_cast<char>('0' + c);
-  std::fputs(escape, stdout);
-  print(format, args);
-  std::fputs(RESET_COLOR, stdout);
-}
-
-#ifndef FMT_HEADER_ONLY
-
-template struct internal::BasicData<void>;
-
-// Explicit instantiations for char.
-
-template void internal::FixedBuffer<char>::grow(std::size_t);
-
-template FMT_API int internal::CharTraits<char>::format_float(
-    char *buffer, std::size_t size, const char *format,
-    unsigned width, int precision, double value);
-
-template FMT_API int internal::CharTraits<char>::format_float(
-    char *buffer, std::size_t size, const char *format,
-    unsigned width, int precision, long double value);
-
-// Explicit instantiations for wchar_t.
-
-template void internal::FixedBuffer<wchar_t>::grow(std::size_t);
-
-template FMT_API int internal::CharTraits<wchar_t>::format_float(
-    wchar_t *buffer, std::size_t size, const wchar_t *format,
-    unsigned width, int precision, double value);
-
-template FMT_API int internal::CharTraits<wchar_t>::format_float(
-    wchar_t *buffer, std::size_t size, const wchar_t *format,
-    unsigned width, int precision, long double value);
-
-#endif  // FMT_HEADER_ONLY
-
-}  // namespace fmt
-
-#ifdef _MSC_VER
-# pragma warning(pop)
-#endif

include/spdlog/fmt/bundled/locale.h

@@ -0,0 +1,27 @@
+// Formatting library for C++ - locale support
+//
+// Copyright (c) 2012 - 2016, Victor Zverovich
+// All rights reserved.
+//
+// For the license information refer to format.h.
+
+#include "format.h"
+#include <locale>
+
+namespace fmt {
+class locale
+{
+private:
+    std::locale locale_;
+
+public:
+    explicit locale(std::locale loc = std::locale())
+        : locale_(loc)
+    {
+    }
+    std::locale get()
+    {
+        return locale_;
+    }
+};
+} // namespace fmt

include/spdlog/fmt/bundled/ostream.cc

@@ -1,35 +0,0 @@
-/*
- Formatting library for C++ - std::ostream support
-
- Copyright (c) 2012 - 2016, Victor Zverovich
- All rights reserved.
-
- For the license information refer to format.h.
- */
-
-#include "ostream.h"
-
-namespace fmt {
-
-namespace internal {
-FMT_FUNC void write(std::ostream &os, Writer &w) {
-  const char *data = w.data();
-  typedef internal::MakeUnsigned<std::streamsize>::Type UnsignedStreamSize;
-  UnsignedStreamSize size = w.size();
-  UnsignedStreamSize max_size =
-      internal::to_unsigned((std::numeric_limits<std::streamsize>::max)());
-  do {
-    UnsignedStreamSize n = size <= max_size ? size : max_size;
-    os.write(data, static_cast<std::streamsize>(n));
-    data += n;
-    size -= n;
-  } while (size != 0);
-}
-}
-
-FMT_FUNC void print(std::ostream &os, CStringRef format_str, ArgList args) {
-  MemoryWriter w;
-  w.write(format_str, args);
-  internal::write(os, w);
-}
-}  // namespace fmt

include/spdlog/fmt/bundled/ostream.h

@@ -1,11 +1,9 @@
-/*
- Formatting library for C++ - std::ostream support
-
- Copyright (c) 2012 - 2016, Victor Zverovich
- All rights reserved.
-
- For the license information refer to format.h.
- */
+// Formatting library for C++ - std::ostream support
+//
+// Copyright (c) 2012 - 2016, Victor Zverovich
+// All rights reserved.
+//
+// For the license information refer to format.h.
 
 #ifndef FMT_OSTREAM_H_
 #define FMT_OSTREAM_H_
@@ -13,21 +11,20 @@
 #include "format.h"
 #include <ostream>
 
-namespace fmt {
-
+FMT_BEGIN_NAMESPACE
 namespace internal {
 
 template<class Char>
-class FormatBuf : public std::basic_streambuf<Char>
+class formatbuf : public std::basic_streambuf<Char>
 {
 private:
     typedef typename std::basic_streambuf<Char>::int_type int_type;
     typedef typename std::basic_streambuf<Char>::traits_type traits_type;
 
-    Buffer<Char> &buffer_;
+    basic_buffer<Char> &buffer_;
 
 public:
-    FormatBuf(Buffer<Char> &buffer)
+    formatbuf(basic_buffer<Char> &buffer)
         : buffer_(buffer)
     {
     }
@@ -54,64 +51,123 @@ protected:
     }
 };
 
-Yes &convert(std::ostream &);
-
-struct DummyStream : std::ostream
+template<typename Char>
+struct test_stream : std::basic_ostream<Char>
 {
-    DummyStream(); // Suppress a bogus warning in MSVC.
-
-    // Hide all operator<< overloads from std::ostream.
-    template<typename T>
-    typename EnableIf<sizeof(T) == 0>::type operator<<(const T &);
+private:
+    struct null;
+    // Hide all operator<< from std::basic_ostream<Char>.
+    void operator<<(null);
 };
 
-No &operator<<(std::ostream &, int);
-
-template<typename T>
-struct ConvertToIntImpl<T, true>
+// Checks if T has a user-defined operator<< (e.g. not a member of
+// std::ostream).
+template<typename T, typename Char>
+class is_streamable
 {
-    // Convert to int only if T doesn't have an overloaded operator<<.
-    enum
+private:
+    template<typename U>
+    static decltype(internal::declval<test_stream<Char> &>() << internal::declval<U>(), std::true_type()) test(int);
+
+    template<typename>
+    static std::false_type test(...);
+
+    typedef decltype(test<T>(0)) result;
+
+public:
+    // std::string operator<< is not considered user-defined because we handle
+    // strings
+    // specially.
+    static const bool value = result::value && !std::is_same<T, std::string>::value;
+};
+
+// Disable conversion to int if T has an overloaded operator<< which is a free
+// function (not a member of std::ostream).
+template<typename T, typename Char>
+class convert_to_int<T, Char, true>
+{
+public:
+    static const bool value = convert_to_int<T, Char, false>::value && !is_streamable<T, Char>::value;
+};
+
+// Write the content of buf to os.
+template<typename Char>
+void write(std::basic_ostream<Char> &os, basic_buffer<Char> &buf)
+{
+    const Char *data = buf.data();
+    typedef std::make_unsigned<std::streamsize>::type UnsignedStreamSize;
+    UnsignedStreamSize size = buf.size();
+    UnsignedStreamSize max_size = internal::to_unsigned((std::numeric_limits<std::streamsize>::max)());
+    do
     {
-        value = sizeof(convert(get<DummyStream>() << get<T>())) == sizeof(No)
-    };
-};
+        UnsignedStreamSize n = size <= max_size ? size : max_size;
+        os.write(data, static_cast<std::streamsize>(n));
+        data += n;
+        size -= n;
+    } while (size != 0);
+}
 
-// Write the content of w to os.
-FMT_API void write(std::ostream &os, Writer &w);
-} // namespace internal
-
-// Formats a value.
-template<typename Char, typename ArgFormatter_, typename T>
-void format_arg(BasicFormatter<Char, ArgFormatter_> &f, const Char *&format_str, const T &value)
+template<typename Char, typename T>
+void format_value(basic_buffer<Char> &buffer, const T &value)
 {
-    internal::MemoryBuffer<Char, internal::INLINE_BUFFER_SIZE> buffer;
-
-    internal::FormatBuf<Char> format_buf(buffer);
+    internal::formatbuf<Char> format_buf(buffer);
     std::basic_ostream<Char> output(&format_buf);
     output.exceptions(std::ios_base::failbit | std::ios_base::badbit);
     output << value;
-
-    BasicStringRef<Char> str(&buffer[0], buffer.size());
-    typedef internal::MakeArg<BasicFormatter<Char>> MakeArg;
-    format_str = f.format(format_str, MakeArg(str));
+    buffer.resize(buffer.size());
 }
 
+// Disable builtin formatting of enums and use operator<< instead.
+template<typename T>
+struct format_enum<T, typename std::enable_if<std::is_enum<T>::value>::type> : std::false_type
+{
+};
+} // namespace internal
+
+// Formats an object of type T that has an overloaded ostream operator<<.
+template<typename T, typename Char>
+struct formatter<T, Char, typename std::enable_if<internal::is_streamable<T, Char>::value>::type> : formatter<basic_string_view<Char>, Char>
+{
+
+    template<typename Context>
+    auto format(const T &value, Context &ctx) -> decltype(ctx.out())
+    {
+        basic_memory_buffer<Char> buffer;
+        internal::format_value(buffer, value);
+        basic_string_view<Char> str(buffer.data(), buffer.size());
+        formatter<basic_string_view<Char>, Char>::format(str, ctx);
+        return ctx.out();
+    }
+};
+
+template<typename Char>
+inline void vprint(
+    std::basic_ostream<Char> &os, basic_string_view<Char> format_str, basic_format_args<typename buffer_context<Char>::type> args)
+{
+    basic_memory_buffer<Char> buffer;
+    vformat_to(buffer, format_str, args);
+    internal::write(os, buffer);
+}
 /**
   \rst
   Prints formatted data to the stream *os*.
 
   **Example**::
 
-    print(cerr, "Don't {}!", "panic");
+    fmt::print(cerr, "Don't {}!", "panic");
   \endrst
  */
-FMT_API void print(std::ostream &os, CStringRef format_str, ArgList args);
-FMT_VARIADIC(void, print, std::ostream &, CStringRef)
-} // namespace fmt
+template<typename... Args>
+inline void print(std::ostream &os, string_view format_str, const Args &... args)
+{
+    vprint<char>(os, format_str, make_format_args<format_context>(args...));
+}
 
-#ifdef FMT_HEADER_ONLY
-#include "ostream.cc"
-#endif
+template<typename... Args>
+inline void print(std::wostream &os, wstring_view format_str, const Args &... args)
+{
+    vprint<wchar_t>(os, format_str, make_format_args<wformat_context>(args...));
+}
+FMT_END_NAMESPACE
 
 #endif // FMT_OSTREAM_H_

include/spdlog/fmt/bundled/posix.cc

@@ -1,241 +0,0 @@
-/*
- A C++ interface to POSIX functions.
-
- Copyright (c) 2012 - 2016, Victor Zverovich
- All rights reserved.
-
- For the license information refer to format.h.
- */
-
-// Disable bogus MSVC warnings.
-#ifndef _CRT_SECURE_NO_WARNINGS
-# define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#include "posix.h"
-
-#include <limits.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#ifndef _WIN32
-# include <unistd.h>
-#else
-# ifndef WIN32_LEAN_AND_MEAN
-#  define WIN32_LEAN_AND_MEAN
-# endif
-# include <windows.h>
-# include <io.h>
-
-# define O_CREAT _O_CREAT
-# define O_TRUNC _O_TRUNC
-
-# ifndef S_IRUSR
-#  define S_IRUSR _S_IREAD
-# endif
-
-# ifndef S_IWUSR
-#  define S_IWUSR _S_IWRITE
-# endif
-
-# ifdef __MINGW32__
-#  define _SH_DENYNO 0x40
-# endif
-
-#endif  // _WIN32
-
-#ifdef fileno
-# undef fileno
-#endif
-
-namespace {
-#ifdef _WIN32
-// Return type of read and write functions.
-typedef int RWResult;
-
-// On Windows the count argument to read and write is unsigned, so convert
-// it from size_t preventing integer overflow.
-inline unsigned convert_rwcount(std::size_t count) {
-  return count <= UINT_MAX ? static_cast<unsigned>(count) : UINT_MAX;
-}
-#else
-// Return type of read and write functions.
-typedef ssize_t RWResult;
-
-inline std::size_t convert_rwcount(std::size_t count) { return count; }
-#endif
-}
-
-fmt::BufferedFile::~BufferedFile() FMT_NOEXCEPT {
-  if (file_ && FMT_SYSTEM(fclose(file_)) != 0)
-    fmt::report_system_error(errno, "cannot close file");
-}
-
-fmt::BufferedFile::BufferedFile(
-    fmt::CStringRef filename, fmt::CStringRef mode) {
-  FMT_RETRY_VAL(file_, FMT_SYSTEM(fopen(filename.c_str(), mode.c_str())), 0);
-  if (!file_)
-    FMT_THROW(SystemError(errno, "cannot open file {}", filename));
-}
-
-void fmt::BufferedFile::close() {
-  if (!file_)
-    return;
-  int result = FMT_SYSTEM(fclose(file_));
-  file_ = FMT_NULL;
-  if (result != 0)
-    FMT_THROW(SystemError(errno, "cannot close file"));
-}
-
-// A macro used to prevent expansion of fileno on broken versions of MinGW.
-#define FMT_ARGS
-
-int fmt::BufferedFile::fileno() const {
-  int fd = FMT_POSIX_CALL(fileno FMT_ARGS(file_));
-  if (fd == -1)
-    FMT_THROW(SystemError(errno, "cannot get file descriptor"));
-  return fd;
-}
-
-fmt::File::File(fmt::CStringRef path, int oflag) {
-  int mode = S_IRUSR | S_IWUSR;
-#if defined(_WIN32) && !defined(__MINGW32__)
-  fd_ = -1;
-  FMT_POSIX_CALL(sopen_s(&fd_, path.c_str(), oflag, _SH_DENYNO, mode));
-#else
-  FMT_RETRY(fd_, FMT_POSIX_CALL(open(path.c_str(), oflag, mode)));
-#endif
-  if (fd_ == -1)
-    FMT_THROW(SystemError(errno, "cannot open file {}", path));
-}
-
-fmt::File::~File() FMT_NOEXCEPT {
-  // Don't retry close in case of EINTR!
-  // See http://linux.derkeiler.com/Mailing-Lists/Kernel/2005-09/3000.html
-  if (fd_ != -1 && FMT_POSIX_CALL(close(fd_)) != 0)
-    fmt::report_system_error(errno, "cannot close file");
-}
-
-void fmt::File::close() {
-  if (fd_ == -1)
-    return;
-  // Don't retry close in case of EINTR!
-  // See http://linux.derkeiler.com/Mailing-Lists/Kernel/2005-09/3000.html
-  int result = FMT_POSIX_CALL(close(fd_));
-  fd_ = -1;
-  if (result != 0)
-    FMT_THROW(SystemError(errno, "cannot close file"));
-}
-
-fmt::LongLong fmt::File::size() const {
-#ifdef _WIN32
-  // Use GetFileSize instead of GetFileSizeEx for the case when _WIN32_WINNT
-  // is less than 0x0500 as is the case with some default MinGW builds.
-  // Both functions support large file sizes.
-  DWORD size_upper = 0;
-  HANDLE handle = reinterpret_cast<HANDLE>(_get_osfhandle(fd_));
-  DWORD size_lower = FMT_SYSTEM(GetFileSize(handle, &size_upper));
-  if (size_lower == INVALID_FILE_SIZE) {
-    DWORD error = GetLastError();
-    if (error != NO_ERROR)
-      FMT_THROW(WindowsError(GetLastError(), "cannot get file size"));
-  }
-  fmt::ULongLong long_size = size_upper;
-  return (long_size << sizeof(DWORD) * CHAR_BIT) | size_lower;
-#else
-  typedef struct stat Stat;
-  Stat file_stat = Stat();
-  if (FMT_POSIX_CALL(fstat(fd_, &file_stat)) == -1)
-    FMT_THROW(SystemError(errno, "cannot get file attributes"));
-  FMT_STATIC_ASSERT(sizeof(fmt::LongLong) >= sizeof(file_stat.st_size),
-      "return type of File::size is not large enough");
-  return file_stat.st_size;
-#endif
-}
-
-std::size_t fmt::File::read(void *buffer, std::size_t count) {
-  RWResult result = 0;
-  FMT_RETRY(result, FMT_POSIX_CALL(read(fd_, buffer, convert_rwcount(count))));
-  if (result < 0)
-    FMT_THROW(SystemError(errno, "cannot read from file"));
-  return internal::to_unsigned(result);
-}
-
-std::size_t fmt::File::write(const void *buffer, std::size_t count) {
-  RWResult result = 0;
-  FMT_RETRY(result, FMT_POSIX_CALL(write(fd_, buffer, convert_rwcount(count))));
-  if (result < 0)
-    FMT_THROW(SystemError(errno, "cannot write to file"));
-  return internal::to_unsigned(result);
-}
-
-fmt::File fmt::File::dup(int fd) {
-  // Don't retry as dup doesn't return EINTR.
-  // http://pubs.opengroup.org/onlinepubs/009695399/functions/dup.html
-  int new_fd = FMT_POSIX_CALL(dup(fd));
-  if (new_fd == -1)
-    FMT_THROW(SystemError(errno, "cannot duplicate file descriptor {}", fd));
-  return File(new_fd);
-}
-
-void fmt::File::dup2(int fd) {
-  int result = 0;
-  FMT_RETRY(result, FMT_POSIX_CALL(dup2(fd_, fd)));
-  if (result == -1) {
-    FMT_THROW(SystemError(errno,
-      "cannot duplicate file descriptor {} to {}", fd_, fd));
-  }
-}
-
-void fmt::File::dup2(int fd, ErrorCode &ec) FMT_NOEXCEPT {
-  int result = 0;
-  FMT_RETRY(result, FMT_POSIX_CALL(dup2(fd_, fd)));
-  if (result == -1)
-    ec = ErrorCode(errno);
-}
-
-void fmt::File::pipe(File &read_end, File &write_end) {
-  // Close the descriptors first to make sure that assignments don't throw
-  // and there are no leaks.
-  read_end.close();
-  write_end.close();
-  int fds[2] = {};
-#ifdef _WIN32
-  // Make the default pipe capacity same as on Linux 2.6.11+.
-  enum { DEFAULT_CAPACITY = 65536 };
-  int result = FMT_POSIX_CALL(pipe(fds, DEFAULT_CAPACITY, _O_BINARY));
-#else
-  // Don't retry as the pipe function doesn't return EINTR.
-  // http://pubs.opengroup.org/onlinepubs/009696799/functions/pipe.html
-  int result = FMT_POSIX_CALL(pipe(fds));
-#endif
-  if (result != 0)
-    FMT_THROW(SystemError(errno, "cannot create pipe"));
-  // The following assignments don't throw because read_fd and write_fd
-  // are closed.
-  read_end = File(fds[0]);
-  write_end = File(fds[1]);
-}
-
-fmt::BufferedFile fmt::File::fdopen(const char *mode) {
-  // Don't retry as fdopen doesn't return EINTR.
-  FILE *f = FMT_POSIX_CALL(fdopen(fd_, mode));
-  if (!f)
-    FMT_THROW(SystemError(errno, "cannot associate stream with file descriptor"));
-  BufferedFile file(f);
-  fd_ = -1;
-  return file;
-}
-
-long fmt::getpagesize() {
-#ifdef _WIN32
-  SYSTEM_INFO si;
-  GetSystemInfo(&si);
-  return si.dwPageSize;
-#else
-  long size = FMT_POSIX_CALL(sysconf(_SC_PAGESIZE));
-  if (size < 0)
-    FMT_THROW(SystemError(errno, "cannot get memory page size"));
-  return size;
-#endif
-}

include/spdlog/fmt/bundled/posix.h

@@ -1,11 +1,9 @@
-/*
- A C++ interface to POSIX functions.
-
- Copyright (c) 2012 - 2016, Victor Zverovich
- All rights reserved.
-
- For the license information refer to format.h.
- */
+// A C++ interface to POSIX functions.
+//
+// Copyright (c) 2012 - 2016, Victor Zverovich
+// All rights reserved.
+//
+// For the license information refer to format.h.
 
 #ifndef FMT_POSIX_H_
 #define FMT_POSIX_H_
@@ -65,16 +63,74 @@
 
 #define FMT_RETRY(result, expression) FMT_RETRY_VAL(result, expression, -1)
 
-namespace fmt {
+FMT_BEGIN_NAMESPACE
+
+/**
+  \rst
+  A reference to a null-terminated string. It can be constructed from a C
+  string or ``std::string``.
+
+  You can use one of the following typedefs for common character types:
+
+  +---------------+-----------------------------+
+  | Type          | Definition                  |
+  +===============+=============================+
+  | cstring_view  | basic_cstring_view<char>    |
+  +---------------+-----------------------------+
+  | wcstring_view | basic_cstring_view<wchar_t> |
+  +---------------+-----------------------------+
+
+  This class is most useful as a parameter type to allow passing
+  different types of strings to a function, for example::
+
+    template <typename... Args>
+    std::string format(cstring_view format_str, const Args & ... args);
+
+    format("{}", 42);
+    format(std::string("{}"), 42);
+  \endrst
+ */
+template<typename Char>
+class basic_cstring_view
+{
+private:
+    const Char *data_;
+
+public:
+    /** Constructs a string reference object from a C string. */
+    basic_cstring_view(const Char *s)
+        : data_(s)
+    {
+    }
+
+    /**
+      \rst
+      Constructs a string reference from an ``std::string`` object.
+      \endrst
+     */
+    basic_cstring_view(const std::basic_string<Char> &s)
+        : data_(s.c_str())
+    {
+    }
+
+    /** Returns the pointer to a C string. */
+    const Char *c_str() const
+    {
+        return data_;
+    }
+};
+
+typedef basic_cstring_view<char> cstring_view;
+typedef basic_cstring_view<wchar_t> wcstring_view;
 
 // An error code.
-class ErrorCode
+class error_code
 {
 private:
     int value_;
 
 public:
-    explicit ErrorCode(int value = 0) FMT_NOEXCEPT : value_(value) {}
+    explicit error_code(int value = 0) FMT_NOEXCEPT : value_(value) {}
 
     int get() const FMT_NOEXCEPT
     {
@@ -83,24 +139,24 @@ public:
 };
 
 // A buffered file.
-class BufferedFile
+class buffered_file
 {
 private:
     FILE *file_;
 
-    friend class File;
+    friend class file;
 
-    explicit BufferedFile(FILE *f)
+    explicit buffered_file(FILE *f)
         : file_(f)
     {
     }
 
 public:
-    // Constructs a BufferedFile object which doesn't represent any file.
-    BufferedFile() FMT_NOEXCEPT : file_(FMT_NULL) {}
+    // Constructs a buffered_file object which doesn't represent any file.
+    buffered_file() FMT_NOEXCEPT : file_(FMT_NULL) {}
 
     // Destroys the object closing the file it represents if any.
-    FMT_API ~BufferedFile() FMT_NOEXCEPT;
+    FMT_API ~buffered_file() FMT_DTOR_NOEXCEPT;
 
 #if !FMT_USE_RVALUE_REFERENCES
     // Emulate a move constructor and a move assignment operator if rvalue
@@ -116,16 +172,16 @@ private:
 
 public:
     // A "move constructor" for moving from a temporary.
-    BufferedFile(Proxy p) FMT_NOEXCEPT : file_(p.file) {}
+    buffered_file(Proxy p) FMT_NOEXCEPT : file_(p.file) {}
 
     // A "move constructor" for moving from an lvalue.
-    BufferedFile(BufferedFile &f) FMT_NOEXCEPT : file_(f.file_)
+    buffered_file(buffered_file &f) FMT_NOEXCEPT : file_(f.file_)
     {
         f.file_ = FMT_NULL;
     }
 
     // A "move assignment operator" for moving from a temporary.
-    BufferedFile &operator=(Proxy p)
+    buffered_file &operator=(Proxy p)
     {
         close();
         file_ = p.file;
@@ -133,7 +189,7 @@ public:
     }
 
     // A "move assignment operator" for moving from an lvalue.
-    BufferedFile &operator=(BufferedFile &other)
+    buffered_file &operator=(buffered_file &other)
     {
         close();
         file_ = other.file_;
@@ -142,7 +198,7 @@ public:
     }
 
     // Returns a proxy object for moving from a temporary:
-    //   BufferedFile file = BufferedFile(...);
+    //   buffered_file file = buffered_file(...);
     operator Proxy() FMT_NOEXCEPT
     {
         Proxy p = {file_};
@@ -152,15 +208,15 @@ public:
 
 #else
 private:
-    FMT_DISALLOW_COPY_AND_ASSIGN(BufferedFile);
+    FMT_DISALLOW_COPY_AND_ASSIGN(buffered_file);
 
 public:
-    BufferedFile(BufferedFile &&other) FMT_NOEXCEPT : file_(other.file_)
+    buffered_file(buffered_file &&other) FMT_NOEXCEPT : file_(other.file_)
     {
         other.file_ = FMT_NULL;
     }
 
-    BufferedFile &operator=(BufferedFile &&other)
+    buffered_file &operator=(buffered_file &&other)
     {
         close();
         file_ = other.file_;
@@ -170,7 +226,7 @@ public:
 #endif
 
     // Opens a file.
-    FMT_API BufferedFile(CStringRef filename, CStringRef mode);
+    FMT_API buffered_file(cstring_view filename, cstring_view mode);
 
     // Closes the file.
     FMT_API void close();
@@ -185,26 +241,31 @@ public:
     // of MinGW that define fileno as a macro.
     FMT_API int(fileno)() const;
 
-    void print(CStringRef format_str, const ArgList &args)
+    void vprint(string_view format_str, format_args args)
     {
-        fmt::print(file_, format_str, args);
+        fmt::vprint(file_, format_str, args);
+    }
+
+    template<typename... Args>
+    inline void print(string_view format_str, const Args &... args)
+    {
+        vprint(format_str, make_format_args(args...));
     }
-    FMT_VARIADIC(void, print, CStringRef)
 };
 
-// A file. Closed file is represented by a File object with descriptor -1.
+// A file. Closed file is represented by a file object with descriptor -1.
 // Methods that are not declared with FMT_NOEXCEPT may throw
-// fmt::SystemError in case of failure. Note that some errors such as
+// fmt::system_error in case of failure. Note that some errors such as
 // closing the file multiple times will cause a crash on Windows rather
 // than an exception. You can get standard behavior by overriding the
 // invalid parameter handler with _set_invalid_parameter_handler.
-class File
+class file
 {
 private:
     int fd_; // File descriptor.
 
-    // Constructs a File object with a given descriptor.
-    explicit File(int fd)
+    // Constructs a file object with a given descriptor.
+    explicit file(int fd)
         : fd_(fd)
     {
     }
@@ -218,11 +279,11 @@ public:
         RDWR = FMT_POSIX(O_RDWR)      // Open for reading and writing.
     };
 
-    // Constructs a File object which doesn't represent any file.
-    File() FMT_NOEXCEPT : fd_(-1) {}
+    // Constructs a file object which doesn't represent any file.
+    file() FMT_NOEXCEPT : fd_(-1) {}
 
-    // Opens a file and constructs a File object representing this file.
-    FMT_API File(CStringRef path, int oflag);
+    // Opens a file and constructs a file object representing this file.
+    FMT_API file(cstring_view path, int oflag);
 
 #if !FMT_USE_RVALUE_REFERENCES
     // Emulate a move constructor and a move assignment operator if rvalue
@@ -238,16 +299,16 @@ private:
 
 public:
     // A "move constructor" for moving from a temporary.
-    File(Proxy p) FMT_NOEXCEPT : fd_(p.fd) {}
+    file(Proxy p) FMT_NOEXCEPT : fd_(p.fd) {}
 
     // A "move constructor" for moving from an lvalue.
-    File(File &other) FMT_NOEXCEPT : fd_(other.fd_)
+    file(file &other) FMT_NOEXCEPT : fd_(other.fd_)
     {
         other.fd_ = -1;
     }
 
     // A "move assignment operator" for moving from a temporary.
-    File &operator=(Proxy p)
+    file &operator=(Proxy p)
     {
         close();
         fd_ = p.fd;
@@ -255,7 +316,7 @@ public:
     }
 
     // A "move assignment operator" for moving from an lvalue.
-    File &operator=(File &other)
+    file &operator=(file &other)
     {
         close();
         fd_ = other.fd_;
@@ -264,7 +325,7 @@ public:
     }
 
     // Returns a proxy object for moving from a temporary:
-    //   File file = File(...);
+    //   file f = file(...);
     operator Proxy() FMT_NOEXCEPT
     {
         Proxy p = {fd_};
@@ -274,15 +335,15 @@ public:
 
 #else
 private:
-    FMT_DISALLOW_COPY_AND_ASSIGN(File);
+    FMT_DISALLOW_COPY_AND_ASSIGN(file);
 
 public:
-    File(File &&other) FMT_NOEXCEPT : fd_(other.fd_)
+    file(file &&other) FMT_NOEXCEPT : fd_(other.fd_)
     {
         other.fd_ = -1;
     }
 
-    File &operator=(File &&other)
+    file &operator=(file &&other)
     {
         close();
         fd_ = other.fd_;
@@ -292,7 +353,7 @@ public:
 #endif
 
     // Destroys the object closing the file it represents if any.
-    FMT_API ~File() FMT_NOEXCEPT;
+    FMT_API ~file() FMT_DTOR_NOEXCEPT;
 
     // Returns the file descriptor.
     int descriptor() const FMT_NOEXCEPT
@@ -305,7 +366,7 @@ public:
 
     // Returns the file size. The size has signed type for consistency with
     // stat::st_size.
-    FMT_API LongLong size() const;
+    FMT_API long long size() const;
 
     // Attempts to read count bytes from the file into the specified buffer.
     FMT_API std::size_t read(void *buffer, std::size_t count);
@@ -315,7 +376,7 @@ public:
 
     // Duplicates a file descriptor with the dup function and returns
     // the duplicate as a file object.
-    FMT_API static File dup(int fd);
+    FMT_API static file dup(int fd);
 
     // Makes fd be the copy of this file descriptor, closing fd first if
     // necessary.
@@ -323,21 +384,21 @@ public:
 
     // Makes fd be the copy of this file descriptor, closing fd first if
     // necessary.
-    FMT_API void dup2(int fd, ErrorCode &ec) FMT_NOEXCEPT;
+    FMT_API void dup2(int fd, error_code &ec) FMT_NOEXCEPT;
 
     // Creates a pipe setting up read_end and write_end file objects for reading
     // and writing respectively.
-    FMT_API static void pipe(File &read_end, File &write_end);
+    FMT_API static void pipe(file &read_end, file &write_end);
 
-    // Creates a BufferedFile object associated with this file and detaches
-    // this File object from the file.
-    FMT_API BufferedFile fdopen(const char *mode);
+    // Creates a buffered_file object associated with this file and detaches
+    // this file object from the file.
+    FMT_API buffered_file fdopen(const char *mode);
 };
 
 // Returns the memory page size.
 long getpagesize();
 
-#if (defined(LC_NUMERIC_MASK) || defined(_MSC_VER)) && !defined(__ANDROID__) && !defined(__CYGWIN__)
+#if (defined(LC_NUMERIC_MASK) || defined(_MSC_VER)) && !defined(__ANDROID__) && !defined(__CYGWIN__) && !defined(__OpenBSD__)
 #define FMT_LOCALE
 #endif
 
@@ -381,7 +442,7 @@ public:
         : locale_(newlocale(LC_NUMERIC_MASK, "C", FMT_NULL))
     {
         if (!locale_)
-            FMT_THROW(fmt::SystemError(errno, "cannot create locale"));
+            FMT_THROW(system_error(errno, "cannot create locale"));
     }
     ~Locale()
     {
@@ -404,16 +465,16 @@ public:
     }
 };
 #endif // FMT_LOCALE
-} // namespace fmt
+FMT_END_NAMESPACE
 
 #if !FMT_USE_RVALUE_REFERENCES
 namespace std {
 // For compatibility with C++98.
-inline fmt::BufferedFile &move(fmt::BufferedFile &f)
+inline fmt::buffered_file &move(fmt::buffered_file &f)
 {
     return f;
 }
-inline fmt::File &move(fmt::File &f)
+inline fmt::file &move(fmt::file &f)
 {
     return f;
 }

include/spdlog/fmt/bundled/printf.cc

@@ -1,32 +0,0 @@
-/*
- Formatting library for C++
-
- Copyright (c) 2012 - 2016, Victor Zverovich
- All rights reserved.
-
- For the license information refer to format.h.
- */
-
-#include "format.h"
-#include "printf.h"
-
-namespace fmt {
-
-template <typename Char>
-void printf(BasicWriter<Char> &w, BasicCStringRef<Char> format, ArgList args);
-
-FMT_FUNC int fprintf(std::FILE *f, CStringRef format, ArgList args) {
-  MemoryWriter w;
-  printf(w, format, args);
-  std::size_t size = w.size();
-  return std::fwrite(w.data(), 1, size, f) < size ? -1 : static_cast<int>(size);
-}
-
-#ifndef FMT_HEADER_ONLY
-
-template void PrintfFormatter<char>::format(CStringRef format);
-template void PrintfFormatter<wchar_t>::format(WCStringRef format);
-
-#endif  // FMT_HEADER_ONLY
-
-}  // namespace fmt

include/spdlog/fmt/bundled/ranges.h

@@ -0,0 +1,344 @@
+// Formatting library for C++ - the core API
+//
+// Copyright (c) 2012 - present, Victor Zverovich
+// All rights reserved.
+//
+// For the license information refer to format.h.
+//
+// Copyright (c) 2018 - present, Remotion (Igor Schulz)
+// All Rights Reserved
+// {fmt} support for ranges, containers and types tuple interface.
+
+#ifndef FMT_RANGES_H_
+#define FMT_RANGES_H_
+
+#include "format.h"
+#include <type_traits>
+
+// output only up to N items from the range.
+#ifndef FMT_RANGE_OUTPUT_LENGTH_LIMIT
+#define FMT_RANGE_OUTPUT_LENGTH_LIMIT 256
+#endif
+
+FMT_BEGIN_NAMESPACE
+
+template<typename Char>
+struct formatting_base
+{
+    template<typename ParseContext>
+    FMT_CONSTEXPR auto parse(ParseContext &ctx) -> decltype(ctx.begin())
+    {
+        return ctx.begin();
+    }
+};
+
+template<typename Char, typename Enable = void>
+struct formatting_range : formatting_base<Char>
+{
+    static FMT_CONSTEXPR_DECL const std::size_t range_length_limit = FMT_RANGE_OUTPUT_LENGTH_LIMIT; // output only up to N items from the
+                                                                                                    // range.
+    Char prefix;
+    Char delimiter;
+    Char postfix;
+    formatting_range()
+        : prefix('{')
+        , delimiter(',')
+        , postfix('}')
+    {
+    }
+    static FMT_CONSTEXPR_DECL const bool add_delimiter_spaces = true;
+    static FMT_CONSTEXPR_DECL const bool add_prepostfix_space = false;
+};
+
+template<typename Char, typename Enable = void>
+struct formatting_tuple : formatting_base<Char>
+{
+    Char prefix;
+    Char delimiter;
+    Char postfix;
+    formatting_tuple()
+        : prefix('(')
+        , delimiter(',')
+        , postfix(')')
+    {
+    }
+    static FMT_CONSTEXPR_DECL const bool add_delimiter_spaces = true;
+    static FMT_CONSTEXPR_DECL const bool add_prepostfix_space = false;
+};
+
+namespace internal {
+
+template<typename RangeT, typename OutputIterator>
+void copy(const RangeT &range, OutputIterator out)
+{
+    for (auto it = range.begin(), end = range.end(); it != end; ++it)
+        *out++ = *it;
+}
+
+template<typename OutputIterator>
+void copy(const char *str, OutputIterator out)
+{
+    const char *p_curr = str;
+    while (*p_curr)
+    {
+        *out++ = *p_curr++;
+    }
+}
+
+template<typename OutputIterator>
+void copy(char ch, OutputIterator out)
+{
+    *out++ = ch;
+}
+
+/// Return true value if T has std::string interface, like std::string_view.
+template<typename T>
+class is_like_std_string
+{
+    template<typename U>
+    static auto check(U *p) -> decltype(p->find('a'), p->length(), p->data(), int());
+    template<typename>
+    static void check(...);
+
+public:
+    static FMT_CONSTEXPR_DECL const bool value = !std::is_void<decltype(check<T>(FMT_NULL))>::value;
+};
+
+template<typename... Ts>
+struct conditional_helper
+{
+};
+
+template<typename T, typename _ = void>
+struct is_range_ : std::false_type
+{
+};
+
+#if !FMT_MSC_VER || FMT_MSC_VER > 1800
+template<typename T>
+struct is_range_<T, typename std::conditional<false,
+                        conditional_helper<decltype(internal::declval<T>().begin()), decltype(internal::declval<T>().end())>, void>::type>
+    : std::true_type
+{
+};
+#endif
+
+/// tuple_size and tuple_element check.
+template<typename T>
+class is_tuple_like_
+{
+    template<typename U>
+    static auto check(U *p) -> decltype(std::tuple_size<U>::value, internal::declval<typename std::tuple_element<0, U>::type>(), int());
+    template<typename>
+    static void check(...);
+
+public:
+    static FMT_CONSTEXPR_DECL const bool value = !std::is_void<decltype(check<T>(FMT_NULL))>::value;
+};
+
+// Check for integer_sequence
+#if defined(__cpp_lib_integer_sequence) || FMT_MSC_VER >= 1900
+template<typename T, T... N>
+using integer_sequence = std::integer_sequence<T, N...>;
+template<std::size_t... N>
+using index_sequence = std::index_sequence<N...>;
+template<std::size_t N>
+using make_index_sequence = std::make_index_sequence<N>;
+#else
+template<typename T, T... N>
+struct integer_sequence
+{
+    typedef T value_type;
+
+    static FMT_CONSTEXPR std::size_t size()
+    {
+        return sizeof...(N);
+    }
+};
+
+template<std::size_t... N>
+using index_sequence = integer_sequence<std::size_t, N...>;
+
+template<typename T, std::size_t N, T... Ns>
+struct make_integer_sequence : make_integer_sequence<T, N - 1, N - 1, Ns...>
+{
+};
+template<typename T, T... Ns>
+struct make_integer_sequence<T, 0, Ns...> : integer_sequence<T, Ns...>
+{
+};
+
+template<std::size_t N>
+using make_index_sequence = make_integer_sequence<std::size_t, N>;
+#endif
+
+template<class Tuple, class F, size_t... Is>
+void for_each(index_sequence<Is...>, Tuple &&tup, F &&f) FMT_NOEXCEPT
+{
+    using std::get;
+    // using free function get<I>(T) now.
+    const int _[] = {0, ((void)f(get<Is>(tup)), 0)...};
+    (void)_; // blocks warnings
+}
+
+template<class T>
+FMT_CONSTEXPR make_index_sequence<std::tuple_size<T>::value> get_indexes(T const &)
+{
+    return {};
+}
+
+template<class Tuple, class F>
+void for_each(Tuple &&tup, F &&f)
+{
+    const auto indexes = get_indexes(tup);
+    for_each(indexes, std::forward<Tuple>(tup), std::forward<F>(f));
+}
+
+template<typename Arg>
+FMT_CONSTEXPR const char *format_str_quoted(
+    bool add_space, const Arg &, typename std::enable_if<!is_like_std_string<typename std::decay<Arg>::type>::value>::type * = nullptr)
+{
+    return add_space ? " {}" : "{}";
+}
+
+template<typename Arg>
+FMT_CONSTEXPR const char *format_str_quoted(
+    bool add_space, const Arg &, typename std::enable_if<is_like_std_string<typename std::decay<Arg>::type>::value>::type * = nullptr)
+{
+    return add_space ? " \"{}\"" : "\"{}\"";
+}
+
+FMT_CONSTEXPR const char *format_str_quoted(bool add_space, const char *)
+{
+    return add_space ? " \"{}\"" : "\"{}\"";
+}
+FMT_CONSTEXPR const wchar_t *format_str_quoted(bool add_space, const wchar_t *)
+{
+    return add_space ? L" \"{}\"" : L"\"{}\"";
+}
+
+FMT_CONSTEXPR const char *format_str_quoted(bool add_space, const char)
+{
+    return add_space ? " '{}'" : "'{}'";
+}
+FMT_CONSTEXPR const wchar_t *format_str_quoted(bool add_space, const wchar_t)
+{
+    return add_space ? L" '{}'" : L"'{}'";
+}
+
+} // namespace internal
+
+template<typename T>
+struct is_tuple_like
+{
+    static FMT_CONSTEXPR_DECL const bool value = internal::is_tuple_like_<T>::value && !internal::is_range_<T>::value;
+};
+
+template<typename TupleT, typename Char>
+struct formatter<TupleT, Char, typename std::enable_if<fmt::is_tuple_like<TupleT>::value>::type>
+{
+private:
+    // C++11 generic lambda for format()
+    template<typename FormatContext>
+    struct format_each
+    {
+        template<typename T>
+        void operator()(const T &v)
+        {
+            if (i > 0)
+            {
+                if (formatting.add_prepostfix_space)
+                {
+                    *out++ = ' ';
+                }
+                internal::copy(formatting.delimiter, out);
+            }
+            format_to(out, internal::format_str_quoted((formatting.add_delimiter_spaces && i > 0), v), v);
+            ++i;
+        }
+
+        formatting_tuple<Char> &formatting;
+        std::size_t &i;
+        typename std::add_lvalue_reference<decltype(std::declval<FormatContext>().out())>::type out;
+    };
+
+public:
+    formatting_tuple<Char> formatting;
+
+    template<typename ParseContext>
+    FMT_CONSTEXPR auto parse(ParseContext &ctx) -> decltype(ctx.begin())
+    {
+        return formatting.parse(ctx);
+    }
+
+    template<typename FormatContext = format_context>
+    auto format(const TupleT &values, FormatContext &ctx) -> decltype(ctx.out())
+    {
+        auto out = ctx.out();
+        std::size_t i = 0;
+        internal::copy(formatting.prefix, out);
+
+        internal::for_each(values, format_each<FormatContext>{formatting, i, out});
+        if (formatting.add_prepostfix_space)
+        {
+            *out++ = ' ';
+        }
+        internal::copy(formatting.postfix, out);
+
+        return ctx.out();
+    }
+};
+
+template<typename T>
+struct is_range
+{
+    static FMT_CONSTEXPR_DECL const bool value = internal::is_range_<T>::value && !internal::is_like_std_string<T>::value;
+};
+
+template<typename RangeT, typename Char>
+struct formatter<RangeT, Char, typename std::enable_if<fmt::is_range<RangeT>::value>::type>
+{
+
+    formatting_range<Char> formatting;
+
+    template<typename ParseContext>
+    FMT_CONSTEXPR auto parse(ParseContext &ctx) -> decltype(ctx.begin())
+    {
+        return formatting.parse(ctx);
+    }
+
+    template<typename FormatContext>
+    typename FormatContext::iterator format(const RangeT &values, FormatContext &ctx)
+    {
+        auto out = ctx.out();
+        internal::copy(formatting.prefix, out);
+        std::size_t i = 0;
+        for (auto it = values.begin(), end = values.end(); it != end; ++it)
+        {
+            if (i > 0)
+            {
+                if (formatting.add_prepostfix_space)
+                {
+                    *out++ = ' ';
+                }
+                internal::copy(formatting.delimiter, out);
+            }
+            format_to(out, internal::format_str_quoted((formatting.add_delimiter_spaces && i > 0), *it), *it);
+            if (++i > formatting.range_length_limit)
+            {
+                format_to(out, " ... <other elements>");
+                break;
+            }
+        }
+        if (formatting.add_prepostfix_space)
+        {
+            *out++ = ' ';
+        }
+        internal::copy(formatting.postfix, out);
+        return ctx.out();
+    }
+};
+
+FMT_END_NAMESPACE
+
+#endif // FMT_RANGES_H_

include/spdlog/fmt/bundled/time.h

@@ -1,11 +1,9 @@
-/*
- Formatting library for C++ - time formatting
-
- Copyright (c) 2012 - 2016, Victor Zverovich
- All rights reserved.
-
- For the license information refer to format.h.
- */
+// Formatting library for C++ - time formatting
+//
+// Copyright (c) 2012 - 2016, Victor Zverovich
+// All rights reserved.
+//
+// For the license information refer to format.h.
 
 #ifndef FMT_TIME_H_
 #define FMT_TIME_H_
@@ -13,79 +11,36 @@
 #include "format.h"
 #include <ctime>
 
-#ifdef _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 4702) // unreachable code
-#pragma warning(disable : 4996) // "deprecated" functions
-#endif
-
-namespace fmt {
-template<typename ArgFormatter>
-void format_arg(BasicFormatter<char, ArgFormatter> &f, const char *&format_str, const std::tm &tm)
-{
-    if (*format_str == ':')
-        ++format_str;
-    const char *end = format_str;
-    while (*end && *end != '}')
-        ++end;
-    if (*end != '}')
-        FMT_THROW(FormatError("missing '}' in format string"));
-    internal::MemoryBuffer<char, internal::INLINE_BUFFER_SIZE> format;
-    format.append(format_str, end + 1);
-    format[format.size() - 1] = '\0';
-    Buffer<char> &buffer = f.writer().buffer();
-    std::size_t start = buffer.size();
-    for (;;)
-    {
-        std::size_t size = buffer.capacity() - start;
-        std::size_t count = std::strftime(&buffer[start], size, &format[0], &tm);
-        if (count != 0)
-        {
-            buffer.resize(start + count);
-            break;
-        }
-        if (size >= format.size() * 256)
-        {
-            // If the buffer is 256 times larger than the format string, assume
-            // that `strftime` gives an empty result. There doesn't seem to be a
-            // better way to distinguish the two cases:
-            // https://github.com/fmtlib/fmt/issues/367
-            break;
-        }
-        const std::size_t MIN_GROWTH = 10;
-        buffer.reserve(buffer.capacity() + (size > MIN_GROWTH ? size : MIN_GROWTH));
-    }
-    format_str = end + 1;
-}
+FMT_BEGIN_NAMESPACE
 
 namespace internal {
-inline Null<> localtime_r(...)
+inline null<> localtime_r(...)
 {
-    return Null<>();
+    return null<>();
 }
-inline Null<> localtime_s(...)
+inline null<> localtime_s(...)
 {
-    return Null<>();
+    return null<>();
 }
-inline Null<> gmtime_r(...)
+inline null<> gmtime_r(...)
 {
-    return Null<>();
+    return null<>();
 }
-inline Null<> gmtime_s(...)
+inline null<> gmtime_s(...)
 {
-    return Null<>();
+    return null<>();
 }
 } // namespace internal
 
 // Thread-safe replacement for std::localtime
 inline std::tm localtime(std::time_t time)
 {
-    struct LocalTime
+    struct dispatcher
     {
         std::time_t time_;
         std::tm tm_;
 
-        LocalTime(std::time_t t)
+        dispatcher(std::time_t t)
             : time_(t)
         {
         }
@@ -101,7 +56,7 @@ inline std::tm localtime(std::time_t time)
             return tm != FMT_NULL;
         }
 
-        bool handle(internal::Null<>)
+        bool handle(internal::null<>)
         {
             using namespace fmt::internal;
             return fallback(localtime_s(&tm_, &time_));
@@ -112,7 +67,7 @@ inline std::tm localtime(std::time_t time)
             return res == 0;
         }
 
-        bool fallback(internal::Null<>)
+        bool fallback(internal::null<>)
         {
             using namespace fmt::internal;
             std::tm *tm = std::localtime(&time_);
@@ -121,23 +76,22 @@ inline std::tm localtime(std::time_t time)
             return tm != FMT_NULL;
         }
     };
-    LocalTime lt(time);
+    dispatcher lt(time);
     if (lt.run())
         return lt.tm_;
     // Too big time values may be unsupported.
-    FMT_THROW(fmt::FormatError("time_t value out of range"));
-    return std::tm();
+    FMT_THROW(format_error("time_t value out of range"));
 }
 
 // Thread-safe replacement for std::gmtime
 inline std::tm gmtime(std::time_t time)
 {
-    struct GMTime
+    struct dispatcher
     {
         std::time_t time_;
         std::tm tm_;
 
-        GMTime(std::time_t t)
+        dispatcher(std::time_t t)
             : time_(t)
         {
         }
@@ -153,7 +107,7 @@ inline std::tm gmtime(std::time_t time)
             return tm != FMT_NULL;
         }
 
-        bool handle(internal::Null<>)
+        bool handle(internal::null<>)
         {
             using namespace fmt::internal;
             return fallback(gmtime_s(&tm_, &time_));
@@ -164,25 +118,82 @@ inline std::tm gmtime(std::time_t time)
             return res == 0;
         }
 
-        bool fallback(internal::Null<>)
+        bool fallback(internal::null<>)
         {
             std::tm *tm = std::gmtime(&time_);
-            if (tm != FMT_NULL)
+            if (tm)
                 tm_ = *tm;
             return tm != FMT_NULL;
         }
     };
-    GMTime gt(time);
+    dispatcher gt(time);
     if (gt.run())
         return gt.tm_;
     // Too big time values may be unsupported.
-    FMT_THROW(fmt::FormatError("time_t value out of range"));
-    return std::tm();
+    FMT_THROW(format_error("time_t value out of range"));
 }
-} // namespace fmt
 
-#ifdef _MSC_VER
-#pragma warning(pop)
-#endif
+namespace internal {
+inline std::size_t strftime(char *str, std::size_t count, const char *format, const std::tm *time)
+{
+    return std::strftime(str, count, format, time);
+}
+
+inline std::size_t strftime(wchar_t *str, std::size_t count, const wchar_t *format, const std::tm *time)
+{
+    return std::wcsftime(str, count, format, time);
+}
+} // namespace internal
+
+template<typename Char>
+struct formatter<std::tm, Char>
+{
+    template<typename ParseContext>
+    auto parse(ParseContext &ctx) -> decltype(ctx.begin())
+    {
+        auto it = internal::null_terminating_iterator<Char>(ctx);
+        if (*it == ':')
+            ++it;
+        auto end = it;
+        while (*end && *end != '}')
+            ++end;
+        tm_format.reserve(end - it + 1);
+        using internal::pointer_from;
+        tm_format.append(pointer_from(it), pointer_from(end));
+        tm_format.push_back('\0');
+        return pointer_from(end);
+    }
+
+    template<typename FormatContext>
+    auto format(const std::tm &tm, FormatContext &ctx) -> decltype(ctx.out())
+    {
+        internal::basic_buffer<Char> &buf = internal::get_container(ctx.out());
+        std::size_t start = buf.size();
+        for (;;)
+        {
+            std::size_t size = buf.capacity() - start;
+            std::size_t count = internal::strftime(&buf[start], size, &tm_format[0], &tm);
+            if (count != 0)
+            {
+                buf.resize(start + count);
+                break;
+            }
+            if (size >= tm_format.size() * 256)
+            {
+                // If the buffer is 256 times larger than the format string, assume
+                // that `strftime` gives an empty result. There doesn't seem to be a
+                // better way to distinguish the two cases:
+                // https://github.com/fmtlib/fmt/issues/367
+                break;
+            }
+            const std::size_t MIN_GROWTH = 10;
+            buf.reserve(buf.capacity() + (size > MIN_GROWTH ? size : MIN_GROWTH));
+        }
+        return ctx.out();
+    }
+
+    basic_memory_buffer<Char> tm_format;
+};
+FMT_END_NAMESPACE
 
 #endif // FMT_TIME_H_

include/spdlog/fmt/fmt.h

@@ -1,5 +1,5 @@
 //
-// Copyright(c) 2016 Gabi Melman.
+// Copyright(c) 2016-2018 Gabi Melman.
 // Distributed under the MIT License (http://opensource.org/licenses/MIT)
 //
 
@@ -11,23 +11,15 @@
 //
 
 #if !defined(SPDLOG_FMT_EXTERNAL)
-
 #ifndef FMT_HEADER_ONLY
 #define FMT_HEADER_ONLY
 #endif
 #ifndef FMT_USE_WINDOWS_H
 #define FMT_USE_WINDOWS_H 0
 #endif
+#include "bundled/core.h"
 #include "bundled/format.h"
-#if defined(SPDLOG_FMT_PRINTF)
-#include "bundled/printf.h"
-#endif
-
 #else // external fmtlib
-
+#include <fmt/core.h>
 #include <fmt/format.h>
-#if defined(SPDLOG_FMT_PRINTF)
-#include <fmt/printf.h>
-#endif
-
 #endif

include/spdlog/formatter.h

@@ -5,42 +5,16 @@
 
 #pragma once
 
-#include "details/log_msg.h"
-
-#include <memory>
-#include <string>
-#include <vector>
+#include "fmt/fmt.h"
+#include "spdlog/details/log_msg.h"
 
 namespace spdlog {
-namespace details {
-class flag_formatter;
-}
 
 class formatter
 {
 public:
     virtual ~formatter() = default;
-    virtual void format(details::log_msg &msg) = 0;
-};
-
-class pattern_formatter SPDLOG_FINAL : public formatter
-{
-public:
-    explicit pattern_formatter(const std::string &pattern, pattern_time_type pattern_time = pattern_time_type::local,
-        std::string eol = spdlog::details::os::default_eol);
-    pattern_formatter(const pattern_formatter &) = delete;
-    pattern_formatter &operator=(const pattern_formatter &) = delete;
-    void format(details::log_msg &msg) override;
-
-private:
-    const std::string _eol;
-    const std::string _pattern;
-    const pattern_time_type _pattern_time;
-    std::vector<std::unique_ptr<details::flag_formatter>> _formatters;
-    std::tm get_time(details::log_msg &msg);
-    void handle_flag(char flag);
-    void compile_pattern(const std::string &pattern);
+    virtual void format(const details::log_msg &msg, fmt::memory_buffer &dest) = 0;
+    virtual std::unique_ptr<formatter> clone() const = 0;
 };
 } // namespace spdlog
-
-#include "details/pattern_formatter_impl.h"

include/spdlog/logger.h

@@ -1,19 +1,26 @@
 //
-// Copyright(c) 2015 Gabi Melman.
+// Copyright(c) 2015-2108 Gabi Melman.
 // Distributed under the MIT License (http://opensource.org/licenses/MIT)
 //
 
 #pragma once
 
-// Thread safe logger (except for set_pattern(..), set_formatter(..) and set_error_handler())
+// Thread safe logger (except for set_pattern(..), set_formatter(..) and
+// set_error_handler())
 // Has name, log level, vector of std::shared sink pointers and formatter
 // Upon each log write the logger:
-// 1. Checks if its log level is enough to log the message
-// 2. Format the message using the formatter function
-// 3. Pass the formatted message to its sinks to performa the actual logging
+// 1. Checks if its log level is enough to log the message and if yes:
+// 2. Call the underlying sinks to do the job.
+// 3. Each sink use its own private copy of a formatter to format the message
+// and send to its destination.
+//
+// The use of private formatter per sink provides the opportunity to cache some
+// formatted data,
+// and support customize format per each sink.
 
-#include "common.h"
-#include "sinks/base_sink.h"
+#include "spdlog/common.h"
+#include "spdlog/formatter.h"
+#include "spdlog/sinks/sink.h"
 
 #include <memory>
 #include <string>
@@ -24,10 +31,10 @@ namespace spdlog {
 class logger
 {
 public:
-    logger(const std::string &name, sink_ptr single_sink);
-    logger(const std::string &name, sinks_init_list sinks);
+    logger(std::string name, sink_ptr single_sink);
+    logger(std::string name, sinks_init_list sinks);
 
-    template<class It>
+    template<typename It>
     logger(std::string name, const It &begin, const It &end);
 
     virtual ~logger();
@@ -41,28 +48,25 @@ public:
     template<typename... Args>
     void log(level::level_enum lvl, const char *msg);
 
-    template<typename Arg1, typename... Args>
-    void trace(const char *fmt, const Arg1 &, const Args &... args);
+    template<typename... Args>
+    void trace(const char *fmt, const Args &... args);
 
-    template<typename Arg1, typename... Args>
-    void debug(const char *fmt, const Arg1 &, const Args &... args);
+    template<typename... Args>
+    void debug(const char *fmt, const Args &... args);
 
-    template<typename Arg1, typename... Args>
-    void info(const char *fmt, const Arg1 &, const Args &... args);
+    template<typename... Args>
+    void info(const char *fmt, const Args &... args);
 
-    template<typename Arg1, typename... Args>
-    void warn(const char *fmt, const Arg1 &, const Args &... args);
+    template<typename... Args>
+    void warn(const char *fmt, const Args &... args);
 
-    template<typename Arg1, typename... Args>
-    void error(const char *fmt, const Arg1 &, const Args &... args);
+    template<typename... Args>
+    void error(const char *fmt, const Args &... args);
 
-    template<typename Arg1, typename... Args>
-    void critical(const char *fmt, const Arg1 &, const Args &... args);
+    template<typename... Args>
+    void critical(const char *fmt, const Args &... args);
 
 #ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT
-    template<typename... Args>
-    void log(level::level_enum lvl, const wchar_t *msg);
-
     template<typename... Args>
     void log(level::level_enum lvl, const wchar_t *fmt, const Args &... args);
 
@@ -110,42 +114,48 @@ public:
     void set_level(level::level_enum log_level);
     level::level_enum level() const;
     const std::string &name() const;
-    void set_pattern(const std::string &pattern, pattern_time_type pattern_time = pattern_time_type::local);
-    void set_formatter(formatter_ptr msg_formatter);
 
-    // automatically call flush() if message level >= log_level
+    // set formatting for the sinks in this logger.
+    // each sink will get a seperate instance of the formatter object.
+    void set_formatter(std::unique_ptr<formatter> formatter);
+    void set_pattern(std::string pattern, pattern_time_type time_type = pattern_time_type::local);
+
+    void flush();
     void flush_on(level::level_enum log_level);
 
-    virtual void flush();
-
     const std::vector<sink_ptr> &sinks() const;
 
-    // error handler
-    virtual void set_error_handler(log_err_handler err_handler);
-    virtual log_err_handler error_handler();
+    std::vector<sink_ptr> &sinks();
+
+    void set_error_handler(log_err_handler err_handler);
+    log_err_handler error_handler();
 
 protected:
-    virtual void _sink_it(details::log_msg &msg);
-    virtual void _set_pattern(const std::string &pattern, pattern_time_type pattern_time);
-    virtual void _set_formatter(formatter_ptr msg_formatter);
+    virtual void sink_it_(details::log_msg &msg);
+    virtual void flush_();
 
-    // default error handler: print the error to stderr with the max rate of 1 message/minute
-    virtual void _default_err_handler(const std::string &msg);
+    bool should_flush_(const details::log_msg &msg);
 
-    // return true if the given message level should trigger a flush
-    bool _should_flush_on(const details::log_msg &msg);
+    // default error handler: print the error to stderr with the max rate of 1
+    // message/minute
+    void default_err_handler_(const std::string &msg);
 
-    // increment the message count (only if defined(SPDLOG_ENABLE_MESSAGE_COUNTER))
-    void _incr_msg_counter(details::log_msg &msg);
+    // increment the message count (only if
+    // defined(SPDLOG_ENABLE_MESSAGE_COUNTER))
+    void incr_msg_counter_(details::log_msg &msg);
 
-    const std::string _name;
-    std::vector<sink_ptr> _sinks;
-    formatter_ptr _formatter;
-    spdlog::level_t _level;
-    spdlog::level_t _flush_level;
-    log_err_handler _err_handler;
-    std::atomic<time_t> _last_err_time;
-    std::atomic<size_t> _msg_counter;
+    const std::string name_;
+    std::vector<sink_ptr> sinks_;
+    spdlog::level_t level_;
+    spdlog::level_t flush_level_;
+    log_err_handler err_handler_;
+    std::atomic<time_t> last_err_time_;
+    std::atomic<size_t> msg_counter_;
+
+#ifdef SPDLOG_WCHAR_TO_UTF8_SUPPORT
+    std::wstring_convert<std::codecvt_utf8<wchar_t>> wstring_converter_;
+    std::mutex wstring_converter_mutex_;
+#endif
 };
 } // namespace spdlog
 

include/spdlog/sinks/android_sink.h

@@ -5,10 +5,10 @@
 
 #pragma once
 
-#if defined(__ANDROID__)
-
-#include "../details/os.h"
-#include "sink.h"
+#include "spdlog/details/fmt_helper.h"
+#include "spdlog/details/null_mutex.h"
+#include "spdlog/details/os.h"
+#include "spdlog/sinks/base_sink.h"
 
 #include <android/log.h>
 #include <chrono>
@@ -25,29 +25,40 @@ namespace sinks {
 
 /*
  * Android sink (logging using __android_log_write)
- * __android_log_write is thread-safe. No lock is needed.
  */
-class android_sink : public sink
+template<typename Mutex>
+class android_sink SPDLOG_FINAL : public base_sink<Mutex>
 {
 public:
     explicit android_sink(const std::string &tag = "spdlog", bool use_raw_msg = false)
-        : _tag(tag)
-        , _use_raw_msg(use_raw_msg)
+        : tag_(tag)
+        , use_raw_msg_(use_raw_msg)
     {
     }
 
-    void log(const details::log_msg &msg) override
+protected:
+    void sink_it_(const details::log_msg &msg) override
     {
-        const android_LogPriority priority = convert_to_android(msg.level);
-        const char *msg_output = (_use_raw_msg ? msg.raw.c_str() : msg.formatted.c_str());
+        const android_LogPriority priority = convert_to_android_(msg.level);
+        fmt::memory_buffer formatted;
+        if (use_raw_msg_)
+        {
+            fmt_helper::append_buf(msg.raw, formatted);
+        }
+        else
+        {
+            formatter_->format(msg, formatted);
+        }
+        formatted.push_back('\0');
+        const char *msg_output = formatted.data();
 
         // See system/core/liblog/logger_write.c for explanation of return value
-        int ret = __android_log_write(priority, _tag.c_str(), msg_output);
+        int ret = __android_log_write(priority, tag_.c_str(), msg_output);
         int retry_count = 0;
         while ((ret == -11 /*EAGAIN*/) && (retry_count < SPDLOG_ANDROID_RETRIES))
         {
             details::os::sleep_for_millis(5);
-            ret = __android_log_write(priority, _tag.c_str(), msg_output);
+            ret = __android_log_write(priority, tag_.c_str(), msg_output);
             retry_count++;
         }
 
@@ -57,10 +68,10 @@ public:
         }
     }
 
-    void flush() override {}
+    void flush_() override {}
 
 private:
-    static android_LogPriority convert_to_android(spdlog::level::level_enum level)
+    static android_LogPriority convert_to_android_(spdlog::level::level_enum level)
     {
         switch (level)
         {
@@ -81,11 +92,26 @@ private:
         }
     }
 
-    std::string _tag;
-    bool _use_raw_msg;
+    std::string tag_;
+    bool use_raw_msg_;
 };
 
+using android_sink_mt = android_sink<std::mutex>;
+using android_sink_st = android_sink<details::null_mutex>;
 } // namespace sinks
-} // namespace spdlog
 
-#endif
+// Create and register android syslog logger
+
+template<typename Factory = default_factory>
+inline std::shared_ptr<logger> android_logger_mt(const std::string &logger_name, const std::string &tag = "spdlog")
+{
+    return Factory::template create<sinks::android_sink_mt>(logger_name, tag);
+}
+
+template<typename Factory = default_factory>
+inline std::shared_ptr<logger> android_logger_st(const std::string &logger_name, const std::string &tag = "spdlog")
+{
+    return Factory::template create<sinks::android_sink_st>(logger_name, tag);
+}
+
+} // namespace spdlog

include/spdlog/sinks/ansicolor_sink.h

@@ -5,10 +5,12 @@
 
 #pragma once
 
-#include "../common.h"
-#include "../details/os.h"
-#include "base_sink.h"
+#include "spdlog/details/console_globals.h"
+#include "spdlog/details/null_mutex.h"
+#include "spdlog/details/os.h"
 
+#include <memory>
+#include <mutex>
 #include <string>
 #include <unordered_map>
 
@@ -16,18 +18,22 @@ namespace spdlog {
 namespace sinks {
 
 /**
- * This sink prefixes the output with an ANSI escape sequence color code depending on the severity
+ * This sink prefixes the output with an ANSI escape sequence color code
+ * depending on the severity
  * of the message.
  * If no color terminal detected, omit the escape codes.
  */
-template<class Mutex>
-class ansicolor_sink : public base_sink<Mutex>
+template<typename TargetStream, class ConsoleMutex>
+class ansicolor_sink : public sink
 {
 public:
-    explicit ansicolor_sink(FILE *file)
-        : target_file_(file)
+    using mutex_t = typename ConsoleMutex::mutex_t;
+    ansicolor_sink()
+        : target_file_(TargetStream::stream())
+        , mutex_(ConsoleMutex::mutex())
+
     {
-        should_do_colors_ = details::os::in_terminal(file) && details::os::is_color_terminal();
+        should_do_colors_ = details::os::in_terminal(target_file_) && details::os::is_color_terminal();
         colors_[level::trace] = white;
         colors_[level::debug] = cyan;
         colors_[level::info] = green;
@@ -37,14 +43,14 @@ public:
         colors_[level::off] = reset;
     }
 
-    ~ansicolor_sink() override
-    {
-        _flush();
-    }
+    ~ansicolor_sink() override = default;
+
+    ansicolor_sink(const ansicolor_sink &other) = delete;
+    ansicolor_sink &operator=(const ansicolor_sink &other) = delete;
 
     void set_color(level::level_enum color_level, const std::string &color)
     {
-        std::lock_guard<Mutex> lock(base_sink<Mutex>::_mutex);
+        std::lock_guard<mutex_t> lock(mutex_);
         colors_[color_level] = color;
     }
 
@@ -78,73 +84,73 @@ public:
     const std::string on_cyan = "\033[46m";
     const std::string on_white = "\033[47m";
 
-protected:
-    void _sink_it(const details::log_msg &msg) override
+    void log(const details::log_msg &msg) SPDLOG_FINAL override
     {
         // Wrap the originally formatted message in color codes.
         // If color is not supported in the terminal, log as is instead.
+        std::lock_guard<mutex_t> lock(mutex_);
+
+        fmt::memory_buffer formatted;
+        formatter_->format(msg, formatted);
         if (should_do_colors_ && msg.color_range_end > msg.color_range_start)
         {
             // before color range
-            _print_range(msg, 0, msg.color_range_start);
+            print_range_(formatted, 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);
+            print_ccode_(colors_[msg.level]);
+            print_range_(formatted, msg.color_range_start, msg.color_range_end);
+            print_ccode_(reset);
             // after color range
-            _print_range(msg, msg.color_range_end, msg.formatted.size());
+            print_range_(formatted, msg.color_range_end, formatted.size());
         }
-        else
+        else // no color
         {
-            _print_range(msg, 0, msg.formatted.size());
+            print_range_(formatted, 0, formatted.size());
         }
-        _flush();
-    }
-
-    void _flush() override
-    {
         fflush(target_file_);
     }
 
+    void flush() SPDLOG_FINAL override
+    {
+        std::lock_guard<mutex_t> lock(mutex_);
+        fflush(target_file_);
+    }
+
+    void set_pattern(const std::string &pattern) override SPDLOG_FINAL
+    {
+        std::lock_guard<mutex_t> lock(mutex_);
+        formatter_ = std::unique_ptr<spdlog::formatter>(new pattern_formatter(pattern));
+    }
+
+    void set_formatter(std::unique_ptr<spdlog::formatter> sink_formatter) override SPDLOG_FINAL
+    {
+        std::lock_guard<mutex_t> lock(mutex_);
+        formatter_ = std::move(sink_formatter);
+    }
+
 private:
-    void _print_ccode(const std::string &color_code)
+    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)
+    void print_range_(const fmt::memory_buffer &formatted, size_t start, size_t end)
     {
-        fwrite(msg.formatted.data() + start, sizeof(char), end - start, target_file_);
+        fwrite(formatted.data() + start, sizeof(char), end - start, target_file_);
     }
+
     FILE *target_file_;
+    mutex_t &mutex_;
+
     bool should_do_colors_;
     std::unordered_map<level::level_enum, std::string, level::level_hasher> colors_;
 };
 
-template<class Mutex>
-class ansicolor_stdout_sink : public ansicolor_sink<Mutex>
-{
-public:
-    ansicolor_stdout_sink()
-        : ansicolor_sink<Mutex>(stdout)
-    {
-    }
-};
+using ansicolor_stdout_sink_mt = ansicolor_sink<details::console_stdout, details::console_mutex>;
+using ansicolor_stdout_sink_st = ansicolor_sink<details::console_stdout, details::console_nullmutex>;
 
-using ansicolor_stdout_sink_mt = ansicolor_stdout_sink<std::mutex>;
-using ansicolor_stdout_sink_st = ansicolor_stdout_sink<details::null_mutex>;
-
-template<class Mutex>
-class ansicolor_stderr_sink : public ansicolor_sink<Mutex>
-{
-public:
-    ansicolor_stderr_sink()
-        : ansicolor_sink<Mutex>(stderr)
-    {
-    }
-};
-
-using ansicolor_stderr_sink_mt = ansicolor_stderr_sink<std::mutex>;
-using ansicolor_stderr_sink_st = ansicolor_stderr_sink<details::null_mutex>;
+using ansicolor_stderr_sink_mt = ansicolor_sink<details::console_stderr, details::console_mutex>;
+using ansicolor_stderr_sink_st = ansicolor_sink<details::console_stderr, details::console_nullmutex>;
 
 } // namespace sinks
+
 } // namespace spdlog

include/spdlog/sinks/base_sink.h

@@ -6,44 +6,58 @@
 #pragma once
 //
 // base sink templated over a mutex (either dummy or real)
-// concrete implementation should only override the _sink_it method.
-// all locking is taken care of here so no locking needed by the implementers..
+// concrete implementation should override the sink_it_() and flush_()  methods.
+// locking is taken care of in this class - no locking needed by the
+// implementers..
 //
 
-#include "../common.h"
-#include "../details/log_msg.h"
-#include "../formatter.h"
-#include "sink.h"
-
-#include <mutex>
+#include "spdlog/common.h"
+#include "spdlog/details/log_msg.h"
+#include "spdlog/formatter.h"
+#include "spdlog/sinks/sink.h"
 
 namespace spdlog {
 namespace sinks {
-template<class Mutex>
+template<typename Mutex>
 class base_sink : public sink
 {
 public:
-    base_sink() = default;
+    base_sink()
+        : sink()
+    {
+    }
 
     base_sink(const base_sink &) = delete;
     base_sink &operator=(const base_sink &) = delete;
 
     void log(const details::log_msg &msg) SPDLOG_FINAL override
     {
-        std::lock_guard<Mutex> lock(_mutex);
-        _sink_it(msg);
+        std::lock_guard<Mutex> lock(mutex_);
+        sink_it_(msg);
     }
 
     void flush() SPDLOG_FINAL override
     {
-        std::lock_guard<Mutex> lock(_mutex);
-        _flush();
+        std::lock_guard<Mutex> lock(mutex_);
+        flush_();
+    }
+
+    void set_pattern(const std::string &pattern) SPDLOG_FINAL override
+    {
+        std::lock_guard<Mutex> lock(mutex_);
+        formatter_ = std::unique_ptr<spdlog::formatter>(new pattern_formatter(pattern));
+    }
+
+    void set_formatter(std::unique_ptr<spdlog::formatter> sink_formatter) SPDLOG_FINAL override
+    {
+        std::lock_guard<Mutex> lock(mutex_);
+        formatter_ = std::move(sink_formatter);
     }
 
 protected:
-    virtual void _sink_it(const details::log_msg &msg) = 0;
-    virtual void _flush() = 0;
-    Mutex _mutex;
+    virtual void sink_it_(const details::log_msg &msg) = 0;
+    virtual void flush_() = 0;
+    Mutex mutex_;
 };
 } // namespace sinks
 } // namespace spdlog

include/spdlog/sinks/basic_file_sink.h

@@ -0,0 +1,66 @@
+//
+// Copyright(c) 2015-2018 Gabi Melman.
+// Distributed under the MIT License (http://opensource.org/licenses/MIT)
+//
+
+#pragma once
+#include "spdlog/details/file_helper.h"
+#include "spdlog/details/null_mutex.h"
+#include "spdlog/sinks/base_sink.h"
+#include "spdlog/spdlog.h"
+
+#include <mutex>
+#include <string>
+
+namespace spdlog {
+namespace sinks {
+/*
+ * Trivial file sink with single file as target
+ */
+template<typename Mutex>
+class basic_file_sink SPDLOG_FINAL : public base_sink<Mutex>
+{
+public:
+    explicit basic_file_sink(const filename_t &filename, bool truncate = false)
+    {
+        file_helper_.open(filename, truncate);
+    }
+
+protected:
+    void sink_it_(const details::log_msg &msg) override
+    {
+        fmt::memory_buffer formatted;
+        sink::formatter_->format(msg, formatted);
+        file_helper_.write(formatted);
+    }
+
+    void flush_() override
+    {
+        file_helper_.flush();
+    }
+
+private:
+    details::file_helper file_helper_;
+};
+
+using basic_file_sink_mt = basic_file_sink<std::mutex>;
+using basic_file_sink_st = basic_file_sink<details::null_mutex>;
+
+} // namespace sinks
+
+//
+// factory functions
+//
+template<typename Factory = default_factory>
+inline std::shared_ptr<logger> basic_logger_mt(const std::string &logger_name, const filename_t &filename, bool truncate = false)
+{
+    return Factory::template create<sinks::basic_file_sink_mt>(logger_name, filename, truncate);
+}
+
+template<typename Factory = default_factory>
+inline std::shared_ptr<logger> basic_logger_st(const std::string &logger_name, const filename_t &filename, bool truncate = false)
+{
+    return Factory::template create<sinks::basic_file_sink_st>(logger_name, filename, truncate);
+}
+
+} // namespace spdlog

include/spdlog/sinks/daily_file_sink.h

@@ -0,0 +1,132 @@
+//
+// Copyright(c) 2015 Gabi Melman.
+// Distributed under the MIT License (http://opensource.org/licenses/MIT)
+//
+
+#pragma once
+#include "spdlog/details/file_helper.h"
+#include "spdlog/details/null_mutex.h"
+#include "spdlog/fmt/fmt.h"
+#include "spdlog/sinks/base_sink.h"
+#include "spdlog/spdlog.h"
+
+#include <chrono>
+#include <cstdio>
+#include <ctime>
+#include <mutex>
+#include <string>
+
+namespace spdlog {
+namespace sinks {
+
+/*
+ * Generator of daily log file names in format basename.YYYY-MM-DD.ext
+ */
+struct daily_filename_calculator
+{
+    // Create filename for the form basename.YYYY-MM-DD
+    static filename_t calc_filename(const filename_t &filename, const tm &now_tm)
+    {
+        filename_t basename, ext;
+        std::tie(basename, ext) = details::file_helper::split_by_extenstion(filename);
+        std::conditional<std::is_same<filename_t::value_type, char>::value, fmt::memory_buffer, fmt::wmemory_buffer>::type w;
+        fmt::format_to(
+            w, SPDLOG_FILENAME_T("{}_{:04d}-{:02d}-{:02d}{}"), basename, now_tm.tm_year + 1900, now_tm.tm_mon + 1, now_tm.tm_mday, ext);
+        return fmt::to_string(w);
+    }
+};
+
+/*
+ * Rotating file sink based on date. rotates at midnight
+ */
+template<typename Mutex, typename FileNameCalc = daily_filename_calculator>
+class daily_file_sink SPDLOG_FINAL : public base_sink<Mutex>
+{
+public:
+    // create daily file sink which rotates on given time
+    daily_file_sink(filename_t base_filename, int rotation_hour, int rotation_minute, bool truncate = false)
+        : base_filename_(std::move(base_filename))
+        , rotation_h_(rotation_hour)
+        , rotation_m_(rotation_minute)
+        , truncate_(truncate)
+    {
+        if (rotation_hour < 0 || rotation_hour > 23 || rotation_minute < 0 || rotation_minute > 59)
+        {
+            throw spdlog_ex("daily_file_sink: Invalid rotation time in ctor");
+        }
+        auto now = log_clock::now();
+        file_helper_.open(FileNameCalc::calc_filename(base_filename_, now_tm(now)), truncate_);
+        rotation_tp_ = next_rotation_tp_();
+    }
+
+protected:
+    void sink_it_(const details::log_msg &msg) override
+    {
+
+        if (msg.time >= rotation_tp_)
+        {
+            file_helper_.open(FileNameCalc::calc_filename(base_filename_, now_tm(msg.time)), truncate_);
+            rotation_tp_ = next_rotation_tp_();
+        }
+        fmt::memory_buffer formatted;
+        sink::formatter_->format(msg, formatted);
+        file_helper_.write(formatted);
+    }
+
+    void flush_() override
+    {
+        file_helper_.flush();
+    }
+
+private:
+    tm now_tm(log_clock::time_point tp)
+    {
+        time_t tnow = log_clock::to_time_t(tp);
+        return spdlog::details::os::localtime(tnow);
+    }
+
+    log_clock::time_point next_rotation_tp_()
+    {
+        auto now = log_clock::now();
+        tm date = now_tm(now);
+        date.tm_hour = rotation_h_;
+        date.tm_min = rotation_m_;
+        date.tm_sec = 0;
+        auto rotation_time = log_clock::from_time_t(std::mktime(&date));
+        if (rotation_time > now)
+        {
+            return rotation_time;
+        }
+        return {rotation_time + std::chrono::hours(24)};
+    }
+
+    filename_t base_filename_;
+    int rotation_h_;
+    int rotation_m_;
+    log_clock::time_point rotation_tp_;
+    details::file_helper file_helper_;
+    bool truncate_;
+};
+
+using daily_file_sink_mt = daily_file_sink<std::mutex>;
+using daily_file_sink_st = daily_file_sink<details::null_mutex>;
+
+} // namespace sinks
+
+//
+// factory functions
+//
+template<typename Factory = default_factory>
+inline std::shared_ptr<logger> daily_logger_mt(
+    const std::string &logger_name, const filename_t &filename, int hour = 0, int minute = 0, bool truncate = false)
+{
+    return Factory::template create<sinks::daily_file_sink_mt>(logger_name, filename, hour, minute, truncate);
+}
+
+template<typename Factory = default_factory>
+inline std::shared_ptr<logger> daily_logger_st(
+    const std::string &logger_name, const filename_t &filename, int hour = 0, int minute = 0, bool truncate = false)
+{
+    return Factory::template create<sinks::daily_file_sink_st>(logger_name, filename, hour, minute, truncate);
+}
+} // namespace spdlog

include/spdlog/sinks/dist_sink.h

@@ -5,37 +5,46 @@
 
 #pragma once
 
-#include "../details/log_msg.h"
-#include "../details/null_mutex.h"
 #include "base_sink.h"
-#include "sink.h"
+#include "spdlog/details/log_msg.h"
+#include "spdlog/details/null_mutex.h"
 
 #include <algorithm>
 #include <memory>
 #include <mutex>
 #include <vector>
 
-// Distribution sink (mux). Stores a vector of sinks which get called when log is called
+// Distribution sink (mux). Stores a vector of sinks which get called when log
+// is called
 
 namespace spdlog {
 namespace sinks {
-template<class Mutex>
+
+template<typename Mutex>
 class dist_sink : public base_sink<Mutex>
 {
 public:
-    explicit dist_sink()
-        : _sinks()
-    {
-    }
+    dist_sink() = default;
     dist_sink(const dist_sink &) = delete;
     dist_sink &operator=(const dist_sink &) = delete;
 
-protected:
-    std::vector<std::shared_ptr<sink>> _sinks;
-
-    void _sink_it(const details::log_msg &msg) override
+    void add_sink(std::shared_ptr<sink> sink)
     {
-        for (auto &sink : _sinks)
+        std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
+        sinks_.push_back(sink);
+    }
+
+    void remove_sink(std::shared_ptr<sink> sink)
+    {
+        std::lock_guard<Mutex> lock(base_sink<Mutex>::mutex_);
+        sinks_.erase(std::remove(sinks_.begin(), sinks_.end(), sink), sinks_.end());
+    }
+
+protected:
+    void sink_it_(const details::log_msg &msg) override
+    {
+
+        for (auto &sink : sinks_)
         {
             if (sink->should_log(msg.level))
             {
@@ -44,24 +53,12 @@ protected:
         }
     }
 
-    void _flush() override
+    void flush_() override
     {
-        for (auto &sink : _sinks)
+        for (auto &sink : sinks_)
             sink->flush();
     }
-
-public:
-    void add_sink(std::shared_ptr<sink> sink)
-    {
-        std::lock_guard<Mutex> lock(base_sink<Mutex>::_mutex);
-        _sinks.push_back(sink);
-    }
-
-    void remove_sink(std::shared_ptr<sink> sink)
-    {
-        std::lock_guard<Mutex> lock(base_sink<Mutex>::_mutex);
-        _sinks.erase(std::remove(_sinks.begin(), _sinks.end(), sink), _sinks.end());
-    }
+    std::vector<std::shared_ptr<sink>> sinks_;
 };
 
 using dist_sink_mt = dist_sink<std::mutex>;

include/spdlog/sinks/file_sinks.h

@@ -1,255 +0,0 @@
-//
-// Copyright(c) 2015 Gabi Melman.
-// Distributed under the MIT License (http://opensource.org/licenses/MIT)
-//
-
-#pragma once
-
-#include "../details/file_helper.h"
-#include "../details/null_mutex.h"
-#include "../fmt/fmt.h"
-#include "base_sink.h"
-
-#include <algorithm>
-#include <cerrno>
-#include <chrono>
-#include <cstdio>
-#include <ctime>
-#include <mutex>
-#include <string>
-
-namespace spdlog {
-namespace sinks {
-/*
- * Trivial file sink with single file as target
- */
-template<class Mutex>
-class simple_file_sink SPDLOG_FINAL : public base_sink<Mutex>
-{
-public:
-    explicit simple_file_sink(const filename_t &filename, bool truncate = false)
-        : _force_flush(false)
-    {
-        _file_helper.open(filename, truncate);
-    }
-
-    void set_force_flush(bool force_flush)
-    {
-        _force_flush = force_flush;
-    }
-
-protected:
-    void _sink_it(const details::log_msg &msg) override
-    {
-        _file_helper.write(msg);
-        if (_force_flush)
-        {
-            _file_helper.flush();
-        }
-    }
-
-    void _flush() override
-    {
-        _file_helper.flush();
-    }
-
-private:
-    details::file_helper _file_helper;
-    bool _force_flush;
-};
-
-using simple_file_sink_mt = simple_file_sink<std::mutex>;
-using simple_file_sink_st = simple_file_sink<details::null_mutex>;
-
-/*
- * Rotating file sink based on size
- */
-template<class Mutex>
-class rotating_file_sink SPDLOG_FINAL : public base_sink<Mutex>
-{
-public:
-    rotating_file_sink(filename_t base_filename, std::size_t max_size, std::size_t max_files)
-        : _base_filename(std::move(base_filename))
-        , _max_size(max_size)
-        , _max_files(max_files)
-    {
-        _file_helper.open(calc_filename(_base_filename, 0));
-        _current_size = _file_helper.size(); // expensive. called only once
-    }
-
-    // calc filename according to index and file extension if exists.
-    // e.g. calc_filename("logs/mylog.txt, 3) => "logs/mylog.3.txt".
-    static filename_t calc_filename(const filename_t &filename, std::size_t index)
-    {
-        typename std::conditional<std::is_same<filename_t::value_type, char>::value, fmt::MemoryWriter, fmt::WMemoryWriter>::type w;
-        if (index != 0u)
-        {
-            filename_t basename, ext;
-            std::tie(basename, ext) = details::file_helper::split_by_extenstion(filename);
-            w.write(SPDLOG_FILENAME_T("{}.{}{}"), basename, index, ext);
-        }
-        else
-        {
-            w.write(SPDLOG_FILENAME_T("{}"), filename);
-        }
-        return w.str();
-    }
-
-protected:
-    void _sink_it(const details::log_msg &msg) override
-    {
-        _current_size += msg.formatted.size();
-        if (_current_size > _max_size)
-        {
-            _rotate();
-            _current_size = msg.formatted.size();
-        }
-        _file_helper.write(msg);
-    }
-
-    void _flush() override
-    {
-        _file_helper.flush();
-    }
-
-private:
-    // Rotate files:
-    // log.txt -> log.1.txt
-    // log.1.txt -> log.2.txt
-    // log.2.txt -> log.3.txt
-    // log.3.txt -> delete
-    void _rotate()
-    {
-        using details::os::filename_to_str;
-        _file_helper.close();
-        for (auto i = _max_files; i > 0; --i)
-        {
-            filename_t src = calc_filename(_base_filename, i - 1);
-            filename_t target = calc_filename(_base_filename, i);
-
-            if (details::file_helper::file_exists(target))
-            {
-                if (details::os::remove(target) != 0)
-                {
-                    throw spdlog_ex("rotating_file_sink: failed removing " + filename_to_str(target), errno);
-                }
-            }
-            if (details::file_helper::file_exists(src) && details::os::rename(src, target) != 0)
-            {
-                throw spdlog_ex("rotating_file_sink: failed renaming " + filename_to_str(src) + " to " + filename_to_str(target), errno);
-            }
-        }
-        _file_helper.reopen(true);
-    }
-
-    filename_t _base_filename;
-    std::size_t _max_size;
-    std::size_t _max_files;
-    std::size_t _current_size;
-    details::file_helper _file_helper;
-};
-
-using rotating_file_sink_mt = rotating_file_sink<std::mutex>;
-using rotating_file_sink_st = rotating_file_sink<details::null_mutex>;
-
-/*
- * Default generator of daily log file names.
- */
-struct default_daily_file_name_calculator
-{
-    // Create filename for the form filename.YYYY-MM-DD_hh-mm.ext
-    static filename_t calc_filename(const filename_t &filename)
-    {
-        std::tm tm = spdlog::details::os::localtime();
-        filename_t basename, ext;
-        std::tie(basename, ext) = details::file_helper::split_by_extenstion(filename);
-        std::conditional<std::is_same<filename_t::value_type, char>::value, fmt::MemoryWriter, fmt::WMemoryWriter>::type w;
-        w.write(SPDLOG_FILENAME_T("{}_{:04d}-{:02d}-{:02d}_{:02d}-{:02d}{}"), basename, tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
-            tm.tm_hour, tm.tm_min, ext);
-        return w.str();
-    }
-};
-
-/*
- * Generator of daily log file names in format basename.YYYY-MM-DD.ext
- */
-struct dateonly_daily_file_name_calculator
-{
-    // Create filename for the form basename.YYYY-MM-DD
-    static filename_t calc_filename(const filename_t &filename)
-    {
-        std::tm tm = spdlog::details::os::localtime();
-        filename_t basename, ext;
-        std::tie(basename, ext) = details::file_helper::split_by_extenstion(filename);
-        std::conditional<std::is_same<filename_t::value_type, char>::value, fmt::MemoryWriter, fmt::WMemoryWriter>::type w;
-        w.write(SPDLOG_FILENAME_T("{}_{:04d}-{:02d}-{:02d}{}"), basename, tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, ext);
-        return w.str();
-    }
-};
-
-/*
- * Rotating file sink based on date. rotates at midnight
- */
-template<class Mutex, class FileNameCalc = default_daily_file_name_calculator>
-class daily_file_sink SPDLOG_FINAL : public base_sink<Mutex>
-{
-public:
-    // create daily file sink which rotates on given time
-    daily_file_sink(filename_t base_filename, int rotation_hour, int rotation_minute)
-        : _base_filename(std::move(base_filename))
-        , _rotation_h(rotation_hour)
-        , _rotation_m(rotation_minute)
-    {
-        if (rotation_hour < 0 || rotation_hour > 23 || rotation_minute < 0 || rotation_minute > 59)
-        {
-            throw spdlog_ex("daily_file_sink: Invalid rotation time in ctor");
-        }
-        _rotation_tp = _next_rotation_tp();
-        _file_helper.open(FileNameCalc::calc_filename(_base_filename));
-    }
-
-protected:
-    void _sink_it(const details::log_msg &msg) override
-    {
-        if (std::chrono::system_clock::now() >= _rotation_tp)
-        {
-            _file_helper.open(FileNameCalc::calc_filename(_base_filename));
-            _rotation_tp = _next_rotation_tp();
-        }
-        _file_helper.write(msg);
-    }
-
-    void _flush() override
-    {
-        _file_helper.flush();
-    }
-
-private:
-    std::chrono::system_clock::time_point _next_rotation_tp()
-    {
-        auto now = std::chrono::system_clock::now();
-        time_t tnow = std::chrono::system_clock::to_time_t(now);
-        tm date = spdlog::details::os::localtime(tnow);
-        date.tm_hour = _rotation_h;
-        date.tm_min = _rotation_m;
-        date.tm_sec = 0;
-        auto rotation_time = std::chrono::system_clock::from_time_t(std::mktime(&date));
-        if (rotation_time > now)
-        {
-            return rotation_time;
-        }
-        return {rotation_time + std::chrono::hours(24)};
-    }
-
-    filename_t _base_filename;
-    int _rotation_h;
-    int _rotation_m;
-    std::chrono::system_clock::time_point _rotation_tp;
-    details::file_helper _file_helper;
-};
-
-using daily_file_sink_mt = daily_file_sink<std::mutex>;
-using daily_file_sink_st = daily_file_sink<details::null_mutex>;
-
-} // namespace sinks
-} // namespace spdlog

include/spdlog/sinks/msvc_sink.h

@@ -7,8 +7,8 @@
 
 #if defined(_WIN32)
 
-#include "../details/null_mutex.h"
-#include "base_sink.h"
+#include "spdlog/details/null_mutex.h"
+#include "spdlog/sinks/base_sink.h"
 
 #include <winbase.h>
 
@@ -20,24 +20,30 @@ namespace sinks {
 /*
  * MSVC sink (logging using OutputDebugStringA)
  */
-template<class Mutex>
+template<typename Mutex>
 class msvc_sink : public base_sink<Mutex>
 {
 public:
     explicit msvc_sink() {}
 
 protected:
-    void _sink_it(const details::log_msg &msg) override
+    void sink_it_(const details::log_msg &msg) override
     {
-        OutputDebugStringA(msg.formatted.c_str());
+
+        fmt::memory_buffer formatted;
+        sink::formatter_->format(msg, formatted);
+        OutputDebugStringA(fmt::to_string(formatted).c_str());
     }
 
-    void _flush() override {}
+    void flush_() override {}
 };
 
 using msvc_sink_mt = msvc_sink<std::mutex>;
 using msvc_sink_st = msvc_sink<details::null_mutex>;
 
+using windebug_sink_mt = msvc_sink_mt;
+using windebug_sink_st = msvc_sink_st;
+
 } // namespace sinks
 } // namespace spdlog
 

include/spdlog/sinks/null_sink.h

@@ -5,24 +5,23 @@
 
 #pragma once
 
-#include "../details/null_mutex.h"
-#include "base_sink.h"
+#include "spdlog/details/null_mutex.h"
+#include "spdlog/sinks/base_sink.h"
 
 #include <mutex>
 
 namespace spdlog {
 namespace sinks {
 
-template<class Mutex>
+template<typename Mutex>
 class null_sink : public base_sink<Mutex>
 {
 protected:
-    void _sink_it(const details::log_msg &) override {}
-
-    void _flush() override {}
+    void sink_it_(const details::log_msg &) override {}
+    void flush_() override {}
 };
 
-using null_sink_mt = null_sink<details::null_mutex>;
+using null_sink_mt = null_sink<std::mutex>;
 using null_sink_st = null_sink<details::null_mutex>;
 
 } // namespace sinks

include/spdlog/sinks/ostream_sink.h

@@ -5,41 +5,43 @@
 
 #pragma once
 
-#include "../details/null_mutex.h"
-#include "base_sink.h"
+#include "spdlog/details/null_mutex.h"
+#include "spdlog/sinks/base_sink.h"
 
 #include <mutex>
 #include <ostream>
 
 namespace spdlog {
 namespace sinks {
-template<class Mutex>
-class ostream_sink : public base_sink<Mutex>
+template<typename Mutex>
+class ostream_sink SPDLOG_FINAL : public base_sink<Mutex>
 {
 public:
     explicit ostream_sink(std::ostream &os, bool force_flush = false)
-        : _ostream(os)
-        , _force_flush(force_flush)
+        : ostream_(os)
+        , force_flush_(force_flush)
     {
     }
     ostream_sink(const ostream_sink &) = delete;
     ostream_sink &operator=(const ostream_sink &) = delete;
 
 protected:
-    void _sink_it(const details::log_msg &msg) override
+    void sink_it_(const details::log_msg &msg) override
     {
-        _ostream.write(msg.formatted.data(), msg.formatted.size());
-        if (_force_flush)
-            _ostream.flush();
+        fmt::memory_buffer formatted;
+        sink::formatter_->format(msg, formatted);
+        ostream_.write(formatted.data(), formatted.size());
+        if (force_flush_)
+            ostream_.flush();
     }
 
-    void _flush() override
+    void flush_() override
     {
-        _ostream.flush();
+        ostream_.flush();
     }
 
-    std::ostream &_ostream;
-    bool _force_flush;
+    std::ostream &ostream_;
+    bool force_flush_;
 };
 
 using ostream_sink_mt = ostream_sink<std::mutex>;

include/spdlog/sinks/rotating_file_sink.h

@@ -0,0 +1,144 @@
+//
+// Copyright(c) 2015 Gabi Melman.
+// Distributed under the MIT License (http://opensource.org/licenses/MIT)
+//
+
+#pragma once
+#include "spdlog/details/file_helper.h"
+#include "spdlog/details/null_mutex.h"
+#include "spdlog/fmt/fmt.h"
+#include "spdlog/sinks/base_sink.h"
+#include "spdlog/spdlog.h"
+
+#include <cerrno>
+#include <chrono>
+#include <ctime>
+#include <mutex>
+#include <string>
+#include <tuple>
+
+namespace spdlog {
+namespace sinks {
+
+//
+// Rotating file sink based on size
+//
+template<typename Mutex>
+class rotating_file_sink SPDLOG_FINAL : public base_sink<Mutex>
+{
+public:
+    rotating_file_sink(filename_t base_filename, std::size_t max_size, std::size_t max_files)
+        : base_filename_(std::move(base_filename))
+        , max_size_(max_size)
+        , max_files_(max_files)
+    {
+        file_helper_.open(calc_filename(base_filename_, 0));
+        current_size_ = file_helper_.size(); // expensive. called only once
+    }
+
+    // calc filename according to index and file extension if exists.
+    // e.g. calc_filename("logs/mylog.txt, 3) => "logs/mylog.3.txt".
+    static filename_t calc_filename(const filename_t &filename, std::size_t index)
+    {
+        typename std::conditional<std::is_same<filename_t::value_type, char>::value, fmt::memory_buffer, fmt::wmemory_buffer>::type w;
+        if (index != 0u)
+        {
+            filename_t basename, ext;
+            std::tie(basename, ext) = details::file_helper::split_by_extenstion(filename);
+            fmt::format_to(w, SPDLOG_FILENAME_T("{}.{}{}"), basename, index, ext);
+        }
+        else
+        {
+            fmt::format_to(w, SPDLOG_FILENAME_T("{}"), filename);
+        }
+        return fmt::to_string(w);
+    }
+
+protected:
+    void sink_it_(const details::log_msg &msg) override
+    {
+        fmt::memory_buffer formatted;
+        sink::formatter_->format(msg, formatted);
+        current_size_ += formatted.size();
+        if (current_size_ > max_size_)
+        {
+            rotate_();
+            current_size_ = formatted.size();
+        }
+        file_helper_.write(formatted);
+    }
+
+    void flush_() override
+    {
+        file_helper_.flush();
+    }
+
+private:
+    // Rotate files:
+    // log.txt -> log.1.txt
+    // log.1.txt -> log.2.txt
+    // log.2.txt -> log.3.txt
+    // log.3.txt -> delete
+    void rotate_()
+    {
+        using details::os::filename_to_str;
+        file_helper_.close();
+        for (auto i = max_files_; i > 0; --i)
+        {
+            filename_t src = calc_filename(base_filename_, i - 1);
+            filename_t target = calc_filename(base_filename_, i);
+
+            if (details::file_helper::file_exists(target))
+            {
+                if (details::os::remove(target) != 0)
+                {
+                    throw spdlog_ex("rotating_file_sink: failed removing " + filename_to_str(target), errno);
+                }
+            }
+            if (details::file_helper::file_exists(src) && details::os::rename(src, target) != 0)
+            {
+                // if failed try again after small delay.
+                // this is a workaround to a windows issue, where very high rotation
+                // rates sometimes fail (because of antivirus?).
+                details::os::sleep_for_millis(20);
+                details::os::remove(target);
+                if (details::os::rename(src, target) != 0)
+                {
+                    throw spdlog_ex(
+                        "rotating_file_sink: failed renaming " + filename_to_str(src) + " to " + filename_to_str(target), errno);
+                }
+            }
+        }
+        file_helper_.reopen(true);
+    }
+
+    filename_t base_filename_;
+    std::size_t max_size_;
+    std::size_t max_files_;
+    std::size_t current_size_;
+    details::file_helper file_helper_;
+};
+
+using rotating_file_sink_mt = rotating_file_sink<std::mutex>;
+using rotating_file_sink_st = rotating_file_sink<details::null_mutex>;
+
+} // namespace sinks
+
+//
+// factory functions
+//
+
+template<typename Factory = default_factory>
+inline std::shared_ptr<logger> rotating_logger_mt(
+    const std::string &logger_name, const filename_t &filename, size_t max_file_size, size_t max_files)
+{
+    return Factory::template create<sinks::rotating_file_sink_mt>(logger_name, filename, max_file_size, max_files);
+}
+
+template<typename Factory = default_factory>
+inline std::shared_ptr<logger> rotating_logger_st(
+    const std::string &logger_name, const filename_t &filename, size_t max_file_size, size_t max_files)
+{
+    return Factory::template create<sinks::rotating_file_sink_st>(logger_name, filename, max_file_size, max_files);
+}
+} // namespace spdlog

include/spdlog/sinks/sink.h

@@ -5,40 +5,53 @@
 
 #pragma once
 
-#include "../details/log_msg.h"
+#include "spdlog/details/log_msg.h"
+#include "spdlog/details/pattern_formatter.h"
+#include "spdlog/formatter.h"
 
 namespace spdlog {
 namespace sinks {
 class sink
 {
 public:
-    virtual ~sink() = default;
+    sink()
+        : level_(level::trace)
+        , formatter_(new pattern_formatter("%+"))
+    {
+    }
 
+    sink(std::unique_ptr<spdlog::pattern_formatter> formatter)
+        : level_(level::trace)
+        , formatter_(std::move(formatter)){};
+
+    virtual ~sink() = default;
     virtual void log(const details::log_msg &msg) = 0;
     virtual void flush() = 0;
+    virtual void set_pattern(const std::string &pattern) = 0;
+    virtual void set_formatter(std::unique_ptr<spdlog::formatter> sink_formatter) = 0;
 
-    bool should_log(level::level_enum msg_level) const;
-    void set_level(level::level_enum log_level);
-    level::level_enum level() const;
+    bool should_log(level::level_enum msg_level) const
+    {
+        return msg_level >= level_.load(std::memory_order_relaxed);
+    }
 
-private:
-    level_t _level{level::trace};
+    void set_level(level::level_enum log_level)
+    {
+        level_.store(log_level);
+    }
+
+    level::level_enum level() const
+    {
+        return static_cast<spdlog::level::level_enum>(level_.load(std::memory_order_relaxed));
+    }
+
+protected:
+    // sink log level - default is all
+    level_t level_;
+
+    // sink formatter - default is full format
+    std::unique_ptr<spdlog::formatter> formatter_;
 };
 
-inline bool sink::should_log(level::level_enum msg_level) const
-{
-    return msg_level >= _level.load(std::memory_order_relaxed);
-}
-
-inline void sink::set_level(level::level_enum log_level)
-{
-    _level.store(log_level);
-}
-
-inline level::level_enum sink::level() const
-{
-    return static_cast<spdlog::level::level_enum>(_level.load(std::memory_order_relaxed));
-}
-
 } // namespace sinks
 } // namespace spdlog

include/spdlog/sinks/stdout_color_sinks.h

@@ -0,0 +1,53 @@
+//
+// Copyright(c) 2018 spdlog
+// Distributed under the MIT License (http://opensource.org/licenses/MIT)
+//
+
+#pragma once
+
+#include "spdlog/spdlog.h"
+#ifdef _WIN32
+#include "spdlog/sinks/wincolor_sink.h"
+#else
+#include "spdlog/sinks/ansicolor_sink.h"
+#endif
+
+namespace spdlog {
+namespace sinks {
+#ifdef _WIN32
+using stdout_color_sink_mt = wincolor_stdout_sink_mt;
+using stdout_color_sink_st = wincolor_stdout_sink_st;
+using stderr_color_sink_mt = wincolor_stderr_sink_mt;
+using stderr_color_sink_st = wincolor_stderr_sink_st;
+#else
+using stdout_color_sink_mt = ansicolor_stdout_sink_mt;
+using stdout_color_sink_st = ansicolor_stdout_sink_st;
+using stderr_color_sink_mt = ansicolor_stderr_sink_mt;
+using stderr_color_sink_st = ansicolor_stderr_sink_st;
+#endif
+} // namespace sinks
+
+template<typename Factory = default_factory>
+inline std::shared_ptr<logger> stdout_color_mt(const std::string &logger_name)
+{
+    return Factory::template create<sinks::stdout_color_sink_mt>(logger_name);
+}
+
+template<typename Factory = default_factory>
+inline std::shared_ptr<logger> stdout_color_st(const std::string &logger_name)
+{
+    return Factory::template create<sinks::stdout_color_sink_st>(logger_name);
+}
+
+template<typename Factory = default_factory>
+inline std::shared_ptr<logger> stderr_color_mt(const std::string &logger_name)
+{
+    return Factory::template create<sinks::stderr_color_sink_mt>(logger_name);
+}
+
+template<typename Factory = default_factory>
+inline std::shared_ptr<logger> stderr_color_st(const std::string &logger_name)
+{
+    return Factory::template create<sinks::stderr_color_sink_mt>(logger_name);
+}
+} // namespace spdlog

include/spdlog/sinks/stdout_sinks.h

@@ -5,75 +5,96 @@
 
 #pragma once
 
-#include "../details/null_mutex.h"
-#include "base_sink.h"
+#include "spdlog/details/console_globals.h"
+#include "spdlog/details/null_mutex.h"
+#include "spdlog/spdlog.h"
 
 #include <cstdio>
 #include <memory>
 #include <mutex>
+#include <spdlog/details/console_globals.h>
 
 namespace spdlog {
+
 namespace sinks {
 
-template<class Mutex>
-class stdout_sink SPDLOG_FINAL : public base_sink<Mutex>
+template<typename TargetStream, typename ConsoleMutex>
+class stdout_sink : public sink
 {
-    using MyType = stdout_sink<Mutex>;
-
 public:
-    explicit stdout_sink() = default;
-
-    static std::shared_ptr<MyType> instance()
+    using mutex_t = typename ConsoleMutex::mutex_t;
+    stdout_sink()
+        : mutex_(ConsoleMutex::mutex())
+        , file_(TargetStream::stream())
     {
-        static std::shared_ptr<MyType> instance = std::make_shared<MyType>();
-        return instance;
+    }
+    ~stdout_sink() = default;
+
+    stdout_sink(const stdout_sink &other) = delete;
+    stdout_sink &operator=(const stdout_sink &other) = delete;
+
+    void log(const details::log_msg &msg) override
+    {
+        std::lock_guard<mutex_t> lock(mutex_);
+        fmt::memory_buffer formatted;
+        formatter_->format(msg, formatted);
+        fwrite(formatted.data(), sizeof(char), formatted.size(), file_);
+        fflush(TargetStream::stream());
     }
 
-protected:
-    void _sink_it(const details::log_msg &msg) override
+    void flush() override
     {
-        fwrite(msg.formatted.data(), sizeof(char), msg.formatted.size(), stdout);
-        _flush();
+        std::lock_guard<mutex_t> lock(mutex_);
+        fflush(file_);
     }
 
-    void _flush() override
+    void set_pattern(const std::string &pattern) override SPDLOG_FINAL
     {
-        fflush(stdout);
+        std::lock_guard<mutex_t> lock(mutex_);
+        formatter_ = std::unique_ptr<spdlog::formatter>(new pattern_formatter(pattern));
     }
+
+    void set_formatter(std::unique_ptr<spdlog::formatter> sink_formatter) override SPDLOG_FINAL
+    {
+        std::lock_guard<mutex_t> lock(mutex_);
+        formatter_ = std::move(sink_formatter);
+    }
+
+private:
+    mutex_t &mutex_;
+    FILE *file_;
 };
 
-using stdout_sink_mt = stdout_sink<std::mutex>;
-using stdout_sink_st = stdout_sink<details::null_mutex>;
+using stdout_sink_mt = stdout_sink<details::console_stdout, details::console_mutex>;
+using stdout_sink_st = stdout_sink<details::console_stdout, details::console_nullmutex>;
 
-template<class Mutex>
-class stderr_sink SPDLOG_FINAL : public base_sink<Mutex>
-{
-    using MyType = stderr_sink<Mutex>;
-
-public:
-    explicit stderr_sink() = default;
-
-    static std::shared_ptr<MyType> instance()
-    {
-        static std::shared_ptr<MyType> instance = std::make_shared<MyType>();
-        return instance;
-    }
-
-protected:
-    void _sink_it(const details::log_msg &msg) override
-    {
-        fwrite(msg.formatted.data(), sizeof(char), msg.formatted.size(), stderr);
-        _flush();
-    }
-
-    void _flush() override
-    {
-        fflush(stderr);
-    }
-};
-
-using stderr_sink_mt = stderr_sink<std::mutex>;
-using stderr_sink_st = stderr_sink<details::null_mutex>;
+using stderr_sink_mt = stdout_sink<details::console_stderr, details::console_mutex>;
+using stderr_sink_st = stdout_sink<details::console_stderr, details::console_nullmutex>;
 
 } // namespace sinks
+
+// factory methods
+template<typename Factory = default_factory>
+inline std::shared_ptr<logger> stdout_logger_mt(const std::string &logger_name)
+{
+    return Factory::template create<sinks::stdout_sink_mt>(logger_name);
+}
+
+template<typename Factory = default_factory>
+inline std::shared_ptr<logger> stdout_logger_st(const std::string &logger_name)
+{
+    return Factory::template create<sinks::stdout_sink_st>(logger_name);
+}
+
+template<typename Factory = default_factory>
+inline std::shared_ptr<logger> stderr_logger_mt(const std::string &logger_name)
+{
+    return Factory::template create<sinks::stderr_sink_mt>(logger_name);
+}
+
+template<typename Factory = default_factory>
+inline std::shared_ptr<logger> stderr_logger_st(const std::string &logger_name)
+{
+    return Factory::template create<sinks::stderr_sink_st>(logger_name);
+}
 } // namespace spdlog

include/spdlog/sinks/syslog_sink.h

@@ -5,12 +5,8 @@
 
 #pragma once
 
-#include "../common.h"
-
-#ifdef SPDLOG_ENABLE_SYSLOG
-
-#include "../details/log_msg.h"
-#include "sink.h"
+#include "spdlog/sinks/base_sink.h"
+#include "spdlog/spdlog.h"
 
 #include <array>
 #include <string>
@@ -23,23 +19,24 @@ namespace sinks {
  *
  * Locking is not needed, as `syslog()` itself is thread-safe.
  */
-class syslog_sink : public sink
+template<typename Mutex>
+class syslog_sink : public base_sink<Mutex>
 {
 public:
     //
     syslog_sink(const std::string &ident = "", int syslog_option = 0, int syslog_facility = LOG_USER)
-        : _ident(ident)
+        : ident_(ident)
     {
-        _priorities[static_cast<size_t>(level::trace)] = LOG_DEBUG;
-        _priorities[static_cast<size_t>(level::debug)] = LOG_DEBUG;
-        _priorities[static_cast<size_t>(level::info)] = LOG_INFO;
-        _priorities[static_cast<size_t>(level::warn)] = LOG_WARNING;
-        _priorities[static_cast<size_t>(level::err)] = LOG_ERR;
-        _priorities[static_cast<size_t>(level::critical)] = LOG_CRIT;
-        _priorities[static_cast<size_t>(level::off)] = LOG_INFO;
+        priorities_[static_cast<size_t>(level::trace)] = LOG_DEBUG;
+        priorities_[static_cast<size_t>(level::debug)] = LOG_DEBUG;
+        priorities_[static_cast<size_t>(level::info)] = LOG_INFO;
+        priorities_[static_cast<size_t>(level::warn)] = LOG_WARNING;
+        priorities_[static_cast<size_t>(level::err)] = LOG_ERR;
+        priorities_[static_cast<size_t>(level::critical)] = LOG_CRIT;
+        priorities_[static_cast<size_t>(level::off)] = LOG_INFO;
 
         // set ident to be program name if empty
-        ::openlog(_ident.empty() ? nullptr : _ident.c_str(), syslog_option, syslog_facility);
+        ::openlog(ident_.empty() ? nullptr : ident_.c_str(), syslog_option, syslog_facility);
     }
 
     ~syslog_sink() override
@@ -50,27 +47,45 @@ public:
     syslog_sink(const syslog_sink &) = delete;
     syslog_sink &operator=(const syslog_sink &) = delete;
 
-    void log(const details::log_msg &msg) override
+protected:
+    void sink_it_(const details::log_msg &msg) override
     {
-        ::syslog(syslog_prio_from_level(msg), "%s", msg.raw.str().c_str());
+        ::syslog(syslog_prio_from_level(msg), "%s", fmt::to_string(msg.raw).c_str());
     }
 
-    void flush() override {}
+    void flush_() override {}
 
 private:
-    std::array<int, 7> _priorities;
-    // must store the ident because the man says openlog might use the pointer as is and not a string copy
-    const std::string _ident;
+    std::array<int, 7> priorities_;
+    // must store the ident because the man says openlog might use the pointer as
+    // is and not a string copy
+    const std::string ident_;
 
     //
     // Simply maps spdlog's log level to syslog priority level.
     //
     int syslog_prio_from_level(const details::log_msg &msg) const
     {
-        return _priorities[static_cast<size_t>(msg.level)];
+        return priorities_[static_cast<size_t>(msg.level)];
     }
 };
-} // namespace sinks
-} // namespace spdlog
 
-#endif
+using syslog_sink_mt = syslog_sink<std::mutex>;
+using syslog_sink_st = syslog_sink<details::null_mutex>;
+} // namespace sinks
+
+// Create and register a syslog logger
+template<typename Factory = default_factory>
+inline std::shared_ptr<logger> syslog_logger_mt(
+    const std::string &logger_name, const std::string &syslog_ident = "", int syslog_option = 0, int syslog_facility = (1 << 3))
+{
+    return Factory::template create<sinks::syslog_sink_mt>(logger_name, syslog_ident, syslog_option, syslog_facility);
+}
+
+template<typename Factory = default_factory>
+inline std::shared_ptr<logger> syslog_logger_st(
+    const std::string &logger_name, const std::string &syslog_ident = "", int syslog_option = 0, int syslog_facility = (1 << 3))
+{
+    return Factory::template create<sinks::syslog_sink_st>(logger_name, syslog_ident, syslog_option, syslog_facility);
+}
+} // namespace spdlog

include/spdlog/sinks/wincolor_sink.h

@@ -5,10 +5,12 @@
 
 #pragma once
 
-#include "../common.h"
-#include "../details/null_mutex.h"
-#include "base_sink.h"
+#include "spdlog/common.h"
+#include "spdlog/details/console_globals.h"
+#include "spdlog/details/null_mutex.h"
+#include "spdlog/sinks/sink.h"
 
+#include <memory>
 #include <mutex>
 #include <string>
 #include <unordered_map>
@@ -17,10 +19,11 @@
 namespace spdlog {
 namespace sinks {
 /*
- * Windows color console sink. Uses WriteConsoleA to write to the console with colors
+ * Windows color console sink. Uses WriteConsoleA to write to the console with
+ * colors
  */
-template<class Mutex>
-class wincolor_sink : public base_sink<Mutex>
+template<typename OutHandle, typename ConsoleMutex>
+class wincolor_sink : public sink
 {
 public:
     const WORD BOLD = FOREGROUND_INTENSITY;
@@ -30,8 +33,9 @@ public:
     const WORD WHITE = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE;
     const WORD YELLOW = FOREGROUND_RED | FOREGROUND_GREEN;
 
-    wincolor_sink(HANDLE std_handle)
-        : out_handle_(std_handle)
+    wincolor_sink()
+        : out_handle_(OutHandle::handle())
+        , mutex_(ConsoleMutex::mutex())
     {
         colors_[level::trace] = WHITE;
         colors_[level::debug] = CYAN;
@@ -53,92 +57,83 @@ public:
     // change the color for the given level
     void set_color(level::level_enum level, WORD color)
     {
-        std::lock_guard<Mutex> lock(base_sink<Mutex>::_mutex);
+        std::lock_guard<mutex_t> lock(mutex_);
         colors_[level] = color;
     }
 
-protected:
-    void _sink_it(const details::log_msg &msg) override
+    void log(const details::log_msg &msg) SPDLOG_FINAL override
     {
+        std::lock_guard<mutex_t> lock(mutex_);
+        fmt::memory_buffer formatted;
+        formatter_->format(msg, formatted);
         if (msg.color_range_end > msg.color_range_start)
         {
             // before color range
-            _print_range(msg, 0, msg.color_range_start);
+            print_range_(formatted, 0, msg.color_range_start);
 
             // in color range
             auto orig_attribs = set_console_attribs(colors_[msg.level]);
-            _print_range(msg, msg.color_range_start, msg.color_range_end);
-            ::SetConsoleTextAttribute(out_handle_, orig_attribs); // reset to orig colors
-            // after color range
-            _print_range(msg, msg.color_range_end, msg.formatted.size());
+            print_range_(formatted, msg.color_range_start, msg.color_range_end);
+            ::SetConsoleTextAttribute(out_handle_,
+                orig_attribs); // reset to orig colors
+                               // after color range
+            print_range_(formatted, msg.color_range_end, formatted.size());
         }
         else // print without colors if color range is invalid
         {
-            _print_range(msg, 0, msg.formatted.size());
+            print_range_(formatted, 0, formatted.size());
         }
     }
 
-    void _flush() override
+    void flush() SPDLOG_FINAL override
     {
         // windows console always flushed?
     }
 
-private:
-    HANDLE out_handle_;
-    std::unordered_map<level::level_enum, WORD, level::level_hasher> colors_;
+    void set_pattern(const std::string &pattern) override SPDLOG_FINAL
+    {
+        std::lock_guard<mutex_t> lock(mutex_);
+        formatter_ = std::unique_ptr<spdlog::formatter>(new pattern_formatter(pattern));
+    }
 
+    void set_formatter(std::unique_ptr<spdlog::formatter> sink_formatter) override SPDLOG_FINAL
+    {
+        std::lock_guard<mutex_t> lock(mutex_);
+        formatter_ = std::move(sink_formatter);
+    }
+
+private:
+    using mutex_t = typename ConsoleMutex::mutex_t;
     // set color and return the orig console attributes (for resetting later)
     WORD set_console_attribs(WORD attribs)
     {
         CONSOLE_SCREEN_BUFFER_INFO orig_buffer_info;
-        GetConsoleScreenBufferInfo(out_handle_, &orig_buffer_info);
+        ::GetConsoleScreenBufferInfo(out_handle_, &orig_buffer_info);
         WORD back_color = orig_buffer_info.wAttributes;
         // retrieve the current background color
         back_color &= static_cast<WORD>(~(FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE | FOREGROUND_INTENSITY));
         // keep the background color unchanged
-        SetConsoleTextAttribute(out_handle_, attribs | back_color);
+        ::SetConsoleTextAttribute(out_handle_, attribs | back_color);
         return orig_buffer_info.wAttributes; // return orig attribs
     }
 
     // print a range of formatted message to console
-    void _print_range(const details::log_msg &msg, size_t start, size_t end)
+    void print_range_(const fmt::memory_buffer &formatted, size_t start, size_t end)
     {
-        DWORD size = static_cast<DWORD>(end - start);
-        WriteConsoleA(out_handle_, msg.formatted.data() + start, size, nullptr, nullptr);
+        auto size = static_cast<DWORD>(end - start);
+        ::WriteConsoleA(out_handle_, formatted.data() + start, size, nullptr, nullptr);
     }
+
+    HANDLE out_handle_;
+    mutex_t &mutex_;
+    std::unordered_map<level::level_enum, WORD, level::level_hasher> colors_;
 };
 
-//
-// windows color console to stdout
-//
-template<class Mutex>
-class wincolor_stdout_sink : public wincolor_sink<Mutex>
-{
-public:
-    wincolor_stdout_sink()
-        : wincolor_sink<Mutex>(GetStdHandle(STD_OUTPUT_HANDLE))
-    {
-    }
-};
+using wincolor_stdout_sink_mt = wincolor_sink<details::console_stdout, details::console_mutex>;
+using wincolor_stdout_sink_st = wincolor_sink<details::console_stdout, details::console_nullmutex>;
 
-using wincolor_stdout_sink_mt = wincolor_stdout_sink<std::mutex>;
-using wincolor_stdout_sink_st = wincolor_stdout_sink<details::null_mutex>;
-
-//
-// windows color console to stderr
-//
-template<class Mutex>
-class wincolor_stderr_sink : public wincolor_sink<Mutex>
-{
-public:
-    wincolor_stderr_sink()
-        : wincolor_sink<Mutex>(GetStdHandle(STD_ERROR_HANDLE))
-    {
-    }
-};
-
-using wincolor_stderr_sink_mt = wincolor_stderr_sink<std::mutex>;
-using wincolor_stderr_sink_st = wincolor_stderr_sink<details::null_mutex>;
+using wincolor_stderr_sink_mt = wincolor_sink<details::console_stderr, details::console_mutex>;
+using wincolor_stderr_sink_st = wincolor_sink<details::console_stderr, details::console_nullmutex>;
 
 } // namespace sinks
 } // namespace spdlog