Changeset e5a1f82f in mainline

Timestamp:

2006-03-17T18:09:15Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

81e55099

Parents:

11a4fbf

Message:

Improved uspace threads (uspace).

Files:

• init/init.c (modified) (3 diffs)
• libc/Makefile (modified) (1 diff)
• libc/arch/amd64/src/thread_entry.s (added)
• libc/arch/ia32/src/thread_entry.s (added)
• libc/arch/ia64/src/entry.s (modified) (1 diff)
• libc/arch/ia64/src/thread_entry.s (added)
• libc/arch/mips32/src/thread_entry.s (added)
• libc/generic/thread.c (modified) (2 diffs)
• libc/include/thread.h (modified) (1 diff)

init/init.c

@@ -38 +38 @@
 void utest(void *arg)
 {
-//      printf("Uspace thread created.\n");
+//      printf("Uspace thread started.\n");
         for (;;)
                 ;
@@ -190 +190 @@
 {
         int tid;
-        char *stack;
         version_print();
 
@@ -199 +198 @@
         test_connection_ipc();
         
-        stack = (char *) malloc(getpagesize());
-        if (!stack) {
-                printf("Malloc failed.\n");
-        } else {
-                if ((tid = thread_create(utest, NULL, stack, "utest") != -1)) {
-                        printf("Created thread tid=%d\n", tid);
-                }
+        if ((tid = thread_create(utest, NULL, "utest") != -1)) {
+                printf("Created thread tid=%d\n", tid);
         }
         

libc/Makefile

@@ -52 +52 @@
 
 ARCH_SOURCES += \
-        arch/$(ARCH)/src/entry.s
+        arch/$(ARCH)/src/entry.s \
+        arch/$(ARCH)/src/thread_entry.s
 
 GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))

libc/arch/ia64/src/entry.s

@@ -37 +37 @@
 #
 __entry:
+        alloc loc0 = ar.pfs, 0, 1, 2, 0
         mov r1 = _gp 
         { br.call.sptk.many b0 = main }

libc/generic/thread.c

@@ -29 +29 @@
 #include <thread.h>
 #include <libc.h>
+#include <stdlib.h>
 #include <arch/faddr.h>
+#include <kernel/proc/uarg.h>
 
-typedef void (* voidfunc_t)(void);
+void thread_main(uspace_arg_t *uarg)
+{
+        uarg->uspace_thread_function(uarg->uspace_thread_arg);
+        free(uarg->uspace_stack);
+        free(uarg);
+        thread_exit(0);
+}
 
-int thread_create(void (* function)(void *), void *arg, void *stack, char *name)
+int thread_create(void (* function)(void *), void *arg, char *name)
 {
-        return __SYSCALL4(SYS_THREAD_CREATE, (sysarg_t) FADDR((voidfunc_t) function), (sysarg_t) arg, (sysarg_t) stack, (sysarg_t) name);
+        char *stack;
+        uspace_arg_t *uarg;
+
+        stack = (char *) malloc(getpagesize());
+        if (!stack)
+                return -1;
+                
+        uarg = (uspace_arg_t *) malloc(sizeof(uspace_arg_t));
+        if (!uarg) {
+                free(stack);
+                return -1;
+        }
+        uarg->uspace_entry = (void *) FADDR(__thread_entry);
+        uarg->uspace_stack = (void *) stack;
+        uarg->uspace_thread_function = (void *) FADDR(function);
+        uarg->uspace_thread_arg = arg;
+        uarg->uspace_uarg = uarg;
+        
+        return __SYSCALL2(SYS_THREAD_CREATE, (sysarg_t) uarg, (sysarg_t) name);
 }
 
@@ -42 +68 @@
         __SYSCALL1(SYS_THREAD_EXIT, (sysarg_t) status);
 }
-

libc/include/thread.h

@@ -30 +30 @@
 #define __LIBC__THREAD_H__
 
-int thread_create(void (* function)(void *arg), void *arg, void *stack, char *name);
-void thread_exit(int status);
+#include <kernel/proc/uarg.h>
+
+extern void __thread_entry(void);
+extern void thread_main(uspace_arg_t *uarg);
+
+extern int thread_create(void (* function)(void *arg), void *arg, char *name);
+extern void thread_exit(int status);
 
 #endif