Changeset 84b14e2 in mainline for uspace/lib/libc/generic/time.c

Timestamp:

2009-12-02T23:33:48Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4924675

Parents:

089d746 (diff), 8d04f709 (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 simplified futexes (ticket #154) and fix for arm32 kernel atomic
operations (ticket #153).

File:

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

uspace/lib/libc/generic/time.c

@@ -40 +40 @@
 #include <unistd.h>
 #include <atomic.h>
-#include <futex.h>
 #include <sysinfo.h>
 #include <ipc/services.h>
+#include <libc.h>
 
 #include <sysinfo.h>
@@ -191 +191 @@
 int usleep(unsigned long usec)
 {
-        atomic_t futex = FUTEX_INITIALIZER;
-
-        futex_initialize(&futex, 0);
-        futex_down_timeout(&futex, usec, 0);
+        (void) __SYSCALL1(SYS_THREAD_USLEEP, usec);     
         return 0;
 }
@@ -201 +198 @@
 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 */
@@ -210 +203 @@
                 unsigned int period = (seconds > 1000) ? 1000 : seconds;
         
-                futex_down_timeout(&futex, period * 1000000, 0);
+                usleep(period * 1000000);
                 seconds -= period;
         }