use Sleep in Windows instead of sleep_for

fixes gabime#609
joaomoreno · Jan 11, 2018 · 2002e28 · 2002e28
1 parent 8cce45e
commit 2002e28
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/include/spdlog/details/async_log_helper.h b/include/spdlog/details/async_log_helper.h
@@ -360,7 +360,6 @@ inline void spdlog::details::async_log_helper::set_formatter(formatter_ptr msg_f
 // 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 namespace std::this_thread;
     using std::chrono::milliseconds;
     using std::chrono::microseconds;
 
@@ -376,10 +375,10 @@ inline void spdlog::details::async_log_helper::sleep_or_yield(const spdlog::log_
 
     // sleep for 20 ms upto 200 ms
     if (time_since_op <= milliseconds(200))
-        return sleep_for(milliseconds(20));
+        return spdlog::details::os::sleep_for_millis(20);
 
     // sleep for 500 ms
-    return sleep_for(milliseconds(500));
+    return spdlog::details::os::sleep_for_millis(500);
 }
 
 // wait for the queue to be empty

diff --git a/include/spdlog/details/file_helper.h b/include/spdlog/details/file_helper.h
@@ -55,7 +55,7 @@ class file_helper
             if (!os::fopen_s(&_fd, fname, mode))
                 return;
 
-            std::this_thread::sleep_for(std::chrono::milliseconds(open_interval));
+            spdlog::details::os::sleep_for_millis(open_interval);
         }
 
         throw spdlog_ex("Failed opening file " + os::filename_to_str(_filename) + " for writing", errno);

diff --git a/include/spdlog/details/os.h b/include/spdlog/details/os.h
@@ -362,6 +362,15 @@ inline size_t thread_id()
 
 }
 
+// from https://github.com/gabime/spdlog/issues/609
+inline void sleep_for_millis(int milliseconds)
+{
+#if defined(_WIN32)
+    Sleep(milliseconds);
+#else
+    std::this_thread::sleep_for(std::chrono::milliseconds(milliseconds));
+#endif
+}
 
 // wchar support for windows file names (SPDLOG_WCHAR_FILENAMES must be defined)
 #if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES)

diff --git a/include/spdlog/sinks/android_sink.h b/include/spdlog/sinks/android_sink.h
@@ -8,6 +8,7 @@
 #if defined(__ANDROID__)
 
 #include "sink.h"
+#include "../details/os.h"
 
 #include <mutex>
 #include <string>
@@ -43,7 +44,7 @@ class android_sink : public sink
         int retry_count = 0;
         while ((ret == -11/*EAGAIN*/) && (retry_count < SPDLOG_ANDROID_RETRIES))
         {
-            std::this_thread::sleep_for(std::chrono::milliseconds(5));
+            spdlog::details::os::sleep_for_millis(5);
             ret = __android_log_write(priority, _tag.c_str(), msg_output);
             retry_count++;
         }