Changeset 7c5320c in mainline

Timestamp:

2023-02-07T16:03:05Z (15 months ago)

Author:

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

Branches:

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

Children:

1eaead4

Parents:

5110d0a

git-author:

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

git-committer:

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

Message:

Use the semaphore interface instead of waitq in some places

Since we already have an underused semaphore API in the kernel,
it would be worthwhile to use it in places where the baseline
semaphore semantics are needed. It makes the function of the
calls obvious even to people unfamiliar with the details of
waitq API.

Location:

kernel

Files:

• arch/ia32/src/smp/smp.c (modified) (1 diff)
• arch/sparc64/src/smp/sun4u/smp.c (modified) (1 diff)
• arch/sparc64/src/smp/sun4v/smp.c (modified) (1 diff)
• generic/include/console/chardev.h (modified) (2 diffs)
• generic/include/smp/smp.h (modified) (1 diff)
• generic/src/console/chardev.c (modified) (3 diffs)
• generic/src/main/kinit.c (modified) (1 diff)
• generic/src/main/main.c (modified) (1 diff)
• generic/src/smp/smp.c (modified) (1 diff)

kernel/arch/ia32/src/smp/smp.c

@@ -178 +178 @@
                          * supposed to wake us up.
                          */
-                        if (waitq_sleep_timeout(&ap_completion_wq, 1000000,
-                            SYNCH_FLAGS_NONE, NULL) == ETIMEOUT) {
+                        if (semaphore_down_timeout(&ap_completion_semaphore, 1000000) != EOK) {
                                 log(LF_ARCH, LVL_NOTE, "%s: waiting for cpu%u "
                                     "(APIC ID = %d) timed out", __FUNCTION__,

kernel/arch/sparc64/src/smp/sun4u/smp.c

@@ -106 +106 @@
         waking_up_mid = mid;
 
-        if (waitq_sleep_timeout(&ap_completion_wq, 1000000,
-            SYNCH_FLAGS_NONE, NULL) == ETIMEOUT)
+        if (semaphore_down_timeout(&ap_completion_semaphore, 1000000) != EOK)
                 log(LF_ARCH, LVL_NOTE, "%s: waiting for processor (mid = %" PRIu32
                     ") timed out", __func__, mid);

kernel/arch/sparc64/src/smp/sun4v/smp.c

@@ -373 +373 @@
 #endif
 
-        if (waitq_sleep_timeout(&ap_completion_wq, 10000000,
-            SYNCH_FLAGS_NONE, NULL) == ETIMEOUT)
+        if (semaphore_down_timeout(&ap_completion_semaphore, 10000000) != EOK)
                 printf("%s: waiting for processor (cpuid = %" PRIu64 ") timed out\n",
                     __func__, cpuid);

kernel/generic/include/console/chardev.h

@@ -39 +39 @@
 #include <stdbool.h>
 #include <stddef.h>
-#include <synch/waitq.h>
+#include <synch/semaphore.h>
 #include <synch/spinlock.h>
 
@@ -64 +64 @@
 typedef struct indev {
         const char *name;
-        waitq_t wq;
+        semaphore_t wq;
 
         /** Protects everything below. */

kernel/generic/include/smp/smp.h

@@ -36 +36 @@
 #define KERN_SMP_H_
 
-#include <synch/waitq.h>
+#include <synch/semaphore.h>
 
-extern waitq_t ap_completion_wq;
+extern semaphore_t ap_completion_semaphore;
 
 #ifdef CONFIG_SMP

kernel/generic/src/console/chardev.c

@@ -52 +52 @@
 {
         indev->name = name;
-        waitq_initialize(&indev->wq);
+        semaphore_initialize(&indev->wq, 0);
         irq_spinlock_initialize(&indev->lock, "chardev.indev.lock");
         indev->counter = 0;
@@ -81 +81 @@
         /* Index modulo size of buffer */
         indev->index = indev->index % INDEV_BUFLEN;
-        waitq_wakeup(&indev->wq, WAKEUP_FIRST);
+        semaphore_up(&indev->wq);
         irq_spinlock_unlock(&indev->lock, true);
 }
@@ -115 +115 @@
         }
 
-        waitq_sleep(&indev->wq);
+        semaphore_down(&indev->wq);
         irq_spinlock_lock(&indev->lock, true);
         char32_t ch = indev->buffer[(indev->index - indev->counter) %

kernel/generic/src/main/kinit.c

@@ -111 +111 @@
 #ifdef CONFIG_SMP
         if (config.cpu_count > 1) {
-                waitq_initialize(&ap_completion_wq);
+                semaphore_initialize(&ap_completion_semaphore, 0);
 
                 /*

kernel/generic/src/main/main.c

@@ -383 +383 @@
         timeout_init();
 
-        waitq_wakeup(&ap_completion_wq, WAKEUP_FIRST);
+        semaphore_up(&ap_completion_semaphore);
         scheduler();
         /* not reached */

kernel/generic/src/smp/smp.c

@@ -39 +39 @@
 #ifdef CONFIG_SMP
 
-waitq_t ap_completion_wq;
+semaphore_t ap_completion_semaphore;
 
 #endif /* CONFIG_SMP */