Changes in kernel/generic/src/proc/task.c [5a5269d:07d4271] in mainline

File:

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

kernel/generic/src/proc/task.c

@@ -158 +158 @@
                 return rc;
 
-        atomic_store(&task->refcount, 0);
         atomic_store(&task->lifecount, 0);
 
@@ -201 +200 @@
         if (!task)
                 return NULL;
+
+        refcount_init(&task->refcount);
 
         task_create_arch(task);
@@ -224 +225 @@
 
         task->answerbox.active = true;
+
+        task->debug_sections = NULL;
 
 #ifdef CONFIG_UDEBUG
@@ -266 +269 @@
  *
  */
-void task_destroy(task_t *task)
+static void task_destroy(task_t *task)
 {
         /*
@@ -297 +300 @@
 void task_hold(task_t *task)
 {
-        atomic_inc(&task->refcount);
+        refcount_up(&task->refcount);
 }
 
@@ -309 +312 @@
 void task_release(task_t *task)
 {
-        if ((atomic_predec(&task->refcount)) == 0)
+        if (refcount_down(&task->refcount))
                 task_destroy(task);
 }
@@ -385 +388 @@
         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);
@@ -416 +417 @@
 /** Find task structure corresponding to task ID.
  *
- * The tasks_lock must be already held by the caller of this function and
- * interrupts must be disabled.
- *
  * @param id Task ID.
  *
- * @return Task structure address or NULL if there is no such task ID.
+ * @return Task reference or NULL if there is no such task ID.
  *
  */
 task_t *task_find_by_id(task_id_t id)
 {
-        assert(interrupts_disabled());
-        assert(irq_spinlock_locked(&tasks_lock));
+        task_t *task = NULL;
+
+        irq_spinlock_lock(&tasks_lock, true);
 
         odlink_t *odlink = odict_find_eq(&tasks, &id, NULL);
-        if (odlink != NULL)
-                return odict_get_instance(odlink, task_t, ltasks);
-
-        return NULL;
+        if (odlink != NULL) {
+                task = odict_get_instance(odlink, task_t, ltasks);
+
+                /*
+                 * The directory of tasks can't hold a reference, since that would
+                 * prevent task from ever being destroyed. That means we have to
+                 * check for the case where the task is already being destroyed, but
+                 * not yet removed from the directory.
+                 */
+                if (!refcount_try_up(&task->refcount))
+                        task = NULL;
+        }
+
+        irq_spinlock_unlock(&tasks_lock, true);
+
+        return task;
 }
 
@@ -506 +517 @@
         /* 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) {
@@ -515 +524 @@
                         }
 
-                        uret += thread->ucycles;
-                        kret += thread->kcycles;
+                        uret += atomic_time_read(&thread->ucycles);
+                        kret += atomic_time_read(&thread->kcycles);
                 }
-
-                irq_spinlock_unlock(&thread->lock, false);
         }
 
@@ -528 +535 @@
 static void task_kill_internal(task_t *task)
 {
-        irq_spinlock_lock(&task->lock, false);
-        irq_spinlock_lock(&threads_lock, false);
+        irq_spinlock_lock(&task->lock, true);
 
         /*
@@ -536 +542 @@
 
         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);
+                thread_interrupt(thread);
         }
 
-        irq_spinlock_unlock(&threads_lock, false);
-        irq_spinlock_unlock(&task->lock, false);
+        irq_spinlock_unlock(&task->lock, true);
 }
 
@@ -569 +563 @@
                 return EPERM;
 
-        irq_spinlock_lock(&tasks_lock, true);
-
         task_t *task = task_find_by_id(id);
-        if (!task) {
-                irq_spinlock_unlock(&tasks_lock, true);
+        if (!task)
                 return ENOENT;
-        }
 
         task_kill_internal(task);
-        irq_spinlock_unlock(&tasks_lock, true);
-
+        task_release(task);
         return EOK;
 }
@@ -609 +598 @@
         }
 
-        irq_spinlock_lock(&tasks_lock, true);
         task_kill_internal(TASK);
-        irq_spinlock_unlock(&tasks_lock, true);
-
         thread_exit();
 }
@@ -641 +627 @@
         if (additional)
                 printf("%-8" PRIu64 " %9zu", task->taskid,
-                    atomic_load(&task->refcount));
+                    atomic_load(&task->lifecount));
         else
                 printf("%-8" PRIu64 " %-14s %-5" PRIu32 " %10p %10p"
@@ -653 +639 @@
                 printf("%-8" PRIu64 " %9" PRIu64 "%c %9" PRIu64 "%c "
                     "%9zu\n", task->taskid, ucycles, usuffix, kcycles,
-                    ksuffix, atomic_load(&task->refcount));
+                    ksuffix, atomic_load(&task->lifecount));
         else
                 printf("%-8" PRIu64 " %-14s %-5" PRIu32 " %18p %18p\n",