Changeset 7c5320c in mainline for kernel/arch

Timestamp:

2023-02-07T16:03:05Z (3 years 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/arch

Files:

• ia32/src/smp/smp.c (modified) (1 diff)
• sparc64/src/smp/sun4u/smp.c (modified) (1 diff)
• sparc64/src/smp/sun4v/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);