Changeset 25717 in vbox for trunk/src/VBox/Runtime/r3/os2/sems-os2.cpp

Timestamp:

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

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/Runtime/r3/os2/sems-os2.cpp (modified) (5 diffs)

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

@@ -47 +47 @@
 
 
-/* Undefine debug mappings. */
-#undef RTSemMutexRequest
-#undef RTSemMutexRequestNoResume
-
-
-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);
+
     /*
      * Create the semaphore.
@@ -62 +66 @@
     if (!rc)
     {
-        *pEventSem = (RTSEMEVENT)(void *)hev;
-        return VINF_SUCCESS;
-    }
-    return RTErrConvertFromOS2(rc);
-}
-
-
-RTDECL(int)   RTSemEventDestroy(RTSEMEVENT EventSem)
-{
-    if (EventSem == NIL_RTSEMEVENT)     /* don't bitch */
-        return VERR_INVALID_HANDLE;
+        *phEventSem = (RTSEMEVENT)(void *)hev;
+        return VINF_SUCCESS;
+    }
+    return RTErrConvertFromOS2(rc);
+}
+
+
+RTDECL(int)   RTSemEventDestroy(RTSEMEVENT hEventSem)
+{
+    if (hEventSem == NIL_RTSEMEVENT)
+        return VINF_SUCCESS;
 
     /*
      * Close semaphore handle.
      */
-    int rc = DosCloseEventSem(SEM2HND(EventSem));
-    if (!rc)
-        return VINF_SUCCESS;
-    AssertMsgFailed(("Destroy EventSem %p failed, rc=%d\n", EventSem, rc));
-    return RTErrConvertFromOS2(rc);
-}
-
-
-RTDECL(int)   RTSemEventWaitNoResume(RTSEMEVENT EventSem, unsigned cMillies)
+    int rc = DosCloseEventSem(SEM2HND(hEventSem));
+    if (!rc)
+        return VINF_SUCCESS;
+    AssertMsgFailed(("Destroy hEventSem %p failed, rc=%d\n", hEventSem, rc));
+    return RTErrConvertFromOS2(rc);
+}
+
+
+RTDECL(int)   RTSemEventWaitNoResume(RTSEMEVENT hEventSem, unsigned cMillies)
 {
     /*
      * Wait for condition.
      */
-    int rc = DosWaitEventSem(SEM2HND(EventSem), cMillies == RT_INDEFINITE_WAIT ? SEM_INDEFINITE_WAIT : cMillies);
+    int rc = DosWaitEventSem(SEM2HND(hEventSem), cMillies == RT_INDEFINITE_WAIT ? SEM_INDEFINITE_WAIT : cMillies);
     switch (rc)
     {
@@ -99 +103 @@
         default:
         {
-            AssertMsgFailed(("Wait on EventSem %p failed, rc=%d\n", EventSem, rc));
+            AssertMsgFailed(("Wait on hEventSem %p failed, rc=%d\n", hEventSem, rc));
             return RTErrConvertFromOS2(rc);
         }
@@ -106 +110 @@
 
 
-RTDECL(int)  RTSemEventSignal(RTSEMEVENT EventSem)
+RTDECL(int)  RTSemEventSignal(RTSEMEVENT hEventSem)
 {
     /*
      * Signal the object.
      */
-    int rc = DosPostEventSem(SEM2HND(EventSem));
+    int rc = DosPostEventSem(SEM2HND(hEventSem));
     switch (rc)
     {
@@ -292 +296 @@
 
 
+#undef RTSemMutexRequestNoResume
 RTDECL(int)  RTSemMutexRequestNoResume(RTSEMMUTEX MutexSem, unsigned cMillies)
 {