vbox的更動 25720 路徑 trunk/src/VBox/Runtime/r3/os2

時間撮記:

2010-1-11 下午01:57:09 (15 年 以前)

作者:

vboxsync

訊息:

iprt: Added RTSemEventMultiCreateEx and did some cleanups of the RTSemEventMultiDestroy behavior wrt NIL handles.

檔案:

• trunk/src/VBox/Runtime/r3/os2/sems-os2.cpp (修改) (6 筆差異)

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

@@ -148 +148 @@
 
 
-RTDECL(int)  RTSemEventMultiCreate(PRTSEMEVENTMULTI pEventMultiSem)
-{
+RTDECL(int)  RTSemEventMultiCreate(PRTSEMEVENTMULTI phEventMultiSem)
+{
+    return RTSemEventMultiCreateEx(phEventMultiSem, 0 /*fFlags*/, NIL_RTLOCKVALCLASS, NULL);
+}
+
+
+RTDECL(int)  RTSemEventMultiCreateEx(PRTSEMEVENTMULTI phEventMultiSem, uint32_t fFlags, RTLOCKVALCLASS hClass,
+                                     const char *pszNameFmt, ...)
+{
+    AssertReturn(!(fFlags & ~RTSEMEVENTMULTI_FLAGS_NO_LOCK_VAL), VERR_INVALID_PARAMETER);
+
     /*
      * Create the semaphore.
@@ -158 +167 @@
     if (!rc)
     {
-        *pEventMultiSem = (RTSEMEVENTMULTI)(void *)hev;
-        return VINF_SUCCESS;
-    }
-    return RTErrConvertFromOS2(rc);
-}
-
-
-RTDECL(int)  RTSemEventMultiDestroy(RTSEMEVENTMULTI EventMultiSem)
-{
+        *phEventMultiSem = (RTSEMEVENTMULTI)(void *)hev;
+        return VINF_SUCCESS;
+    }
+    return RTErrConvertFromOS2(rc);
+}
+
+
+RTDECL(int)  RTSemEventMultiDestroy(RTSEMEVENTMULTI hEventMultiSem)
+{
+    if (hEventMultiSem == NIL_RTSEMEVENTMULTI)
+        return VINF_SUCCESS;
+
     /*
      * Close semaphore handle.
      */
-    int rc = DosCloseEventSem(SEM2HND(EventMultiSem));
-    if (!rc)
-        return VINF_SUCCESS;
-    AssertMsgFailed(("Destroy EventMultiSem %p failed, rc=%d\n", EventMultiSem, rc));
-    return RTErrConvertFromOS2(rc);
-}
-
-
-RTDECL(int)  RTSemEventMultiSignal(RTSEMEVENTMULTI EventMultiSem)
+    int rc = DosCloseEventSem(SEM2HND(hEventMultiSem));
+    if (!rc)
+        return VINF_SUCCESS;
+    AssertMsgFailed(("Destroy hEventMultiSem %p failed, rc=%d\n", hEventMultiSem, rc));
+    return RTErrConvertFromOS2(rc);
+}
+
+
+RTDECL(int)  RTSemEventMultiSignal(RTSEMEVENTMULTI hEventMultiSem)
 {
     /*
      * Signal the object.
      */
-    int rc = DosPostEventSem(SEM2HND(EventMultiSem));
+    int rc = DosPostEventSem(SEM2HND(hEventMultiSem));
     switch (rc)
     {
@@ -196 +208 @@
 
 
-RTDECL(int)  RTSemEventMultiReset(RTSEMEVENTMULTI EventMultiSem)
+RTDECL(int)  RTSemEventMultiReset(RTSEMEVENTMULTI hEventMultiSem)
 {
     /*
@@ -202 +214 @@
      */
     ULONG ulIgnore;
-    int rc = DosResetEventSem(SEM2HND(EventMultiSem), &ulIgnore);
+    int rc = DosResetEventSem(SEM2HND(hEventMultiSem), &ulIgnore);
     switch (rc)
     {
@@ -214 +226 @@
 
 
-RTDECL(int)  RTSemEventMultiWaitNoResume(RTSEMEVENTMULTI EventMultiSem, unsigned cMillies)
+RTDECL(int)  RTSemEventMultiWaitNoResume(RTSEMEVENTMULTI hEventMultiSem, unsigned cMillies)
 {
     /*
      * Wait for condition.
      */
-    int rc = DosWaitEventSem(SEM2HND(EventMultiSem), cMillies == RT_INDEFINITE_WAIT ? SEM_INDEFINITE_WAIT : cMillies);
+    int rc = DosWaitEventSem(SEM2HND(hEventMultiSem), cMillies == RT_INDEFINITE_WAIT ? SEM_INDEFINITE_WAIT : cMillies);
     switch (rc)
     {
@@ -228 +240 @@
         default:
         {
-            AssertMsgFailed(("Wait on EventMultiSem %p failed, rc=%d\n", EventMultiSem, rc));
+            AssertMsgFailed(("Wait on hEventMultiSem %p failed, rc=%d\n", hEventMultiSem, rc));
             return RTErrConvertFromOS2(rc);
         }