WebSVN – HelenOS – Diff – /branches/tracing/kernel/generic/src/proc/task.c

 /**
  * @file
  * @brief   Task management.
  */
-#include <main/uinit.h>
 #include <proc/thread.h>
 #include <proc/task.h>
-#include <proc/uarg.h>
 #include <mm/as.h>
 #include <mm/slab.h>
 #include <atomic.h>
 #include <synch/spinlock.h>
 #include <synch/waitq.h>
 #include <arch.h>
 #include <arch/barrier.h>
-#include <panic.h>
 #include <adt/avl.h>
 #include <adt/btree.h>
 #include <adt/list.h>
 #include <ipc/ipc.h>
-#include <security/cap.h>
+#include <ipc/ipcrsc.h>
-#include <memstr.h>
 #include <print.h>
-#include <lib/elf.h>
 #include <errno.h>
 #include <func.h>
 #include <syscall/copy.h>
-#ifndef LOADED_PROG_STACK_PAGES_NO
-#define LOADED_PROG_STACK_PAGES_NO 1
-#endif
 /** Spinlock protecting the tasks_tree AVL tree. */
 SPINLOCK_INITIALIZE(tasks_lock);
 /** AVL tree of active tasks.
+ *
  */
 avltree_t tasks_tree;
 static task_id_t task_counter = 0;
-/** Initialize tasks
- *
- * Initialize kernel tasks support.
+/** Initialize kernel tasks support. */
- *
- */
 void task_init(void)
+{
     TASK = NULL;
     avltree_create(&tasks_tree);
+}
 /*
- * The idea behind this walker is to remember a single task different from TASK.
+ * The idea behind this walker is to remember a single task different from
+ * TASK.
  */
 static bool task_done_walker(avltree_node_t *node, void *arg)
+{
     task_t *t = avltree_get_instance(node, task_t, tasks_tree_node);
     task_t **tp = (task_t **) arg;
+    }
     return true;    /* continue the walk */
+}
-/** Kill all tasks except the current task.
+/** Kill all tasks except the current task. */
- *
- */
 void task_done(void)
+{
     task_t *t;
     do { /* Repeat until there are any tasks except TASK */
+        }
     } while (t != NULL);
+}
-/** Create new task
- *
- * Create new task with no threads.
+/** Create new task with no threads.
+ *
- * @param as Task's address space.
+ * @param as        Task's address space.
- * @param name Symbolic name.
+ * @param name      Symbolic name.
+ *
- * @return New task's structure
+ * @return      New task's structure.
+ *
  */
 task_t *task_create(as_t *as, char *name)
