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

Timestamp:

Jan 11, 2010 1:24:09 PM (15 years ago)

Author:

vboxsync

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

56457

Message:

iprt: Added RTSemEventCreateEx and did some cleanups of the RTSemEventDestroy behavior wrt NIL handles.

File:

• trunk/src/VBox/Runtime/r3/posix/semevent-posix.cpp (modified) (21 diffs)

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

@@ -96 +96 @@
 
 
-RTDECL(int)  RTSemEventCreate(PRTSEMEVENT pEventSem)
-{
+RTDECL(int)  RTSemEventCreate(PRTSEMEVENT phEventSem)
+{
+    return RTSemEventCreateEx(phEventSem, 0 /*fFlags*/, NIL_RTLOCKVALCLASS, NULL);
+}
+
+
+RTDECL(int)  RTSemEventCreateEx(PRTSEMEVENT phEventSem, uint32_t fFlags, RTLOCKVALCLASS hClass, const char *pszNameFmt, ...)
+{
+    AssertReturn(!(fFlags & ~RTSEMEVENT_FLAGS_NO_LOCK_VAL), VERR_INVALID_PARAMETER);
+
+    /*
+     * Allocate semaphore handle.
+     */
     int rc;
-
-    /*
-     * Allocate semaphore handle.
-     */
     struct RTSEMEVENTINTERNAL *pThis = (struct RTSEMEVENTINTERNAL *)RTMemAlloc(sizeof(struct RTSEMEVENTINTERNAL));
     if (pThis)
@@ -132 +139 @@
                         ASMAtomicXchgU32(&pThis->cWaiters, 0);
 #ifdef RTSEMEVENT_STRICT
-                        RTLockValidatorRecSharedInit(&pThis->Signallers,
-                                                     NIL_RTLOCKVALCLASS, RTLOCKVAL_SUB_CLASS_ANY,
-                                                     pThis, true /*fSignaller*/, true /*fEnabled*/, "RTSemEvent");
+                        va_list va;
+                        va_start(va, pszNameFmt);
+                        RTLockValidatorRecSharedInitV(&pThis->Signallers, hClass, RTLOCKVAL_SUB_CLASS_ANY, pThis,
+                                                      true /*fSignaller*/, !(fFlags & RTSEMEVENT_FLAGS_NO_LOCK_VAL),
+                                                      pszNameFmt, va);
+                        va_end(va);
                         pThis->fEverHadSignallers = false;
 #endif
 
-                        *pEventSem = pThis;
+                        *phEventSem = pThis;
                         return VINF_SUCCESS;
                     }
+
                     pthread_mutexattr_destroy(&MutexAttr);
                 }
