Changeset 2902e1bb in mainline for kernel/generic/src

Timestamp:

2012-06-13T13:17:46Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

1d4024cf, 375e501

Parents:

faba839

Message:

add support for variable uspace stack size
create individual address space areas for stacks of additional threads (instead of allocating the stack from heap)
avoid memory leaks in program_create()

Location:

kernel/generic/src

Files:

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

kernel/generic/src/main/uinit.c

@@ -56 +56 @@
 void uinit(void *arg)
 {
-        uspace_arg_t uarg;
-        
         /*
          * So far, we don't have a use for joining userspace threads so we
@@ -72 +70 @@
 #endif
         
-        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;
+        uspace_arg_t *uarg = (uspace_arg_t *) arg;
+        uspace_arg_t local_uarg;
         
-        free((uspace_arg_t *) arg);
+        local_uarg.uspace_entry = uarg->uspace_entry;
+        local_uarg.uspace_stack = uarg->uspace_stack;
+        local_uarg.uspace_stack_size = uarg->uspace_stack_size;
+        local_uarg.uspace_uarg = uarg->uspace_uarg;
+        local_uarg.uspace_thread_function = NULL;
+        local_uarg.uspace_thread_arg = NULL;
         
-        userspace(&uarg);
+        free(uarg);
+        
+        userspace(&local_uarg);
 }
 

kernel/generic/src/proc/program.c

@@ -71 +71 @@
 int program_create(as_t *as, uintptr_t entry_addr, char *name, program_t *prg)
 {
-        uspace_arg_t *kernel_uarg;
-        
-        kernel_uarg = (uspace_arg_t *) malloc(sizeof(uspace_arg_t), 0);
-        kernel_uarg->uspace_entry = (void *) entry_addr;
-        kernel_uarg->uspace_stack = (void *) USTACK_ADDRESS;
-        kernel_uarg->uspace_thread_function = NULL;
-        kernel_uarg->uspace_thread_arg = NULL;
-        kernel_uarg->uspace_uarg = NULL;
-        
         prg->loader_status = EE_OK;
         prg->task = task_create(as, name);
@@ -92 +83 @@
             AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE,
             STACK_SIZE, AS_AREA_ATTR_NONE, &anon_backend, NULL, &virt, 0);
-        if (!area)
+        if (!area) {
+                task_destroy(prg->task);
                 return ENOMEM;
+        }
+        
+        uspace_arg_t *kernel_uarg = (uspace_arg_t *)
+            malloc(sizeof(uspace_arg_t), 0);
+        
+        kernel_uarg->uspace_entry = (void *) entry_addr;
+        kernel_uarg->uspace_stack = (void *) virt;
+        kernel_uarg->uspace_stack_size = STACK_SIZE;
+        kernel_uarg->uspace_thread_function = NULL;
+        kernel_uarg->uspace_thread_arg = NULL;
+        kernel_uarg->uspace_uarg = NULL;
         
         /*
@@ -100 +103 @@
         prg->main_thread = thread_create(uinit, kernel_uarg, prg->task,
             THREAD_FLAG_USPACE, "uinit", false);
-        if (!prg->main_thread)
+        if (!prg->main_thread) {
+                free(kernel_uarg);
+                as_area_destroy(as, virt);
+                task_destroy(prg->task);
                 return ELIMIT;
+        }
         
         return EOK;

kernel/generic/src/proc/thread.c

@@ -854 +854 @@
          * In case of failure, kernel_uarg will be deallocated in this function.
          * In case of success, kernel_uarg will be freed in uinit().
-         *
          */
         uspace_arg_t *kernel_uarg =