Changeset 92919 in vbox for trunk/src/VBox/Runtime/r3/posix

Timestamp:

Dec 15, 2021 9:50:12 AM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

148875

Message:

IPRT/r3/posix: Just use sched_yield() everywhere, as it's a standard function.

Location:

trunk/src/VBox/Runtime/r3/posix

Files:

• semevent-posix.cpp (modified) (3 diffs)
• thread2-posix.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/r3/posix/semevent-posix.cpp

@@ -46 +46 @@
 #include <unistd.h>
 #include <sys/time.h>
-
-#ifdef RT_OS_DARWIN
-# define pthread_yield() pthread_yield_np()
-#endif
-
-#if defined(RT_OS_SOLARIS) || defined(RT_OS_HAIKU) || defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)
-# include <sched.h>
-# define pthread_yield() sched_yield()
-#endif
+#include <sched.h>
 
 #include "semwait.h"
@@ -351 +343 @@
     if (    ASMAtomicIncU32(&pThis->cWaiters) > 1
         &&  pThis->u32State == EVENT_STATE_SIGNALED)
-        pthread_yield();
+        sched_yield();
 
      /* take mutex */
@@ -438 +430 @@
     /* for fairness, yield before going to sleep. */
     if (ASMAtomicIncU32(&pThis->cWaiters) > 1)
-        pthread_yield();
+        sched_yield();
 
     /* take mutex */

trunk/src/VBox/Runtime/r3/posix/thread2-posix.cpp

@@ -33 +33 @@
 #include <pthread.h>
 #include <unistd.h>
-#if defined(RT_OS_SOLARIS) || defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)
-# include <sched.h>
-#endif
+#include <sched.h>
 
 #include <iprt/thread.h>
@@ -58 +56 @@
     if (!cMillies)
     {
-        /* pthread_yield() isn't part of SuS, thus this fun. */
-#ifdef RT_OS_DARWIN
-        pthread_yield_np();
-#elif defined(RT_OS_SOLARIS) || defined(RT_OS_HAIKU) || defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)
-        sched_yield();
-#else
-        if (!pthread_yield())
-#endif
+        if (!sched_yield())
         {
             LogFlow(("RTThreadSleep: returning %Rrc (cMillies=%d)\n", VINF_SUCCESS, cMillies));
@@ -95 +86 @@
     if (!cMillies)
     {
-        /* pthread_yield() isn't part of SuS, thus this fun. */
-#ifdef RT_OS_DARWIN
-        pthread_yield_np();
-#elif defined(RT_OS_SOLARIS) || defined(RT_OS_HAIKU) || defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)
-        sched_yield();
-#else
-        if (!pthread_yield())
-#endif
+        if (!sched_yield())
             return VINF_SUCCESS;
     }
@@ -125 +109 @@
     uint64_t u64TS = ASMReadTSC();
 #endif
-#ifdef RT_OS_DARWIN
-    pthread_yield_np();
-#elif defined(RT_OS_SOLARIS) || defined(RT_OS_HAIKU) || defined(RT_OS_FREEBSD) || defined(RT_OS_NETBSD)
+
     sched_yield();
-#else
-    pthread_yield();
-#endif
+
 #if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
     u64TS = ASMReadTSC() - u64TS;