Changeset 371bd7d in mainline for kernel/generic/src/proc/thread.c

Timestamp:

2010-03-27T09:22:17Z (16 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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:

• kernel/generic/src/proc/thread.c (modified) (6 diffs)

kernel/generic/src/proc/thread.c

@@ -76 +76 @@
 
 /** Thread states */
-char *thread_states[] = {
+const char *thread_states[] = {
         "Invalid",
         "Running",
@@ -264 +264 @@
 
         atomic_inc(&nrdy);
+        // FIXME: Why is the avg value never read?
         avg = atomic_get(&nrdy) / config.cpu_active;
         atomic_inc(&cpu->nrdy);
@@ -288 +289 @@
  */
 thread_t *thread_create(void (* func)(void *), void *arg, task_t *task,
-    int flags, char *name, bool uncounted)
+    int flags, const char *name, bool uncounted)
 {
         thread_t *t;
@@ -501 +502 @@
 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 +583 @@
 {
         waitq_t wq;
-                                  
+        
         waitq_initialize(&wq);
-
+        
         (void) waitq_sleep_timeout(&wq, usec, SYNCH_FLAGS_NON_BLOCKING);
 }
@@ -812 +820 @@
 }
 
+/** Syscall wrapper for sleeping. */
+unative_t sys_thread_usleep(uint32_t usec)
+{
+        thread_usleep(usec);
+        return 0;
+}
+
 /** @}
  */