Context Navigation

-              rb658c5d
+              r5ba201d
 /**
  * @file
  * @brief       Task management.
+ * @brief Task management.
  */
 …
  * The task is guaranteed to exist after it was found in the tasks_tree as
  * long as:
+ *
  * @li the tasks_lock is held,
  * @li the task's lock is held when task's lock is acquired before releasing
 …
         task_t *t = avltree_get_instance(node, task_t, tasks_tree_node);
         unsigned *cnt = (unsigned *) arg;
         if (t != TASK) {
                 (*cnt)++;
 …
                 task_kill_internal(t);
+        }
+        return true;    /* continue the walk */
+        /* Continue the walk */
+        return true;
+}
 …
+{
         unsigned tasks_left;
         do { /* Repeat until there are any tasks except TASK */
                 /* Messing with task structures, avoid deadlock */
 …
         task_t *ta = obj;
         int i;
         atomic_set(&ta->refcount, 0);
         atomic_set(&ta->lifecount, 0);
         atomic_set(&ta->active_calls, 0);
         spinlock_initialize(&ta->lock, "task_ta_lock");
         mutex_initialize(&ta->futexes_lock, MUTEX_PASSIVE);
         list_initialize(&ta->th_head);
         list_initialize(&ta->sync_box_head);
         ipc_answerbox_init(&ta->answerbox, ta);
         for (i = 0; i < IPC_MAX_PHONES; i++)
                 ipc_phone_init(&ta->phones[i]);
 #ifdef CONFIG_UDEBUG
         /* Init kbox stuff */
 …
         mutex_initialize(&ta->kb.cleanup_lock, MUTEX_PASSIVE);
 #endif
         return 0;
+}
 …
 /** Create new task with no threads.
+ *
  * @param as            Task's address space.
  * @param name          Symbolic name (a copy is made).
+ *
  * @return              New task's structure.
+ * @param as   Task's address space.
+ * @param name Symbolic name (a copy is made).
+ *
+ * @return New task's structure.
+ *
  */
 …
         memcpy(ta->name, name, TASK_NAME_BUFLEN);
         ta->name[TASK_NAME_BUFLEN - 1] = 0;
         ta->context = CONTEXT;
         ta->capabilities = 0;
         ta->cycles = 0;
 #ifdef CONFIG_UDEBUG
         /* Init debugging stuff */
         udebug_task_init(&ta->udebug);
         /* Init kbox stuff */
         ta->kb.finished = false;
 #endif
         if ((ipc_phone_0) &&
             (context_check(ipc_phone_0->task->context, ta->context)))
                 ipc_phone_connect(&ta->phones[0], ipc_phone_0);
         btree_create(&ta->futexes);
 …
 /** Destroy task.
+ *
+ * @param t             Task to be destroyed.
+ * @param t Task to be destroyed.
+ *
  */
 void task_destroy(task_t *t)
 …
         avltree_delete(&tasks_tree, &t->tasks_tree_node);
         spinlock_unlock(&tasks_lock);
         /*
          * Perform architecture specific task destruction.
          */
         task_destroy_arch(t);
         /*
          * Free up dynamically allocated state.
          */
         btree_destroy(&t->futexes);
         /*
          * Drop our reference to the address space.
 …
 /** Syscall for reading task ID from userspace.
+ *
+ * @param               uspace_task_id userspace address of 8-byte buffer
+ *                      where to store current task ID.
+ *
+ * @return              Zero on success or an error code from @ref errno.h.
+ * @param uspace_task_id Userspace address of 8-byte buffer
+ *                       where to store current task ID.
+ *
+ * @return Zero on success or an error code from @ref errno.h.
+ *
  */
 unative_t sys_task_get_id(task_id_t *uspace_task_id)
 …
  * The name simplifies identifying the task in the task list.
+ *
  * @param name  The new name for the task. (typically the same
  *              as the command used to execute it).
+ * @param name The new name for the task. (typically the same
+ *             as the command used to execute it).
+ *
  * @return 0 on success or an error code from @ref errno.h.
+ *
  */
 unative_t sys_task_set_name(const char *uspace_name, size_t name_len)
 …
         int rc;
         char namebuf[TASK_NAME_BUFLEN];
         /* Cap length of name and copy it from userspace. */
         if (name_len > TASK_NAME_BUFLEN - 1)
                 name_len = TASK_NAME_BUFLEN - 1;
         rc = copy_from_uspace(namebuf, uspace_name, name_len);
         if (rc != 0)
                 return (unative_t) rc;
         namebuf[name_len] = '\0';
         str_cpy(TASK->name, TASK_NAME_BUFLEN, namebuf);
         return EOK;
+}
 …
  * interrupts must be disabled.
+ *
+ * @param id            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) { avltree_node_t *node;
+ * @param id 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)
+{
+        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;
+}
 …
  * already disabled.
+ *
+ * @param t             Pointer to thread.
+ *
+ * @return              Number of cycles used by the task and all its threads
+ *                      so far.
+ * @param t Pointer to task.
+ *
+ * @return Number of cycles used by the task and all its threads
+ *         so far.
+ *
  */
 uint64_t task_get_accounting(task_t *t)
 …
+{
         link_t *cur;
         /*
          * Interrupt all threads.
 …
  * It signals all the task's threads to bail it out.
+ *
+ * @param id            ID of the task to be killed.
+ *
+ * @return              Zero on success or an error code from errno.h.
+ * @param id ID of the task to be killed.
+ *
+ * @return Zero on success or an error code from errno.h.
+ *
  */
 int task_kill(task_id_t id)
 …
         task_t *t = avltree_get_instance(node, task_t, tasks_tree_node);
         int j;
         spinlock_lock(&t->lock);
         uint64_t cycles;
         char suffix;
         order(task_get_accounting(t), &cycles, &suffix);
 #ifdef __32_BITS__
+#ifdef __32_BITS__
         printf("%-6" PRIu64 " %-12s %-3" PRIu32 " %10p %10p %9" PRIu64
             "%c %7ld %6ld", t->taskid, t->name, t->context, t, t->as, cycles,
             suffix, atomic_get(&t->refcount), atomic_get(&t->active_calls));
 #endif
 #ifdef __64_BITS__
         printf("%-6" PRIu64 " %-12s %-3" PRIu32 " %18p %18p %9" PRIu64
 …
             suffix, atomic_get(&t->refcount), atomic_get(&t->active_calls));
 #endif
         for (j = 0; j < IPC_MAX_PHONES; j++) {
                 if (t->phones[j].callee)
 …
+        }
         printf("\n");
         spinlock_unlock(&t->lock);
         return true;
 …
         ipl = interrupts_disable();
         spinlock_lock(&tasks_lock);
 #ifdef __32_BITS__
+#ifdef __32_BITS__
         printf("taskid name         ctx address    as         "
             "cycles     threads calls  callee\n");
 …
             "---------- ------- ------ ------>\n");
 #endif
 #ifdef __64_BITS__
         printf("taskid name         ctx address            as                 "
 …
             "---------- ------- ------ ------>\n");
 #endif
         avltree_walk(&tasks_tree, task_print_walker, NULL);
         spinlock_unlock(&tasks_lock);
         interrupts_restore(ipl);

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 5ba201d in mainline

Legend:

kernel/generic/src/proc/task.c

Download in other formats: