Changeset 1affcdf3 in mainline for kernel/generic/src/proc/thread.c

Timestamp:

2011-06-10T19:33:41Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

1878386

Parents:

13ecdac9 (diff), 79a141a (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) (9 diffs)

kernel/generic/src/proc/thread.c

@@ -55 +55 @@
 #include <time/clock.h>
 #include <time/timeout.h>
+#include <time/delay.h>
 #include <config.h>
 #include <arch/interrupt.h>
@@ -67 +68 @@
 #include <syscall/copy.h>
 #include <errno.h>
-
-
-#ifndef LOADED_PROG_STACK_PAGES_NO
-#define LOADED_PROG_STACK_PAGES_NO 1
-#endif
-
 
 /** Thread states */
@@ -300 +295 @@
         
         /* Not needed, but good for debugging */
-        memsetb(thread->kstack, THREAD_STACK_SIZE * 1 << STACK_FRAMES, 0);
+        memsetb(thread->kstack, STACK_SIZE, 0);
         
         irq_spinlock_lock(&tidlock, true);
@@ -308 +303 @@
         context_save(&thread->saved_context);
         context_set(&thread->saved_context, FADDR(cushion),
-            (uintptr_t) thread->kstack, THREAD_STACK_SIZE);
+            (uintptr_t) thread->kstack, STACK_SIZE);
         
         the_initialize((the_t *) thread->kstack);
@@ -605 +600 @@
                 printf("%-8" PRIu64 " %-14s %10p %-8s %10p %-5" PRIu32 "\n",
                     thread->tid, name, thread, thread_states[thread->state],
-                    thread->task, thread->task->context);
+                    thread->task, thread->task->container);
 #endif
         
@@ -617 +612 @@
                 printf("%-8" PRIu64 " %-14s %18p %-8s %18p %-5" PRIu32 "\n",
                     thread->tid, name, thread, thread_states[thread->state],
-                    thread->task, thread->task->context);
+                    thread->task, thread->task->container);
 #endif
         
@@ -658 +653 @@
         else
                 printf("[id    ] [name        ] [address ] [state ] [task    ]"
-                    " [ctx]\n");
+                    " [ctn]\n");
 #endif
         
@@ -667 +662 @@
         } else
                 printf("[id    ] [name        ] [address         ] [state ]"
-                    " [task            ] [ctx]\n");
+                    " [task            ] [ctn]\n");
 #endif
         
@@ -918 +913 @@
 }
 
+sysarg_t sys_thread_udelay(uint32_t usec)
+{
+        delay(usec);
+        return 0;
+}
+
 /** @}
  */