Changes in kernel/generic/src/proc/task.c [5a6cc679:a35b458] in mainline

File:

• kernel/generic/src/proc/task.c (modified) (30 diffs)

kernel/generic/src/proc/task.c

@@ -56 +56 @@
 #include <print.h>
 #include <errno.h>
-#include <func.h>
+#include <halt.h>
 #include <str.h>
 #include <syscall/copy.h>
@@ -107 +107 @@
         task_t *task = avltree_get_instance(node, task_t, tasks_tree_node);
         size_t *cnt = (size_t *) arg;
-        
+
         if (task != TASK) {
                 (*cnt)++;
-                
+
 #ifdef CONFIG_DEBUG
                 printf("[%"PRIu64"] ", task->taskid);
 #endif
-                
+
                 task_kill_internal(task);
         }
-        
+
         /* Continue the walk */
         return true;
@@ -138 +138 @@
                 task_release(task_0);
         }
-        
+
         /* Repeat until there are any tasks except TASK */
         do {
@@ -144 +144 @@
                 printf("Killing tasks... ");
 #endif
-                
+
                 irq_spinlock_lock(&tasks_lock, true);
                 tasks_left = 0;
                 avltree_walk(&tasks_tree, task_done_walker, &tasks_left);
                 irq_spinlock_unlock(&tasks_lock, true);
-                
+
                 thread_sleep(1);
-                
+
 #ifdef CONFIG_DEBUG
                 printf("\n");
@@ -165 +165 @@
         if (rc != EOK)
                 return rc;
-        
+
         atomic_set(&task->refcount, 0);
         atomic_set(&task->lifecount, 0);
-        
+
         irq_spinlock_initialize(&task->lock, "task_t_lock");
-        
+
         list_initialize(&task->threads);
-        
+
         ipc_answerbox_init(&task->answerbox, task);
-        
+
         spinlock_initialize(&task->active_calls_lock, "active_calls_lock");
         list_initialize(&task->active_calls);
-                
+
 #ifdef CONFIG_UDEBUG
         /* Init kbox stuff */
@@ -184 +184 @@
         mutex_initialize(&task->kb.cleanup_lock, MUTEX_PASSIVE);
 #endif
-        
+
         return EOK;
 }
@@ -191 +191 @@
 {
         task_t *task = (task_t *) obj;
-        
+
         caps_task_free(task);
         return 0;
@@ -210 +210 @@
                 return NULL;
         }
-        
+
         task_create_arch(task);
-        
+
         task->as = as;
         str_cpy(task->name, TASK_NAME_BUFLEN, name);
-        
+
         task->container = CONTAINER;
         task->perms = 0;
@@ -231 +231 @@
 
         event_task_init(task);
-        
+
         task->answerbox.active = true;
 
@@ -237 +237 @@
         /* Init debugging stuff */
         udebug_task_init(&task->udebug);
-        
+
         /* Init kbox stuff */
         task->kb.box.active = true;
         task->kb.finished = false;
 #endif
-        
+
         if ((ipc_phone_0) &&
             (container_check(ipc_phone_0->task->container, task->container))) {
@@ -253 +253 @@
                         return NULL;
                 }
-                
+
                 kobject_t *phone_obj = kobject_get(task, phone_handle,
                     KOBJECT_TYPE_PHONE);
                 (void) ipc_phone_connect(phone_obj->phone, ipc_phone_0);
         }
-        
+
         futex_task_init(task);
-        
+
         /*
          * Get a reference to the address space.
          */
         as_hold(task->as);
-        
+
         irq_spinlock_lock(&tasks_lock, true);
-        
+
         task->taskid = ++task_counter;
         avltree_node_initialize(&task->tasks_tree_node);
         task->tasks_tree_node.key = task->taskid;
         avltree_insert(&tasks_tree, &task->tasks_tree_node);
-        
+
         irq_spinlock_unlock(&tasks_lock, true);
-        
+
         return task;
 }
@@ -291 +291 @@
         avltree_delete(&tasks_tree, &task->tasks_tree_node);
         irq_spinlock_unlock(&tasks_lock, true);
-        
+
         /*
          * Perform architecture specific task destruction.
          */
         task_destroy_arch(task);
-        
+
         /*
          * Free up dynamically allocated state.
          */
         futex_task_deinit(task);
-        
+
         /*
          * Drop our reference to the address space.
          */
         as_release(task->as);
-        
+
         slab_free(task_cache, task);
 }
