Changeset 7922 in vbox for trunk/src/VBox/Runtime

Timestamp:

Apr 11, 2008 3:11:51 PM (17 years ago)

Author:

vboxsync

Message:

Fixed darwin build error.

File:

• trunk/src/VBox/Runtime/r3/posix/semrw-posix.cpp (modified) (7 diffs)

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

@@ -41 +41 @@
 #include "internal/magics.h"
 
+/** @todo move this to r3/posix/something.h. */
+#ifdef RT_OS_SOLARIS
+# define ATOMIC_GET_PTHREAD_T(pvVar, pThread) ASMAtomicReadSize(pvVar, pThread)
+# define ATOMIC_SET_PTHREAD_T(pvVar, pThread) ASMAtomicReadSize(pvVar, pThread)
+#else
+AssertCompileSize(pthread_t, sizeof(void *));
+# define ATOMIC_GET_PTHREAD_T(pvVar, pThread) do { *(pThread) = (pthread_t)ASMAtomicReadPtr((void *volatile *)pvVar); } while (0)
+# define ATOMIC_SET_PTHREAD_T(pvVar, pThread) ASMAtomicWritePtr((void *volatile *)pvVar, (void *)pThread)
+#endif
+
 
 /*******************************************************************************
@@ -155 +165 @@
     pthread_t Self = pthread_self();
     pthread_t Writer;
-    ASMAtomicReadSize(&pThis->Writer, &Writer);
+    ATOMIC_GET_PTHREAD_T(&pThis->Writer, &Writer);
     if (Writer == Self)
     {
@@ -236 +246 @@
     pthread_t Self = pthread_self();
     pthread_t Writer;
-    ASMAtomicReadSize(&pThis->Writer, &Writer);
+    ATOMIC_GET_PTHREAD_T(&pThis->Writer, &Writer);
     if (Writer == Self)
     {
@@ -275 +285 @@
     pthread_t Self = pthread_self();
     pthread_t Writer;
-    ASMAtomicReadSize(&pThis->Writer, &Writer);
+    ATOMIC_GET_PTHREAD_T(&pThis->Writer, &Writer);
     if (Writer == Self)
     {
@@ -328 +338 @@
     }
 
-    ASMAtomicWriteSize(&pThis->Writer, Self);
+    ATOMIC_SET_PTHREAD_T(&pThis->Writer, Self);
     pThis->cWrites = 1;
     return VINF_SUCCESS;
@@ -357 +367 @@
     pthread_t Self = pthread_self();
     pthread_t Writer;
-    ASMAtomicReadSize(&pThis->Writer, &Writer);
+    ATOMIC_GET_PTHREAD_T(&pThis->Writer, &Writer);
     AssertMsgReturn(Writer == Self, ("pThis=%p\n", pThis), VERR_NOT_OWNER);
     pThis->cWrites--;
@@ -367 +377 @@
      * Try unlock it.
      */
-    ASMAtomicWriteSize(&pThis->Writer, (pthread_t)-1);
+    ATOMIC_SET_PTHREAD_T(&pThis->Writer, (pthread_t)-1);
     int rc = pthread_rwlock_unlock(&pThis->RWLock);
     if (rc)