Changeset 22e6802 in mainline

Timestamp:

2009-12-03T17:49:01Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

65c1778, fbcfc4da

Parents:

4924675

Message:

fix kernel thread_sleep() not to overflow thread_usleep()
introduce useconds_t
unify arguments names, cstyle

Files:

• kernel/generic/src/proc/thread.c (modified) (3 diffs)
• uspace/lib/libc/generic/time.c (modified) (2 diffs)
• uspace/lib/libc/include/unistd.h (modified) (2 diffs)

kernel/generic/src/proc/thread.c

@@ -501 +501 @@
 void thread_sleep(uint32_t sec)
 {
-        thread_usleep(sec * 1000000);
+        /* Sleep in 1000 second steps to support
+           full argument range */
+        while (sec > 0) {
+                uint32_t period = (sec > 1000) ? 1000 : sec;
+        
+                thread_usleep(period * 1000000);
+                sec -= period;
+        }
 }
 
@@ -575 +582 @@
 {
         waitq_t wq;
-                                  
+        
         waitq_initialize(&wq);
-
+        
         (void) waitq_sleep_timeout(&wq, usec, SYNCH_FLAGS_NON_BLOCKING);
 }
@@ -815 +822 @@
 unative_t sys_thread_usleep(uint32_t usec)
 {
-        thread_usleep(usec);    
+        thread_usleep(usec);
         return 0;
 }

uspace/lib/libc/generic/time.c

@@ -31 +31 @@
  */
 /** @file
- */ 
+ */
 
 #include <sys/time.h>
@@ -189 +189 @@
 
 /** Wait unconditionally for specified number of microseconds */
-int usleep(unsigned long usec)
-{
-        (void) __SYSCALL1(SYS_THREAD_USLEEP, usec);     
+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)
+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;
         
                 usleep(period * 1000000);
-                seconds -= period;
+                sec -= period;
         }
         return 0;

uspace/lib/libc/include/unistd.h

@@ -51 +51 @@
 #endif
 
+typedef uint32_t useconds_t;
+
 extern int dup2(int oldfd, int newfd);
 
@@ -68 +70 @@
 
 extern void _exit(int status) __attribute__ ((noreturn));
-extern int usleep(unsigned long usec);
-extern unsigned int sleep(unsigned int seconds);
+extern int usleep(useconds_t uses);
+extern unsigned int sleep(unsigned int se);
 
 #endif