Changeset 111b9b9 in mainline for kernel/generic/src/ipc

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.

Location:

kernel/generic/src/ipc

Files:

• event.c (modified) (1 diff)
• ipc.c (modified) (3 diffs)
• irq.c (modified) (1 diff)
• sysipc.c (modified) (1 diff)

kernel/generic/src/ipc/event.c

@@ -169 +169 @@
                                     true);
 
-                                waitq_wakeup(&event->answerbox->wq,
-                                    WAKEUP_FIRST);
+                                waitq_wake_one(&event->answerbox->wq);
 
                                 if (mask)

kernel/generic/src/ipc/ipc.c

@@ -326 +326 @@
                 irq_spinlock_unlock(&callerbox->lock, true);
 
-        waitq_wakeup(&callerbox->wq, WAKEUP_FIRST);
+        waitq_wake_one(&callerbox->wq);
 }
 
@@ -416 +416 @@
         irq_spinlock_unlock(&box->lock, true);
 
-        waitq_wakeup(&box->wq, WAKEUP_FIRST);
+        waitq_wake_one(&box->wq);
 }
 
@@ -555 +555 @@
         errno_t rc;
 
-        rc = waitq_sleep_timeout(&box->wq, usec, flags, NULL);
+        rc = _waitq_sleep_timeout(&box->wq, usec, flags);
         if (rc != EOK)
                 return rc;

kernel/generic/src/ipc/irq.c

@@ -429 +429 @@
         irq_spinlock_unlock(&irq->notif_cfg.answerbox->irq_lock, false);
 
-        waitq_wakeup(&irq->notif_cfg.answerbox->wq, WAKEUP_FIRST);
+        waitq_wake_one(&irq->notif_cfg.answerbox->wq);
 }
 

kernel/generic/src/ipc/sysipc.c

@@ -871 +871 @@
 sys_errno_t sys_ipc_poke(void)
 {
-        waitq_wakeup(&TASK->answerbox.wq, WAKEUP_FIRST);
+        waitq_wake_one(&TASK->answerbox.wq);
         return EOK;
 }