@@ -388 +388 @@
 {
         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;
-        
+
         errno_t rc = copy_from_uspace(namebuf, uspace_name, name_len);
         if (rc != EOK)
                 return (sys_errno_t) rc;
-        
+
         namebuf[name_len] = '\0';
-        
+
         /*
          * As the task name is referenced also from the
@@ -404 +404 @@
          * of the update.
          */
-        
+
         irq_spinlock_lock(&tasks_lock, true);
         irq_spinlock_lock(&TASK->lock, false);
         irq_spinlock_lock(&threads_lock, false);
-        
+
         /* Set task name */
         str_cpy(TASK->name, TASK_NAME_BUFLEN, namebuf);
-        
+
         irq_spinlock_unlock(&threads_lock, false);
         irq_spinlock_unlock(&TASK->lock, false);
         irq_spinlock_unlock(&tasks_lock, true);
-        
+
         return EOK;
 }
@@ -432 +432 @@
         if (rc != EOK)
                 return (sys_errno_t) rc;
-        
+
         return (sys_errno_t) task_kill(taskid);
 }
@@ -453 +453 @@
         avltree_node_t *node =
             avltree_search(&tasks_tree, (avltree_key_t) id);
-        
+
         if (node)
                 return avltree_get_instance(node, task_t, tasks_tree_node);
-        
+
         return NULL;
 }
@@ -478 +478 @@
         uint64_t uret = task->ucycles;
         uint64_t kret = task->kcycles;
-        
+
         /* Current values of threads */
         list_foreach(task->threads, th_link, thread_t, thread) {
                 irq_spinlock_lock(&thread->lock, false);
-                
+
                 /* Process only counted threads */
                 if (!thread->uncounted) {
@@ -489 +489 @@
                                 thread_update_accounting(false);
                         }
-                        
+
                         uret += thread->ucycles;
                         kret += thread->kcycles;
                 }
-                
+
                 irq_spinlock_unlock(&thread->lock, false);
         }
-        
+
         *ucycles = uret;
         *kcycles = kret;
@@ -505 +505 @@
         irq_spinlock_lock(&task->lock, false);
         irq_spinlock_lock(&threads_lock, false);
-        
+
         /*
          * Interrupt all threads.
          */
-        
+
         list_foreach(task->threads, th_link, thread_t, thread) {
                 bool sleeping = false;
-                
+
                 irq_spinlock_lock(&thread->lock, false);
-                
+
                 thread->interrupted = true;
                 if (thread->state == Sleeping)
                         sleeping = true;
-                
+
                 irq_spinlock_unlock(&thread->lock, false);
-                
+
                 if (sleeping)
                         waitq_interrupt_sleep(thread);
         }
-        
+
         irq_spinlock_unlock(&threads_lock, false);
         irq_spinlock_unlock(&task->lock, false);
@@ -543 +543 @@
         if (id == 1)
                 return EPERM;
-        
+
         irq_spinlock_lock(&tasks_lock, true);
-        
+
         task_t *task = task_find_by_id(id);
         if (!task) {
@@ -551 +551 @@
                 return ENOENT;
         }
-        
+
         task_kill_internal(task);
         irq_spinlock_unlock(&tasks_lock, true);
-        
+
         return EOK;
 }
@@ -583 +583 @@
                 }
         }
-        
+
         irq_spinlock_lock(&tasks_lock, true);
         task_kill_internal(TASK);
         irq_spinlock_unlock(&tasks_lock, true);
-        
+
         thread_exit();
 }
@@ -599 +599 @@
 {
         task_kill_self(notify);
-        
+
         /* Unreachable */
         return EOK;
@@ -609 +609 @@
         task_t *task = avltree_get_instance(node, task_t, tasks_tree_node);
         irq_spinlock_lock(&task->lock, false);
-        
+
         uint64_t ucycles;
         uint64_t kcycles;
@@ -616 +616 @@
         order_suffix(ucycles, &ucycles, &usuffix);
         order_suffix(kcycles, &kcycles, &ksuffix);
-        
+
 #ifdef __32_BITS__
         if (*additional)
@@ -627 +627 @@
                     ucycles, usuffix, kcycles, ksuffix);
 #endif
-        
+
 #ifdef __64_BITS__
         if (*additional)
@@ -637 +637 @@
                     task->taskid, task->name, task->container, task, task->as);
 #endif
-        
+
         irq_spinlock_unlock(&task->lock, false);
         return true;
@@ -651 +651 @@
         /* Messing with task structures, avoid deadlock */
         irq_spinlock_lock(&tasks_lock, true);
-        
+
 #ifdef __32_BITS__
         if (additional)
@@ -659 +659 @@
                     " [ucycles ] [kcycles ]\n");
 #endif
-        
+
 #ifdef __64_BITS__
         if (additional)
@@ -668 +668 @@
                     " [as              ]\n");
 #endif
-        
+
         avltree_walk(&tasks_tree, task_print_walker, &additional);
-        
+
         irq_spinlock_unlock(&tasks_lock, true);
 }