Changeset 11d2c983 in mainline

Timestamp:

2023-02-11T18:35:15Z (23 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

76e17d7c

Parents:

1871118

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-02-07 18:02:51)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-02-11 18:35:15)

Message:

Reorganize locking in thread_destroy()

Location:

kernel/generic

Files:

• include/proc/task.h (modified) (1 diff)
• src/proc/thread.c (modified) (4 diffs)

kernel/generic/include/proc/task.h

@@ -89 +89 @@
         atomic_size_t refcount;
         /** Number of threads that haven't exited yet. */
+        // TODO: remove
         atomic_size_t lifecount;
 

kernel/generic/src/proc/thread.c

@@ -398 +398 @@
  * Detach thread from all queues, cpus etc. and destroy it.
  *
- * @param thread  Thread to be destroyed.
- * @param irq_res Indicate whether it should unlock thread->lock
- *                in interrupts-restore mode.
+ * @param obj  Thread to be destroyed.
  *
  */
@@ -407 +405 @@
         thread_t *thread = (thread_t *) obj;
 
-        irq_spinlock_lock(&thread->lock, true);
+        assert_link_not_used(&thread->rq_link);
+        assert_link_not_used(&thread->wq_link);
+
+        assert(thread->task);
+
+        ipl_t ipl = interrupts_disable();
+
+        /* Remove thread from task's list. */
+        irq_spinlock_lock(&thread->task->lock, false);
+        list_remove(&thread->th_link);
+        irq_spinlock_unlock(&thread->task->lock, false);
+
+        /* Remove thread from global list. */
+        irq_spinlock_lock(&threads_lock, false);
+        odict_remove(&thread->lthreads);
+        irq_spinlock_unlock(&threads_lock, false);
+
+        /* Clear cpu->fpu_owner if set to this thread. */
+        irq_spinlock_lock(&thread->lock, false);
+
         assert((thread->state == Exiting) || (thread->state == Lingering));
-        assert(thread->task);
         assert(thread->cpu);
 
@@ -417 +433 @@
         irq_spinlock_unlock(&thread->cpu->lock, false);
 
-        irq_spinlock_pass(&thread->lock, &threads_lock);
-
-        odict_remove(&thread->lthreads);
-
-        irq_spinlock_pass(&threads_lock, &thread->task->lock);
-
-        /*
-         * Detach from the containing task.
-         */
-        list_remove(&thread->th_link);
-        irq_spinlock_unlock(&thread->task->lock, true);
+        irq_spinlock_unlock(&thread->lock, false);
+
+        interrupts_restore(ipl);
 
         /*
@@ -433 +441 @@
          */
         task_release(thread->task);
+        thread->task = NULL;
+
         slab_free(thread_cache, thread);
 }