Merge branch 'master' of https://github.com/gabime/spdlog

README.md

@@ -28,7 +28,7 @@ Just copy the files to your build tree and use a C++11 compiler
 
 ## Benchmarks
 
-Here are some [benchmarks](bench-comparison) comparing spdlog vs boost log(1.56.0) on Ubuntu 64 bits, Intel i7-4770 CPU @ 3.40GHz.
+Here are some [benchmarks](bench) comparing spdlog vs boost log(1.56.0) on Ubuntu 64 bits, Intel i7-4770 CPU @ 3.40GHz.
 
 The bench writes 1,000,000 log lines to a rotating log file (using shared synchronous logger object):
 

bench/boost-bench-mt.cpp

@@ -23,7 +23,7 @@ void init()
         keywords::file_name = "logs/boost-sample_%N.log",                              /*< file name pattern >*/
         keywords::rotation_size = 10 * 1024 * 1024,                                   /*< rotate files every 10 MiB... >*/
         keywords::auto_flush = false,
-        keywords::format = "[%TimeStamp%]: %Message%"                                 
+        keywords::format = "[%TimeStamp%]: %Message%"
     );
 
     logging::core::get()->set_filter
@@ -38,24 +38,24 @@ using namespace std;
 
 int main(int argc, char* argv[])
 {
-	int thread_count = 10;
-	if(argc > 1)
-		thread_count = atoi(argv[1]);
-		
-	int howmany = 1000000;
+    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;
-    
+
     for (int t = 0; t < thread_count; ++t)
     {
         threads.push_back(std::thread([&]()
@@ -64,7 +64,7 @@ int main(int argc, char* argv[])
             {
                 int counter = ++msg_counter;
                 if (counter > howmany) break;
-              BOOST_LOG_SEV(lg, info) << "Boost logger message #" << counter;
+                BOOST_LOG_SEV(lg, info) << "Boost logger message #" << counter;
             }
         }));
     }
@@ -74,7 +74,7 @@ int main(int argc, char* argv[])
     {
         t.join();
     };
-    
-    
+
+
     return 0;
 }

bench/boost-bench.cpp

@@ -20,7 +20,7 @@ void init()
         keywords::file_name = "logs/boost-sample_%N.log",                              /*< file name pattern >*/
         keywords::rotation_size = 10 * 1024 * 1024,                                   /*< rotate files every 10 MiB... >*/
         keywords::auto_flush = false,
-        keywords::format = "[%TimeStamp%]: %Message%"                                 
+        keywords::format = "[%TimeStamp%]: %Message%"
     );
 
     logging::core::get()->set_filter
@@ -32,14 +32,14 @@ void init()
 
 int main(int argc, char* [])
 {
-	int howmany = 1000000;
+    int howmany = 1000000;
     init();
     logging::add_common_attributes();
 
     using namespace logging::trivial;
     src::severity_logger_mt< severity_level > lg;
-	for(int i  = 0 ; i < howmany; ++i)
-	    BOOST_LOG_SEV(lg, info) << "Boost logger message #" << i;
+    for(int i  = 0 ; i < howmany; ++i)
+        BOOST_LOG_SEV(lg, info) << "Boost logger message #" << i;
 
     return 0;
 }

bench/spdlog-bench-mt.cpp

@@ -6,26 +6,26 @@
 
 #include <iostream>
 using namespace std;
-	
+
 int main(int argc, char* argv[])
 {
 
-	int thread_count = 10;
-	if(argc > 1)
-		thread_count = atoi(argv[1]);
-		
-	int howmany = 1000000;
+    int thread_count = 10;
+    if(argc > 1)
+        thread_count = atoi(argv[1]);
+
+    int howmany = 1000000;
 
-	namespace spd = spdlog;
-	///Create a file rotating logger with 5mb size max and 3 rotated files
+    namespace spd = spdlog;
+    ///Create a file rotating logger with 5mb size max and 3 rotated files
     auto logger = spd::rotating_logger_mt("file_logger", "logs/spd-sample", 10 *1024 * 1024 , 5);
 
-	logger->set_pattern("[%Y-%b-%d %T.%e]: %v");
-		
-	std::atomic<int > msg_counter {0};
+    logger->set_pattern("[%Y-%b-%d %T.%e]: %v");
+
+    std::atomic<int > msg_counter {0};
     vector<thread> threads;
-    	
-	for (int t = 0; t < thread_count; ++t)
+
+    for (int t = 0; t < thread_count; ++t)
     {
         threads.push_back(std::thread([&]()
         {
@@ -33,7 +33,7 @@ int main(int argc, char* argv[])
             {
                 int counter = ++msg_counter;
                 if (counter > howmany) break;
-              logger->info() << "spdlog logger message #" << counter;
+                logger->info() << "spdlog logger message #" << counter;
             }
         }));
     }
@@ -43,8 +43,8 @@ int main(int argc, char* argv[])
     {
         t.join();
     };
-    
-    
+
+
 
     return 0;
 }

bench/spdlog-bench.cpp

@@ -4,14 +4,14 @@
 
 int main(int argc, char* [])
 {
-	int howmany = 1000000;
-	namespace spd = spdlog;
-	///Create a file rotating logger with 5mb size max and 3 rotated files
+    int howmany = 1000000;
+    namespace spd = spdlog;
+    ///Create a file rotating logger with 5mb size max and 3 rotated files
     auto logger = spd::rotating_logger_mt("file_logger", "logs/spd-sample", 10 *1024 * 1024 , 5);
 
-	logger->set_pattern("[%Y-%b-%d %T.%e]: %v");
-	for(int i  = 0 ; i < howmany; ++i)
-	    logger->info() << "spdlogger message #" << i;
+    logger->set_pattern("[%Y-%b-%d %T.%e]: %v");
+    for(int i  = 0 ; i < howmany; ++i)
+        logger->info() << "spdlogger message #" << i;
 
     return 0;
 }

example/example.cpp

@@ -29,7 +29,7 @@
 #include "spdlog/spdlog.h"
 
 
-int maina(int, char* [])
+int main(int, char* [])
 {
 
     namespace spd = spdlog;

include/spdlog/details/pattern_formatter_impl.h

@@ -457,7 +457,7 @@ inline void spdlog::pattern_formatter::handle_flag(char flag)
 {
     switch (flag)
     {
-    // logger name
+        // logger name
     case 'n':
         _formatters.push_back(std::unique_ptr<details::flag_formatter>(new details::name_formatter()));
         break;