Merge b59b900f8e into 8f24fc5f14

bench/Makefile.mingw

@@ -0,0 +1,30 @@
+CXX	= g++
+CXXFLAGS	= -D_WIN32_WINNT=0x600 -march=native -Wall -Wextra -Wshadow -pedantic -std=c++11 -pthread -Wl,--no-as-needed  -I../include 
+CXX_RELEASE_FLAGS = -O3 -flto
+
+
+all:	spdlog-bench spdlog-bench-mt boost-bench boost-bench-mt
+
+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)	
+
+BOOST_FLAGS	= -DBOOST_LOG_DYN_LINK  -I$(BOOST_ROOT)/include -L$(BOOST_ROOT)/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)	
+
+
+clean:
+	rm -f *.o logs/*.txt spdlog-bench spdlog-bench-mt boost-bench boost-bench-mt
+
+
+rebuild: clean all
+
+
+

bench/run_all.bat

@@ -0,0 +1,28 @@
+@echo off
+echo Running benchmarks (all with 1000,000 writes to the logs folder)
+echo ==================================
+echo boost-bench (single thread)
+echo %time%
+.\boost-bench
+echo %time%
+echo ==================================
+choice /n /c y /d y /t 1 >NUL
+echo spdlog-bench (single thread)
+echo %time%
+.\spdlog-bench
+echo %time%
+echo ==================================
+choice /n /c y /d y /t 1 >NUL
+echo boost-bench-mt (10 threads, single logger)
+echo %time%
+.\boost-bench-mt
+echo %time%
+echo ==================================
+choice /n /c y /d y /t 1 >NUL
+echo spdlog-bench-mt (10 threads, single logger)
+echo %time%
+.\spdlog-bench-mt
+echo %time%
+echo ==================================
+
+

include/spdlog/sinks/syslog_sink.h

@@ -24,10 +24,20 @@
 
 #pragma once
 
-#ifdef __linux__
-
 #include <string>
+#ifdef __linux__
 #include <syslog.h>
+#else
+	inline void syslog(int /*prio*/, const char */*fmt*/, ...) {}	// TODO Windows Syslog not supported
+	#define LOG_EMERG       0       /* system is unusable */
+	#define LOG_ALERT       1       /* action must be taken immediately */
+	#define LOG_CRIT        2       /* critical conditions */
+	#define LOG_ERR         3       /* error conditions */
+	#define LOG_WARNING     4       /* warning conditions */
+	#define LOG_NOTICE      5       /* normal but significant condition */
+	#define LOG_INFO        6       /* informational */
+	#define LOG_DEBUG       7       /* debug-level messages */
+#endif
 #include "./sink.h"
 #include "../common.h"
 #include "../details/log_msg.h"
@@ -84,5 +94,3 @@ namespace spdlog
     };
   }
 }
-
-#endif

include/spdlog/spdlog.h

@@ -69,9 +69,7 @@ std::shared_ptr<logger> stderr_logger_st(const std::string& logger_name);
 
 
 // Create a syslog logger
-#ifdef __linux__
  std::shared_ptr<logger> syslog_logger(const std::string& logger_name);
-#endif
 
 
 //