Changeset 22959 in vbox

Timestamp:

Sep 11, 2009 1:45:44 PM (15 years ago)

Author:

vboxsync

Message:

sem*-linux.cpp,Makefile.kmk: Added check for cMillies==0 in RTSemEvent and introduced a build config variable IPRT_WITH_FUTEX_BASED_SEMS. Corrected comment in semeventmulti about the futex variable values.

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (2 diffs)
• r3/linux/semevent-linux.cpp (modified) (5 diffs)
• r3/linux/semeventmulti-linux.cpp (modified) (5 diffs)
• r3/linux/semmutex-linux.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -183 +183 @@
 ifdef IPRT_WITH_LZO
  RuntimeR3_DEFS         += RTZIP_USE_LZO
+endif
+ifdef IPRT_WITH_FUTEX_BASED_SEMS
+ RuntimeR3_DEFS.linux   += IPRT_WITH_FUTEX_BASED_SEMS
 endif
 RuntimeR3_INCS          = \
@@ -445 +448 @@
         r3/posix/tls-posix.cpp \
         r3/posix/utf8-posix.cpp
-RuntimeR3_SOURCES.linux.x86 += \
-        r3/posix/semevent-posix.cpp \
-        r3/posix/semeventmulti-posix.cpp \
-        r3/posix/semmutex-posix.cpp
-RuntimeR3_SOURCES.linux.amd64 += \
-        r3/linux/semevent-linux.cpp \
-        r3/linux/semeventmulti-linux.cpp
-ifdef RT_NEW_LINUX_MUTEX_CODE
+ifdef IPRT_WITH_FUTEX_BASED_SEMS
+ RuntimeR3_SOURCES.linux += \
+        r3/linux/semevent-linux.cpp \
+        r3/linux/semeventmulti-linux.cpp \
+        r3/linux/semmutex-linux.cpp
+else
+ RuntimeR3_SOURCES.linux.x86 += \
+        r3/posix/semevent-posix.cpp \
+        r3/posix/semeventmulti-posix.cpp \
+        r3/posix/semmutex-posix.cpp
  RuntimeR3_SOURCES.linux.amd64 += \
-        r3/linux/semmutex-linux.cpp
-else
- RuntimeR3_SOURCES.linux.amd64 += \
-        r3/posix/semmutex-posix.cpp
+        r3/linux/semevent-linux.cpp \
+        r3/linux/semeventmulti-linux.cpp
+ ifdef RT_NEW_LINUX_MUTEX_CODE
+  RuntimeR3_SOURCES.linux.amd64 += \
+        r3/linux/semmutex-linux.cpp
+ else
+  RuntimeR3_SOURCES.linux.amd64 += \
+        r3/posix/semmutex-posix.cpp
+ endif
 endif
 

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

@@ -30 +30 @@
 
 #include <features.h>
-#if __GLIBC_PREREQ(2,6)
+#if __GLIBC_PREREQ(2,6) && !defined(IPRT_WITH_FUTEX_BASED_SEMS)
 
 /*
@@ -83 +83 @@
     /** The futex state variable.
      * 0 means not signalled.
-     * 1 means signalled */
+       1 means signalled. */
     uint32_t volatile   fSignalled;
     /** The number of waiting threads */
@@ -195 +195 @@
 
     /*
-     * Convert timeout value.
+     * Convert the timeout value.
      */
     struct timespec ts;
@@ -202 +202 @@
     if (cMillies != RT_INDEFINITE_WAIT)
     {
+        if (!cMillies)
+            return VERR_TIMEOUT;
         ts.tv_sec  = cMillies / 1000;
         ts.tv_nsec = (cMillies % 1000) * 1000000;
@@ -282 +284 @@
 }
 
-#endif /* glibc < 2.6 */
+#endif /* glibc < 2.6 || IPRT_WITH_FUTEX_BASED_SEMS */
+

trunk/src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp

@@ -31 +31 @@
 
 #include <features.h>
-#if __GLIBC_PREREQ(2,6)
+#if __GLIBC_PREREQ(2,6) && !defined(IPRT_WITH_FUTEX_BASED_SEMS)
 
 /*
@@ -86 +86 @@
      * -1 means signaled.
      *  0 means not signaled, no waiters.
-     * >0 means not signaled, and the value gives the number of waiters.
+     *  1 means not signaled and that someone is waiting.
      */
     int32_t volatile    iState;
@@ -212 +212 @@
     if (iCur == -1)
         return VINF_SUCCESS;
-    if (!cMillies)
-        return VERR_TIMEOUT;
-
-    /*
-     * Convert timeout value.
+
+    /*
+     * Convert the timeout value.
      */
     struct timespec ts;
@@ -223 +221 @@
     if (cMillies != RT_INDEFINITE_WAIT)
     {
+        if (!cMillies)
+            return VERR_TIMEOUT;
         ts.tv_sec  = cMillies / 1000;
         ts.tv_nsec = (cMillies % 1000) * 1000000;
@@ -300 +300 @@
 }
 
-#endif /* glibc < 2.6 */
+#endif /* glibc < 2.6 || IPRT_WITH_FUTEX_BASED_SEMS */
+

trunk/src/VBox/Runtime/r3/linux/semmutex-linux.cpp

@@ -38 +38 @@
 #include <iprt/asm.h>
 #include <iprt/err.h>
+#include <iprt/time.h>
 #include "internal/magics.h"
 #include "internal/strict.h"