Changes in uspace/lib/libc/generic/time.c [22e6802:c61d34b] in mainline

File:

• uspace/lib/libc/generic/time.c (modified) (3 diffs)

uspace/lib/libc/generic/time.c

@@ -31 +31 @@
  */
 /** @file
- */
+ */ 
 
 #include <sys/time.h>
@@ -40 +40 @@
 #include <unistd.h>
 #include <atomic.h>
+#include <futex.h>
 #include <sysinfo.h>
 #include <ipc/services.h>
-#include <libc.h>
 
 #include <sysinfo.h>
@@ -189 +189 @@
 
 /** Wait unconditionally for specified number of microseconds */
-int usleep(useconds_t usec)
-{
-        (void) __SYSCALL1(SYS_THREAD_USLEEP, usec);
+int usleep(unsigned long usec)
+{
+        atomic_t futex = FUTEX_INITIALIZER;
+
+        futex_initialize(&futex, 0);
+        futex_down_timeout(&futex, usec, 0);
         return 0;
 }
 
 /** Wait unconditionally for specified number of seconds */
-unsigned int sleep(unsigned int sec)
-{
+unsigned int sleep(unsigned int seconds)
+{
+        atomic_t futex = FUTEX_INITIALIZER;
+
+        futex_initialize(&futex, 0);
+        
         /* Sleep in 1000 second steps to support
            full argument range */
-        while (sec > 0) {
-                unsigned int period = (sec > 1000) ? 1000 : sec;
+        while (seconds > 0) {
+                unsigned int period = (seconds > 1000) ? 1000 : seconds;
         
-                usleep(period * 1000000);
-                sec -= period;
+                futex_down_timeout(&futex, period * 1000000, 0);
+                seconds -= period;
         }
         return 0;