Changeset 985e26d2 in mainline for uspace/lib/libc/generic/time.c

Timestamp:

2010-01-07T19:06:59Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

8190e63

Parents:

743e17b (diff), eca2435 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

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(unsigned long usec)
-{
-        atomic_t futex = FUTEX_INITIALIZER;
-
-        futex_initialize(&futex, 0);
-        futex_down_timeout(&futex, usec, 0);
+int usleep(useconds_t usec)
+{
+        (void) __SYSCALL1(SYS_THREAD_USLEEP, usec);
         return 0;
 }
 
 /** Wait unconditionally for specified number of seconds */
-unsigned int sleep(unsigned int seconds)
-{
-        atomic_t futex = FUTEX_INITIALIZER;
-
-        futex_initialize(&futex, 0);
-        
+unsigned int sleep(unsigned int sec)
+{
         /* Sleep in 1000 second steps to support
            full argument range */
-        while (seconds > 0) {
-                unsigned int period = (seconds > 1000) ? 1000 : seconds;
+        while (sec > 0) {
+                unsigned int period = (sec > 1000) ? 1000 : sec;
         
-                futex_down_timeout(&futex, period * 1000000, 0);
-                seconds -= period;
+                usleep(period * 1000000);
+                sec -= period;
         }
         return 0;