Changeset 111b9b9 in mainline for kernel/generic/src/proc/scheduler.c

Timestamp:

2023-02-11T19:13:44Z (2 years ago)

Author:

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

Branches:

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

Children:

4777e02

Parents:

76e17d7c

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2022-08-15 17:46:39)

git-committer:

Jiří Zárevúcky <zarevucky.jiri@…> (2023-02-11 19:13:44)

Message:

Reimplement waitq using thread_wait/wakeup

This adds a few functions to the thread API which can be
summarized as "stop running until woken up by others".
The ordering and context-switching concerns are thus yeeted
to this abstraction and waitq only deals with maintaining
the queues. Overall, this makes the control flow in waitq
much easier to navigate.

File:

• kernel/generic/src/proc/scheduler.c (modified) (4 diffs)

kernel/generic/src/proc/scheduler.c

@@ -300 +300 @@
 }
 
+void scheduler(void)
+{
+        ipl_t ipl = interrupts_disable();
+
+        if (atomic_load(&haltstate))
+                halt();
+
+        if (THREAD) {
+                irq_spinlock_lock(&THREAD->lock, false);
+        }
+
+        scheduler_locked(ipl);
+}
+
 /** The scheduler
  *
@@ -307 +321 @@
  *
  */
-void scheduler(void)
-{
-        volatile ipl_t ipl;
-
+void scheduler_locked(ipl_t ipl)
+{
         assert(CPU != NULL);
 
-        ipl = interrupts_disable();
-
-        if (atomic_load(&haltstate))
-                halt();
-
         if (THREAD) {
-                irq_spinlock_lock(&THREAD->lock, false);
-
                 /* Update thread kernel accounting */
                 THREAD->kcycles += get_cycle() - THREAD->last_cycle;
@@ -419 +424 @@
                 case Exiting:
                         irq_spinlock_unlock(&THREAD->lock, false);
-                        waitq_wakeup(&THREAD->join_wq, WAKEUP_CLOSE);
+                        waitq_close(&THREAD->join_wq);
 
                         /*
@@ -434 +439 @@
                          */
                         THREAD->priority = -1;
-
-                        /*
-                         * We need to release wq->lock which we locked in
-                         * waitq_sleep(). Address of wq->lock is kept in
-                         * THREAD->sleep_queue.
-                         */
-                        irq_spinlock_unlock(&THREAD->sleep_queue->lock, false);
-
                         irq_spinlock_unlock(&THREAD->lock, false);
                         break;