Changeset 0f250f9 in mainline for generic

Timestamp:

2006-03-17T18:07:56Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

69f293e

Parents:

6c6a19e6

Message:

Improved uspace threads.
ia64 needs fixing.

Location:

generic

Files:

• include/proc/thread.h (modified) (3 diffs)
• include/proc/uarg.h (added)
• src/main/uinit.c (modified) (1 diff)
• src/proc/task.c (modified) (4 diffs)
• src/proc/thread.c (modified) (3 diffs)

generic/include/proc/thread.h

@@ -41 +41 @@
 #include <adt/list.h>
 #include <mm/slab.h>
+#include <proc/uarg.h>
 
 #define THREAD_STACK_SIZE       STACK_SIZE
@@ -118 +119 @@
 };
 
-/** Structure passed to uinit kernel thread as argument. */
-typedef struct uspace_arg {
-        __address uspace_entry;
-        __address uspace_stack;
-} uspace_arg_t;
-
 /** Thread list lock.
  *
@@ -150 +145 @@
 
 /** Thread syscall prototypes. */
-__native sys_thread_create(__address function, void *arg, void *stack, char *name);
-__native sys_thread_exit(int status);
+__native sys_thread_create(uspace_arg_t *uspace_uarg, char *uspace_name);
+__native sys_thread_exit(int uspace_status);
 
 #endif

generic/src/main/uinit.c

@@ -44 +44 @@
         uarg.uspace_entry = ((uspace_arg_t *) arg)->uspace_entry;
         uarg.uspace_stack = ((uspace_arg_t *) arg)->uspace_stack;
+        uarg.uspace_uarg = ((uspace_arg_t *) arg)->uspace_uarg;
+        uarg.uspace_thread_function = NULL;
+        uarg.uspace_thread_arg = NULL;
 
         free((uspace_arg_t *) arg);

generic/src/proc/task.c

@@ -30 +30 @@
 #include <proc/thread.h>
 #include <proc/task.h>
+#include <proc/uarg.h>
 #include <mm/as.h>
 #include <mm/slab.h>
-
 #include <synch/spinlock.h>
 #include <arch.h>
@@ -40 +40 @@
 #include <memstr.h>
 #include <print.h>
-
 #include <elf.h>
 
@@ -116 +115 @@
         thread_t *t;
         task_t *task;
-        uspace_arg_t *uarg;
+        uspace_arg_t *kernel_uarg;
 
         as = as_create(0);
@@ -126 +125 @@
         } 
         
-        uarg = (uspace_arg_t *) malloc(sizeof(uspace_arg_t), 0);
-        uarg->uspace_entry = (__address) ((elf_header_t *) program_addr)->e_entry;
-        uarg->uspace_stack = USTACK_ADDRESS;
+        kernel_uarg = (uspace_arg_t *) malloc(sizeof(uspace_arg_t), 0);
+        kernel_uarg->uspace_entry = (void *) ((elf_header_t *) program_addr)->e_entry;
+        kernel_uarg->uspace_stack = (void *) USTACK_ADDRESS;
+        kernel_uarg->uspace_thread_function = NULL;
+        kernel_uarg->uspace_thread_arg = NULL;
+        kernel_uarg->uspace_uarg = NULL;
         
         task = task_create(as, name);
-        t = thread_create(uinit, uarg, task, 0, "uinit");
+        t = thread_create(uinit, kernel_uarg, task, 0, "uinit");
         
         /*

generic/src/proc/thread.c

@@ -30 +30 @@
 #include <proc/thread.h>
 #include <proc/task.h>
+#include <proc/uarg.h>
 #include <mm/frame.h>
 #include <mm/page.h>
@@ -430 +431 @@
  *
  */
-__native sys_thread_create(__address function, void *arg, void *stack, char *name)
+__native sys_thread_create(uspace_arg_t *uspace_uarg, char *uspace_name)
 {
         thread_t *t;
         char namebuf[THREAD_NAME_BUFLEN];
-        uspace_arg_t *uarg;
+        uspace_arg_t *kernel_uarg;              /* TODO: store kernel_uarg in thread_t */
         __u32 tid;
 
-        copy_from_uspace(namebuf, name, THREAD_NAME_BUFLEN);
-        uarg = (uspace_arg_t *) malloc(sizeof(uarg), 0);
-        
-        uarg->uspace_entry = function;
-        uarg->uspace_stack = (__address) stack;
-
-        if ((t = thread_create(uinit, uarg, TASK, 0, namebuf))) {
+        copy_from_uspace(namebuf, uspace_name, THREAD_NAME_BUFLEN);
+
+        kernel_uarg = (uspace_arg_t *) malloc(sizeof(uspace_arg_t), 0); 
+        copy_from_uspace(kernel_uarg, uspace_uarg, sizeof(uspace_arg_t));
+
+        if ((t = thread_create(uinit, kernel_uarg, TASK, 0, namebuf))) {
                 tid = t->tid;
                 thread_ready(t);
                 return (__native) tid; 
         } else {
-                free(namebuf);
+                free(kernel_uarg);
         }
 
@@ -457 +457 @@
  *
  */
-__native sys_thread_exit(int status)
+__native sys_thread_exit(int uspace_status)
 {
         thread_exit();