Changeset 9f52563 in mainline for generic/src

Timestamp:

2006-03-17T01:34:36Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

8a0b0669

Parents:

5fceec7

Message:

Support for user space threads.

Location:

generic/src

Files:

• main/uinit.c (modified) (1 diff)
• proc/task.c (modified) (2 diffs)
• proc/thread.c (modified) (3 diffs)
• syscall/syscall.c (modified) (3 diffs)

generic/src/main/uinit.c

@@ -31 +31 @@
 #include <proc/thread.h>
 #include <userspace.h>
+#include <mm/slab.h>
 #include <print.h>
 
+/** Thread used to bring up userspace thread.
+ *
+ * @param arg Pointer to structure containing userspace entry and stack addresses.
+ */
 void uinit(void *arg)
 {
-        printf("USER task, uinit thread: kernel mode\n");
-        userspace((__address)(arg));
+        uspace_arg_t uarg;
+        
+        uarg.uspace_entry = ((uspace_arg_t *) arg)->uspace_entry;
+        uarg.uspace_stack = ((uspace_arg_t *) arg)->uspace_stack;
+
+        free((uspace_arg_t *) arg);
+        
+        userspace(&uarg);
 }

generic/src/proc/task.c

@@ -116 +116 @@
         thread_t *t;
         task_t *task;
+        uspace_arg_t *uarg;
 
         as = as_create(0);
@@ -125 +126 @@
         } 
         
+        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;
+        
         task = task_create(as, name);
-        t = thread_create(uinit, (void *)((elf_header_t *)program_addr)->e_entry, 
-                          task, 0, "uinit");
+        t = thread_create(uinit, uarg, task, 0, "uinit");
         
         /*

generic/src/proc/thread.c

@@ -54 +54 @@
 #include <mm/slab.h>
 #include <debug.h>
+#include <main/uinit.h>
 
 char *thread_states[] = {"Invalid", "Running", "Sleeping", "Ready", "Entering", "Exiting"}; /**< Thread states */
@@ -281 +282 @@
         interrupts_restore(ipl);
         
-        t->name = name;
+        memcpy(t->name, name, THREAD_NAME_BUFLEN);
+        
         t->thread_code = func;
         t->thread_arg = arg;
@@ -424 +426 @@
         interrupts_restore(ipl);
 }
+
+/** Process syscall to create new thread.
+ *
+ */
+__native sys_thread_create(__address function, void *arg, void *stack, char *name)
+{
+        thread_t *t;
+        char namebuf[THREAD_NAME_BUFLEN];
+        uspace_arg_t *uarg;
+        __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))) {
+                tid = t->tid;
+                thread_ready(t);
+                return (__native) tid; 
+        } else {
+                free(namebuf);
+        }
+
+        return (__native) -1;
+}
+
+/** Process syscall to terminate thread.
+ *
+ */
+__native sys_thread_exit(int status)
+{
+        thread_exit();
+        /* Unreachable */
+        return 0;
+}

generic/src/syscall/syscall.c

@@ -38 +38 @@
 #include <ipc/sysipc.h>
 
-static __native sys_ctl(void) {
-        printf("Thread finished\n");
-        thread_exit();
-        /* Unreachable */
-        return 0;
-}
-
 static __native sys_io(int fd, const void * buf, size_t count) {
         
@@ -56 +49 @@
         return count;
 }
-
 
 static __native sys_mmap(void *address, size_t size, int flags)
@@ -72 +64 @@
 
 syshandler_t syscall_table[SYSCALL_END] = {
-        sys_ctl,
         sys_io,
+        sys_thread_create,
+        sys_thread_exit,
         sys_mmap,
         sys_mremap,