WebSVN – HelenOS – Diff – /branches/dynload/kernel/generic/src/proc/thread.c

 #include <mm/slab.h>
 #include <debug.h>
 #include <main/uinit.h>
 #include <syscall/copy.h>
 #include <errno.h>
-#include <console/klog.h>
+#ifndef LOADED_PROG_STACK_PAGES_NO
+#define LOADED_PROG_STACK_PAGES_NO 1
+#endif
 /** Thread states */
 char *thread_states[] = {
     "Invalid",
          * threads can only be created by threads of the same task.
          * We are safe to perform cleanup.
          */
         if (THREAD->flags & THREAD_FLAG_USPACE) {
             ipc_cleanup();
-                futex_cleanup();
+            futex_cleanup();
-            klog_printf("Cleanup of task %llu completed.",
+            LOG("Cleanup of task %" PRIu64" completed.", TASK->taskid);
-                TASK->taskid);
+        }
+    }
 restart:
     ipl = interrupts_disable();
     interrupts_restore(ipl);
+}
 static bool thread_walker(avltree_node_t *node, void *arg)
+{
-    thread_t *t;
-    t = avltree_get_instance(node, thread_t, threads_tree_node);
+    thread_t *t = avltree_get_instance(node, thread_t, threads_tree_node);
     uint64_t cycles;
     char suffix;
     order(t->cycles, &cycles, &suffix);
-    if (sizeof(void *) == 4)
+#ifdef __32_BITS__
-        printf("%-6llu %-10s %#10zx %-8s %#10zx %-3ld %#10zx %#10zx %9llu%c ",
+    printf("%-6" PRIu64" %-10s %10p %-8s %10p %-3" PRIu32 " %10p %10p %9" PRIu64 "%c ",
-            t->tid, t->name, t, thread_states[t->state], t->task,
+        t->tid, t->name, t, thread_states[t->state], t->task,
-            t->task->context, t->thread_code, t->kstack, cycles, suffix);
+        t->task->context, t->thread_code, t->kstack, cycles, suffix);
-    else
+#endif
+#ifdef __64_BITS__
-        printf("%-6llu %-10s %#18zx %-8s %#18zx %-3ld %#18zx %#18zx %9llu%c ",
+    printf("%-6" PRIu64" %-10s %18p %-8s %18p %-3" PRIu32 " %18p %18p %9" PRIu64 "%c ",
-            t->tid, t->name, t, thread_states[t->state], t->task,
+        t->tid, t->name, t, thread_states[t->state], t->task,
-            t->task->context, t->thread_code, t->kstack, cycles, suffix);
+        t->task->context, t->thread_code, t->kstack, cycles, suffix);
+#endif
     if (t->cpu)
-        printf("%-4zd", t->cpu->id);
+        printf("%-4u", t->cpu->id);
     else
         printf("none");
     if (t->state == Sleeping) {
-        if (sizeof(uintptr_t) == 4)
+#ifdef __32_BITS__
-            printf(" %#10zx", t->sleep_queue);
+        printf(" %10p", t->sleep_queue);
-        else
+#endif
+#ifdef __64_BITS__
-            printf(" %#18zx", t->sleep_queue);
+        printf(" %18p", t->sleep_queue);
+#endif
+    }
     printf("\n");
     return true;
     ipl_t ipl;
     /* Messing with thread structures, avoid deadlock */
     ipl = interrupts_disable();
     spinlock_lock(&threads_lock);
-    if (sizeof(uintptr_t) == 4) {
+#ifdef __32_BITS__
-        printf("tid    name       address    state    task       "
+    printf("tid    name       address    state    task       "
-            "ctx code       stack      cycles     cpu  "
+        "ctx code       stack      cycles     cpu  "
-            "waitqueue\n");
+        "waitqueue\n");
-        printf("------ ---------- ---------- -------- ---------- "
+    printf("------ ---------- ---------- -------- ---------- "
-            "--- ---------- ---------- ---------- ---- "
+        "--- ---------- ---------- ---------- ---- "
-            "----------\n");
+        "----------\n");
-    } else {
+#endif
+#ifdef __64_BITS__
-        printf("tid    name       address            state    task               "
+    printf("tid    name       address            state    task               "
-            "ctx code               stack              cycles     cpu  "
+        "ctx code               stack              cycles     cpu  "
-            "waitqueue\n");
+        "waitqueue\n");
-        printf("------ ---------- ------------------ -------- ------------------ "
+    printf("------ ---------- ------------------ -------- ------------------ "
-            "--- ------------------ ------------------ ---------- ---- "
+        "--- ------------------ ------------------ ---------- ---- "
-            "------------------\n");
+        "------------------\n");
-    }
+#endif
     avltree_walk(&threads_tree, thread_walker, NULL);
     spinlock_unlock(&threads_lock);
     interrupts_restore(ipl);
     return node != NULL;
+}
+/** Create new user task with 1 thread from image
+ *
+ * @param program_addr Address of program executable image.
+ * @param name Program name.
+ *
+ * @return Initialized main thread of the task or NULL on error.
+ */
+thread_t *thread_create_program(void *program_addr, char *name)
+{
+    as_t *as;
+    as_area_t *area;
+    unsigned int rc;
+    task_t *task;
+    uspace_arg_t *kernel_uarg;
+    kernel_uarg = (uspace_arg_t *) malloc(sizeof(uspace_arg_t), 0);
+    if (kernel_uarg == NULL)
+        return NULL;
+    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;
+    as = as_create(0);
+    if (as == NULL) {
+        free(kernel_uarg);
+        return NULL;
+    }
+    rc = elf_load((elf_header_t *) program_addr, as);
+    if (rc != EE_OK) {
+        free(kernel_uarg);
+        as_destroy(as);
+        return NULL;
+    }
+    /*
+     * Create the data as_area.
+     */
+    area = as_area_create(as,
+        AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE,
+        LOADED_PROG_STACK_PAGES_NO * PAGE_SIZE, USTACK_ADDRESS,
+        AS_AREA_ATTR_NONE, &anon_backend, NULL);
+    if (area == NULL) {
+        free(kernel_uarg);
+        as_destroy(as);
+        return NULL;
+    }
+    task = task_create(as, name);
+    if (task == NULL) {
+        free(kernel_uarg);
+        as_destroy(as);
+        return NULL;
+    }
+    /*
+     * Create the main thread.
+     */
+    return thread_create(uinit, kernel_uarg, task, THREAD_FLAG_USPACE,
+        "uinit", false);
+}
 /** Update accounting of current thread.
+ *
  * Note that thread_lock on THREAD must be already held and
  * interrupts must be already disabled.
+ *

Subversion Repositories HelenOS

(root)/branches/dynload/kernel/generic/src/proc/thread.c – Rev 2927 → 3149