Added tweakme.h - enable users to enable/disable features at compile time

include/spdlog/details/line_logger.h

@@ -62,9 +62,16 @@ public:
     {
         if (_enabled)
         {
+#ifndef SPDLOG_NO_NAME
             _log_msg.logger_name = _callback_logger->name();
+#endif
+#ifndef SPDLOG_NO_DATETIME
             _log_msg.time = os::now();
+#endif
+
+#ifndef SPDLOG_NO_THREAD_ID
             _log_msg.thread_id = os::thread_id();
+#endif
             _callback_logger->_log_msg(_log_msg);
         }
     }

include/spdlog/details/os.h

@@ -51,7 +51,7 @@ namespace os
 inline spdlog::log_clock::time_point now()
 {
 
-#ifdef SPDLOG_CLOCK_COARSE
+#if defined __linux__ && defined SPDLOG_CLOCK_COARSE
     timespec ts;
     ::clock_gettime(CLOCK_REALTIME_COARSE, &ts);
     return std::chrono::time_point<log_clock, typename log_clock::duration>(
@@ -175,19 +175,14 @@ inline int utc_minutes_offset(const std::tm& tm = details::os::localtime())
 //It exists because the std::this_thread::get_id() is much slower(espcially under VS 2013)
 inline size_t thread_id()
 {
-
-#ifdef SPDLOG_NO_THREAD_ID
-    return 0;
-#else
-
 #ifdef _WIN32
-    return ::GetCurrentThreadId();
+    return  static_cast<size_t>(::GetCurrentThreadId());
 #elif __linux__
-    return  syscall(SYS_gettid);
-#else
-    return pthread_self();
+    return  static_cast<size_t>(syscall(SYS_gettid));
+#else //Default to standard C++11 (OSX and other Unix)
+    return static_cast<size_t>(std::hash<std::thread::id>()(std::this_thread::get_id()));
 #endif
-#endif //SPDLOG_NO_THREAD_ID
+
 }
 
 } //os

include/spdlog/details/pattern_formatter_impl.h

@@ -405,6 +405,7 @@ class full_formatter :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;
 
@@ -421,6 +422,7 @@ class full_formatter :public flag_formatter
         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') << '-'
@@ -430,7 +432,16 @@ class full_formatter :public flag_formatter
                       << fmt::pad(static_cast<unsigned int>(tm_time.tm_sec), 2, '0') << '.'
                       << fmt::pad(static_cast<unsigned int>(millis), 3, '0') << "] ";
 
-        msg.formatted << '[' << msg.logger_name << "] [" << level::to_str(msg.level) << "] ";
+//no datetime needed
+#else
+        (void)tm_time;
+#endif;
+
+#ifndef SPDLOG_NO_NAME
+        msg.formatted << '[' << msg.logger_name << "] ";
+#endif
+
+        msg.formatted << '[' << level::to_str(msg.level) << "] ";
         msg.formatted << fmt::StringRef(msg.raw.data(), msg.raw.size());
     }
 };