From: Gurucharan Shetty <gshetty@nicira.com>
Date: Fri, 28 Mar 2014 22:15:02 +0000 (-0700)
Subject: util: xleep for Windows.
X-Git-Tag: sliver-openvswitch-2.2.90-1~6^2~5
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=5fd2f418fa845b1aa8662a3d939af13b484af62c;p=sliver-openvswitch.git

util: xleep for Windows.

Windows does not have a sleep(seconds). But it does have
a Sleep(milliseconds). Sleep() in windows does not have a
return value. Since we are not using the return value for xsleep()
anywhere as of now, don't return any.

Introduced by commit 275eebb9 (utils: Introduce xsleep for RCU quiescent state)

CC: Pravin B Shelar <pshelar@nicira.com>
Signed-off-by: Gurucharan Shetty <gshetty@nicira.com>
Acked-by: Pravin B Shelar <pshelar@nicira.com>
---

diff --git a/lib/util.c b/lib/util.c
index 805f33a8c..3f08c4ac8 100644
--- a/lib/util.c
+++ b/lib/util.c
@@ -1727,15 +1727,16 @@ exit:
     return ok;
 }
 
-unsigned int
+void
 xsleep(unsigned int seconds)
 {
-    unsigned int t;
-
     ovsrcu_quiesce_start();
-    t = sleep(seconds);
+#ifdef _WIN32
+    Sleep(seconds * 1000);
+#else
+    sleep(seconds);
+#endif
     ovsrcu_quiesce_end();
-    return t;
 }
 
 #ifdef _WIN32
diff --git a/lib/util.h b/lib/util.h
index 1bbcee27b..aff17a545 100644
--- a/lib/util.h
+++ b/lib/util.h
@@ -502,13 +502,13 @@ void bitwise_put(uint64_t value,
 uint64_t bitwise_get(const void *src, unsigned int src_len,
                      unsigned int src_ofs, unsigned int n_bits);
 
+void xsleep(unsigned int seconds);
 #ifdef _WIN32
 
 char *ovs_format_message(int error);
 char *ovs_lasterror_to_string(void);
 int ftruncate(int fd, off_t length);
 #endif
-unsigned int xsleep(unsigned int seconds);
 
 #ifdef  __cplusplus
 }