Changeset 5324 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Oct 16, 2007 11:51:49 AM (17 years ago)

Author:

vboxsync

Message:

removed the sizeof(pthread_t) == sizeof(void *) assumption.

File:

• trunk/src/VBox/Runtime/r3/posix/sems-posix.cpp (modified) (9 diffs)

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

@@ -725 +725 @@
                 pthread_mutexattr_destroy(&MutexAttr);
 
-                pIntMutexSem->Owner    = (pthread_t)~0;
+                pIntMutexSem->Owner    = ~(pthread_t)0;
                 pIntMutexSem->cNesting = 0;
 
@@ -767 +767 @@
      * Free the memory and be gone.
      */
-    pIntMutexSem->Owner    = (pthread_t)~0;
+    pIntMutexSem->Owner    = ~(pthread_t)0;
     pIntMutexSem->cNesting = ~0;
     RTMemTmpFree(pIntMutexSem);
@@ -789 +789 @@
      * Check if nested request.
      */
-    pthread_t                       Self = pthread_self();
+    pthread_t                     Self = pthread_self();
     struct RTSEMMUTEXINTERNAL    *pIntMutexSem = MutexSem;
     if (    pIntMutexSem->Owner == Self
@@ -874 +874 @@
      * Check if nested.
      */
-    pthread_t                       Self = pthread_self();
+    pthread_t                     Self = pthread_self();
     struct RTSEMMUTEXINTERNAL    *pIntMutexSem = MutexSem;
     if (    pIntMutexSem->Owner != Self
@@ -896 +896 @@
      * Clear the state. (cNesting == 1)
      */
-    pIntMutexSem->Owner    = (pthread_t)~0;
+    pIntMutexSem->Owner    = ~(pthread_t)0;
     ASMAtomicXchgU32(&pIntMutexSem->cNesting, 0);
 
@@ -956 +956 @@
             {
                 pIntRWSem->uCheck = ~0;
-                pIntRWSem->WROwner = (pthread_t)~0;
+                pIntRWSem->WROwner = ~(pthread_t)0;
                 *pRWSem = pIntRWSem;
                 return VINF_SUCCESS;
@@ -1160 +1160 @@
     }
 
-    ASMAtomicXchgPtr((void * volatile *)&pIntRWSem->WROwner, (void *)pthread_self());
+    ASMAtomicXchgSize(&pIntRWSem->WROwner, pthread_self());
 
     return VINF_SUCCESS;
@@ -1187 +1187 @@
      * Try unlock it.
      */
-    pthread_t                   Self = pthread_self();
+    pthread_t                 Self = pthread_self();
     struct RTSEMRWINTERNAL   *pIntRWSem = RWSem;
     if (pIntRWSem->WROwner != Self)
@@ -1198 +1198 @@
      * Try unlock it.
      */
-    AssertMsg(sizeof(pthread_t) == sizeof(void *), ("pthread_t is not the size of a pointer but %d bytes\n", sizeof(pthread_t)));
-    ASMAtomicXchgPtr((void * volatile *)&pIntRWSem->WROwner, (void *)(uintptr_t)~0);
+    ASMAtomicXchgSize(&pIntRWSem->WROwner, ~(pthread_t)0);
     int rc = pthread_rwlock_unlock(&pIntRWSem->RWLock);
     if (rc)