@@ -158 +169 @@
 
 
-RTDECL(int)  RTSemEventDestroy(RTSEMEVENT EventSem)
+RTDECL(int)  RTSemEventDestroy(RTSEMEVENT hEventSem)
 {
     /*
      * Validate handle.
      */
-    struct RTSEMEVENTINTERNAL *pThis = EventSem;
-    if (pThis == NIL_RTSEMEVENT)        /* don't bitch */
-        return VERR_INVALID_HANDLE;
+    struct RTSEMEVENTINTERNAL *pThis = hEventSem;
+    if (pThis == NIL_RTSEMEVENT)
+        return VINF_SUCCESS;
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
     uint32_t    u32 = pThis->u32State;
@@ -185 +196 @@
     if (rc)
     {
-        AssertMsgFailed(("Failed to destroy event sem %p, rc=%d.\n", EventSem, rc));
+        AssertMsgFailed(("Failed to destroy event sem %p, rc=%d.\n", pThis, rc));
         return RTErrConvertFromErrno(rc);
     }
@@ -202 +213 @@
     if (rc)
     {
-        AssertMsgFailed(("Failed to destroy event sem %p, rc=%d. (mutex)\n", EventSem, rc));
+        AssertMsgFailed(("Failed to destroy event sem %p, rc=%d. (mutex)\n", pThis, rc));
         return RTErrConvertFromErrno(rc);
     }
@@ -217 +228 @@
 
 
-RTDECL(int)  RTSemEventSignal(RTSEMEVENT EventSem)
+RTDECL(int)  RTSemEventSignal(RTSEMEVENT hEventSem)
 {
     /*
      * Validate input.
      */
-    struct RTSEMEVENTINTERNAL *pThis = EventSem;
+    struct RTSEMEVENTINTERNAL *pThis = hEventSem;
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
     uint32_t    u32 = pThis->u32State;
@@ -242 +253 @@
     if (rc)
     {
-        AssertMsgFailed(("Failed to lock event sem %p, rc=%d.\n", EventSem, rc));
+        AssertMsgFailed(("Failed to lock event sem %p, rc=%d.\n", hEventSem, rc));
         return RTErrConvertFromErrno(rc);
     }
@@ -253 +264 @@
         ASMAtomicXchgU32(&pThis->u32State, EVENT_STATE_SIGNALED);
         rc = pthread_cond_signal(&pThis->Cond);
-        AssertMsg(!rc, ("Failed to signal event sem %p, rc=%d.\n", EventSem, rc));
+        AssertMsg(!rc, ("Failed to signal event sem %p, rc=%d.\n", hEventSem, rc));
     }
     else if (pThis->u32State == EVENT_STATE_SIGNALED)
     {
         rc = pthread_cond_signal(&pThis->Cond); /* give'm another kick... */
-        AssertMsg(!rc, ("Failed to signal event sem %p, rc=%d. (2)\n", EventSem, rc));
+        AssertMsg(!rc, ("Failed to signal event sem %p, rc=%d. (2)\n", hEventSem, rc));
     }
     else
@@ -267 +278 @@
      */
     int rc2 = pthread_mutex_unlock(&pThis->Mutex);
-    AssertMsg(!rc2, ("Failed to unlock event sem %p, rc=%d.\n", EventSem, rc));
+    AssertMsg(!rc2, ("Failed to unlock event sem %p, rc=%d.\n", hEventSem, rc));
     if (rc)
         return RTErrConvertFromErrno(rc);
@@ -277 +288 @@
 
 
-DECL_FORCE_INLINE(int) rtSemEventWait(RTSEMEVENT EventSem, unsigned cMillies, bool fAutoResume)
+DECL_FORCE_INLINE(int) rtSemEventWait(RTSEMEVENT hEventSem, unsigned cMillies, bool fAutoResume)
 {
     PCRTLOCKVALSRCPOS  pSrcPos = NULL;
@@ -284 +295 @@
      * Validate input.
      */
-    struct RTSEMEVENTINTERNAL *pThis = EventSem;
+    struct RTSEMEVENTINTERNAL *pThis = hEventSem;
     AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
     uint32_t    u32 = pThis->u32State;
@@ -304 +315 @@
         {
             ASMAtomicDecU32(&pThis->cWaiters);
-            AssertMsgFailed(("Failed to lock event sem %p, rc=%d.\n", EventSem, rc));
+            AssertMsgFailed(("Failed to lock event sem %p, rc=%d.\n", hEventSem, rc));
             return RTErrConvertFromErrno(rc);
         }
@@ -316 +327 @@
                 ASMAtomicDecU32(&pThis->cWaiters);
                 rc = pthread_mutex_unlock(&pThis->Mutex);
-                AssertMsg(!rc, ("Failed to unlock event sem %p, rc=%d.\n", EventSem, rc)); NOREF(rc);
+                AssertMsg(!rc, ("Failed to unlock event sem %p, rc=%d.\n", hEventSem, rc)); NOREF(rc);
                 return VINF_SUCCESS;
             }
@@ -322 +333 @@
             {
                 rc = pthread_mutex_unlock(&pThis->Mutex);
-                AssertMsg(!rc, ("Failed to unlock event sem %p, rc=%d.\n", EventSem, rc)); NOREF(rc);
+                AssertMsg(!rc, ("Failed to unlock event sem %p, rc=%d.\n", hEventSem, rc)); NOREF(rc);
                 return VERR_SEM_DESTROYED;
             }
@@ -348 +359 @@
             if (rc)
             {
-                AssertMsgFailed(("Failed to wait on event sem %p, rc=%d.\n", EventSem, rc));
+                AssertMsgFailed(("Failed to wait on event sem %p, rc=%d.\n", hEventSem, rc));
                 ASMAtomicDecU32(&pThis->cWaiters);
                 int rc2 = pthread_mutex_unlock(&pThis->Mutex);
-                AssertMsg(!rc2, ("Failed to unlock event sem %p, rc=%d.\n", EventSem, rc2)); NOREF(rc2);
+                AssertMsg(!rc2, ("Failed to unlock event sem %p, rc=%d.\n", hEventSem, rc2)); NOREF(rc2);
                 return RTErrConvertFromErrno(rc);
             }
@@ -390 +401 @@
         {
             ASMAtomicDecU32(&pThis->cWaiters);
-            AssertMsg(rc == ETIMEDOUT, ("Failed to lock event sem %p, rc=%d.\n", EventSem, rc));
+            AssertMsg(rc == ETIMEDOUT, ("Failed to lock event sem %p, rc=%d.\n", hEventSem, rc));
             return RTErrConvertFromErrno(rc);
         }
@@ -402 +413 @@
                 ASMAtomicDecU32(&pThis->cWaiters);
                 rc = pthread_mutex_unlock(&pThis->Mutex);
-                AssertMsg(!rc, ("Failed to unlock event sem %p, rc=%d.\n", EventSem, rc)); NOREF(rc);
+                AssertMsg(!rc, ("Failed to unlock event sem %p, rc=%d.\n", hEventSem, rc)); NOREF(rc);
                 return VINF_SUCCESS;
             }