+{
     ipl_t ipl;
     if ((ipc_phone_0) && (context_check(ipc_phone_0->task->context,
         ta->context)))
         ipc_phone_connect(&ta->phones[0], ipc_phone_0);
     atomic_set(&ta->active_calls, 0);
-    mutex_initialize(&ta->futexes_lock);
+    mutex_initialize(&ta->futexes_lock, MUTEX_PASSIVE);
     btree_create(&ta->futexes);
     ipl = interrupts_disable();
     /*
     return ta;
+}
 /** Destroy task.
+ *
- * @param t Task to be destroyed.
+ * @param t     Task to be destroyed.
  */
 void task_destroy(task_t *t)
+{
     /*
      * Remove the task from the task B+tree.
     TASK = NULL;
+}
 /** Syscall for reading task ID from userspace.
+ *
- * @param uspace_task_id Userspace address of 8-byte buffer where to store
+ * @param       uspace_task_id userspace address of 8-byte buffer
- * current task ID.
+ *          where to store current task ID.
+ *
- * @return 0 on success or an error code from @ref errno.h.
+ * @return      Zero on success or an error code from @ref errno.h.
  */
 unative_t sys_task_get_id(task_id_t *uspace_task_id)
+{
     /*
-     * No need to acquire lock on TASK because taskid
+     * No need to acquire lock on TASK because taskid remains constant for
-     * remains constant for the lifespan of the task.
+     * the lifespan of the task.
      */
     return (unative_t) copy_to_uspace(uspace_task_id, &TASK->taskid,
         sizeof(TASK->taskid));
+}
-unative_t sys_task_spawn(void *image, size_t size)
-{
-    void *kimage = malloc(size, 0);
-    if (kimage == NULL)
-        return ENOMEM;
-    int rc = copy_from_uspace(kimage, image, size);
-    if (rc != EOK)
-        return rc;
-    /*
-     * Not very efficient and it would be better to call it on code only,
-     * but this whole function is a temporary hack anyway and one day it
-     * will go in favor of the userspace dynamic loader.
-     */
-    smc_coherence_block(kimage, size);
-    uspace_arg_t *kernel_uarg;
-    kernel_uarg = (uspace_arg_t *) malloc(sizeof(uspace_arg_t), 0);
-    if (kernel_uarg == NULL) {
-        free(kimage);
-        return ENOMEM;
-    }
-    kernel_uarg->uspace_entry =
-        (void *) ((elf_header_t *) kimage)->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_t *as = as_create(0);
-    if (as == NULL) {
-        free(kernel_uarg);
-        free(kimage);
-        return ENOMEM;
-    }
-    unsigned int erc = elf_load((elf_header_t *) kimage, as);
-    if (erc != EE_OK) {
-        as_destroy(as);
-        free(kernel_uarg);
-        free(kimage);
-        return ENOENT;
-    }
-    as_area_t *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) {
-        as_destroy(as);
-        free(kernel_uarg);
-        free(kimage);
-        return ENOMEM;
-    }
-    task_t *task = task_create(as, "app");
-    if (task == NULL) {
-        as_destroy(as);
-        free(kernel_uarg);
-        free(kimage);
-        return ENOENT;
-    }
-    // FIXME: control the capabilities
-    cap_set(task, cap_get(TASK));
-    thread_t *thread = thread_create(uinit, kernel_uarg, task,
-        THREAD_FLAG_USPACE, "user", false);
-    if (thread == NULL) {
-        task_destroy(task);
-        as_destroy(as);
-        free(kernel_uarg);
-        free(kimage);
-        return ENOENT;
-    }
-    thread_ready(thread);
-    return EOK;
-}
 /** Find task structure corresponding to task ID.
+ *
- * The tasks_lock must be already held by the caller of this function
+ * The tasks_lock must be already held by the caller of this function and
- * and interrupts must be disabled.
+ * interrupts must be disabled.
+ *
- * @param id Task ID.
+ * @param id        Task ID.
+ *
- * @return Task structure address or NULL if there is no such task ID.
+ * @return      Task structure address or NULL if there is no such task
+ *          ID.
  */
-task_t *task_find_by_id(task_id_t id)
+task_t *task_find_by_id(task_id_t id) { avltree_node_t *node;
-{
-    avltree_node_t *node;
     node = avltree_search(&tasks_tree, (avltree_key_t) id);
     if (node)
         return avltree_get_instance(node, task_t, tasks_tree_node);
     return NULL;
+}
 /** Get accounting data of given task.
+ *
- * Note that task lock of 't' must be already held and
+ * Note that task lock of 't' must be already held and interrupts must be
- * interrupts must be already disabled.
+ * already disabled.
+ *
- * @param t Pointer to thread.
+ * @param t     Pointer to thread.
+ *
+ * @return      Number of cycles used by the task and all its threads
+ *          so far.
  */
 uint64_t task_get_accounting(task_t *t)
+{
     /* Accumulated value of task */
     uint64_t ret = t->cycles;
 /** Kill task.
+ *
  * This function is idempotent.
  * It signals all the task's threads to bail it out.
+ *
- * @param id ID of the task to be killed.
+ * @param id        ID of the task to be killed.
+ *
- * @return 0 on success or an error code from errno.h
+ * @return      Zero on success or an error code from errno.h.
  */
 int task_kill(task_id_t id)
+{
     ipl_t ipl;
     task_t *ta;
         return ENOENT;
+    }
     spinlock_unlock(&tasks_lock);
     /*
-     * Interrupt all threads except ktaskclnp.
+     * Interrupt all threads.
      */
     spinlock_lock(&ta->lock);
     for (cur = ta->th_head.next; cur != &ta->th_head; cur = cur->next) {
         thread_t *thr;
         bool sleeping = false;

Subversion Repositories HelenOS

(root)/branches/tracing/kernel/generic/src/proc/task.c – Rev 3424 → 3425