Changeset 21933 in vbox for trunk/src/VBox

Timestamp:

Aug 2, 2009 6:03:04 PM (15 years ago)

Author:

vboxsync

Message:

rtSemSpinMutexEnter: Fixed calls to RTThreadPreemptDisable with uninitialized state.

File:

• trunk/src/VBox/Runtime/r0drv/generic/semspinmutex-r0drv-generic.c (modified) (4 diffs)

trunk/src/VBox/Runtime/r0drv/generic/semspinmutex-r0drv-generic.c

@@ -123 +123 @@
     if (!pThis)
         return VERR_NO_MEMORY;
-    pThis->u32Magic  = RTSEMSPINMUTEX_MAGIC;
-    pThis->fFlags    = fFlags;
-    pThis->hOwner    = NIL_RTNATIVETHREAD;
-    pThis->cLockers  = 0;
+    pThis->u32Magic   = RTSEMSPINMUTEX_MAGIC;
+    pThis->fFlags     = fFlags;
+    pThis->hOwner     = NIL_RTNATIVETHREAD;
+    pThis->cLockers   = 0;
     rc = RTSemEventCreate(&pThis->hEventSem);
     if (RT_SUCCESS(rc))
@@ -150 +150 @@
 static int rtSemSpinMutexEnter(RTSEMSPINMUTEXSTATE *pState, RTSEMSPINMUTEXINTERNAL *pThis)
 {
-    int rc = VINF_SUCCESS;
+#ifndef RT_OS_WINDOWS
+    RTTHREADPREEMPTSTATE const StateInit = RTTHREADPREEMPTSTATE_INITIALIZER;
+#endif
+    int rc  = VINF_SUCCESS;
 
     /** @todo Later #1: When entering in interrupt context and we're not able to
@@ -192 +195 @@
         pState->fSpin = true;
     }
+    pState->PreemptState = StateInit;
     RTThreadPreemptDisable(&pState->PreemptState);
 
@@ -202 +206 @@
         return VERR_SEM_BAD_CONTEXT;
     pState->fSpin = !RTThreadPreemptIsEnabled(NIL_RTTHREAD);
+    pState->PreemptState = StateInit;
     RTThreadPreemptDisable(&pState->PreemptState);
 #endif