@@ -408 +419 @@
             {
                 rc = pthread_mutex_unlock(&pThis->Mutex);
-                AssertMsg(!rc, ("Failed to unlock event sem %p, rc=%d.\n", EventSem, rc)); NOREF(rc);
+                AssertMsg(!rc, ("Failed to unlock event sem %p, rc=%d.\n", hEventSem, rc)); NOREF(rc);
                 return VERR_SEM_DESTROYED;
             }
@@ -442 +453 @@
             if (rc && (rc != EINTR || !fAutoResume)) /* according to SuS this function shall not return EINTR, but linux man page says differently. */
             {
-                AssertMsg(rc == ETIMEDOUT, ("Failed to wait on event sem %p, rc=%d.\n", EventSem, rc));
+                AssertMsg(rc == ETIMEDOUT, ("Failed to wait on event sem %p, rc=%d.\n", hEventSem, rc));
                 ASMAtomicDecU32(&pThis->cWaiters);
                 int rc2 = pthread_mutex_unlock(&pThis->Mutex);
-                AssertMsg(!rc2, ("Failed to unlock event sem %p, rc2=%d.\n", EventSem, rc2)); NOREF(rc2);
+                AssertMsg(!rc2, ("Failed to unlock event sem %p, rc2=%d.\n", hEventSem, rc2)); NOREF(rc2);
                 return RTErrConvertFromErrno(rc);
             }
@@ -453 +464 @@
 
 
-RTDECL(int)  RTSemEventWait(RTSEMEVENT EventSem, unsigned cMillies)
-{
-    int rc = rtSemEventWait(EventSem, cMillies, true);
+RTDECL(int)  RTSemEventWait(RTSEMEVENT hEventSem, unsigned cMillies)
+{
+    int rc = rtSemEventWait(hEventSem, cMillies, true);
     Assert(rc != VERR_INTERRUPTED);
     return rc;
@@ -461 +472 @@
 
 
-RTDECL(int)  RTSemEventWaitNoResume(RTSEMEVENT EventSem, unsigned cMillies)
-{
-    return rtSemEventWait(EventSem, cMillies, false);
+RTDECL(int)  RTSemEventWaitNoResume(RTSEMEVENT hEventSem, unsigned cMillies)
+{
+    return rtSemEventWait(hEventSem, cMillies, false);
 }