Removed ::Sleep and implemented Utility::Sleep.

diff --git a/lib/base/application.cpp b/lib/base/application.cpp
index 51458dda37d87da388dc8dc51a307adf8f00c0b6..5a423b804e4a046c37800cb6e80e69d6a2bd087f 100644 (file)
--- a/lib/base/application.cpp
+++ b/lib/base/application.cpp
@@ -138,7 +138,7 @@ void Application::TimeWatchThreadProc(void)
        double lastLoop = Utility::GetTime();
 
        for (;;) {
-               Sleep(5000);
+               Utility::Sleep(5);
 
                double now = Utility::GetTime();
                double timeDiff = lastLoop - now;

diff --git a/lib/base/process.cpp b/lib/base/process.cpp
index 0686d0c79670fdedfee8207077cd98997c4e8a5e..63c24117ee31e510807cd9c78518aeb239cdabc3 100644 (file)
--- a/lib/base/process.cpp
+++ b/lib/base/process.cpp
@@ -81,7 +81,7 @@ void Process::WorkerThreadProc(void)
                        tv.tv_usec = 0;
                        select(nfds + 1, &readfds, NULL, NULL, &tv);
 #else /* _MSC_VER */
-                       Sleep(1000);
+                       Utility::Sleep(1);
 #endif /* _MSC_VER */
 
                        for (it = tasks.begin(); it != tasks.end(); ) {

diff --git a/lib/base/unix.cpp b/lib/base/unix.cpp
index 8997e814e983d687c6c636f5abb27a7dd1279a99..010c390a02b9135b2633e31a093de385752ba93b 100644 (file)
--- a/lib/base/unix.cpp
+++ b/lib/base/unix.cpp
@@ -20,20 +20,9 @@
 #include "i2-base.h"
 
 #ifndef _WIN32
-#include <ltdl.h>
 
 using namespace icinga;
 
-/**
- * Sleeps for the specified amount of time.
- *
- * @param milliseconds The amount of time in milliseconds.
- */
-void Sleep(unsigned long milliseconds)
-{
-       usleep(milliseconds * 1000);
-}
-
 /**
  * Closes a socket.
  *

diff --git a/lib/base/unix.h b/lib/base/unix.h
index 31e5ae9c058538ac03208d653a84d7aa4f7f70d4..bc1f59e329eacd15f63186d13bb4a3616ead0634 100644 (file)
--- a/lib/base/unix.h
+++ b/lib/base/unix.h
@@ -37,8 +37,6 @@
 #include <sys/file.h>
 #include <sys/wait.h>
 
-void Sleep(unsigned long milliseconds);
-
 typedef int SOCKET;
 #define INVALID_SOCKET (-1)
 void closesocket(SOCKET fd);

diff --git a/lib/base/utility.cpp b/lib/base/utility.cpp
index b6c89282d78dc227e5cb2e27bafce83a44a58681..f3fe5fbf17aeb410c80a4add357b2014711dbe7d 100644 (file)
--- a/lib/base/utility.cpp
+++ b/lib/base/utility.cpp
@@ -309,3 +309,18 @@ pid_t Utility::GetPid(void)
        return GetCurrentProcessId();
 #endif /* _WIN32 */
 }
+
+/**
+ * Sleeps for the specified amount of time.
+ *
+ * @param timeout The timeout in seconds.
+ */
+void Utility::Sleep(double timeout)
+{
+#ifndef _WIN32
+       usleep(timeout * 1000 * 1000);
+#else /* _WIN32 */
+       Sleep(timeout * 1000);
+#endif /* _WIN32 */
+}
+

diff --git a/lib/base/utility.h b/lib/base/utility.h
index 96c914a377adb7a7f3b527f9580ea23750e9d03d..b1f5d00eac8dbee6b363eb703abd7908e4e79972 100644 (file)
--- a/lib/base/utility.h
+++ b/lib/base/utility.h
@@ -50,6 +50,8 @@ public:
 
        static pid_t GetPid(void);
 
+       static void Sleep(double timeout);
+
 private:
        static bool m_SSLInitialized;