Changeset d9ece1cb in mainline

Timestamp:

2009-12-01T20:08:32Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

d359e227

Parents:

d52b82ad

Message:

Introduce SYS_THREAD_USLEEP and use it to implement usleep() in uspace.

Files:

• kernel/generic/include/proc/thread.h (modified) (1 diff)
• kernel/generic/include/syscall/syscall.h (modified) (1 diff)
• kernel/generic/src/proc/thread.c (modified) (1 diff)
• kernel/generic/src/syscall/syscall.c (modified) (1 diff)
• uspace/lib/libc/generic/time.c (modified) (4 diffs)

kernel/generic/include/proc/thread.h

@@ -263 +263 @@
 extern unative_t sys_thread_exit(int);
 extern unative_t sys_thread_get_id(thread_id_t *);
+extern unative_t sys_thread_usleep(uint32_t);
 
 #endif

kernel/generic/include/syscall/syscall.h

@@ -43 +43 @@
         SYS_THREAD_EXIT,
         SYS_THREAD_GET_ID,
+        SYS_THREAD_USLEEP,
         
         SYS_TASK_GET_ID,

kernel/generic/src/proc/thread.c

@@ -812 +812 @@
 }
 
+/** Syscall wrapper for sleeping. */
+unative_t sys_thread_usleep(uint32_t usec)
+{
+        thread_usleep(usec);    
+        return 0;
+}
+
 /** @}
  */

kernel/generic/src/syscall/syscall.c

@@ -111 +111 @@
         (syshandler_t) sys_thread_exit,
         (syshandler_t) sys_thread_get_id,
+        (syshandler_t) sys_thread_usleep,
         
         (syshandler_t) sys_task_get_id,

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;
         }