Changeset 25721 in vbox for trunk/src/VBox/Runtime/r3/os2

Timestamp:

Jan 11, 2010 2:01:53 PM (15 years ago)

Author:

vboxsync

Message:

iprt/RTSemMutex: MutexSem -> hMutexSem

File:

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

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

@@ -247 +247 @@
 
 
+RTDECL(void) RTSemEventMultiSetSignaller(RTSEMEVENTMULTI hEventMultiSem, RTTHREAD hThread)
+{
+    /** @todo implement RTSemEventMultiSetSignaller on OS/2 */
+}
+
+
+RTDECL(void) RTSemEventMultiAddSignaller(RTSEMEVENTMULTI hEventMultiSem, RTTHREAD hThread)
+{
+}
+
+
+RTDECL(void) RTSemEventMultiRemoveSignaller(RTSEMEVENTMULTI hEventMultiSem, RTTHREAD hThread)
+{
+}
+
 
 
@@ -277 +292 @@
 
 
-RTDECL(int)  RTSemMutexDestroy(RTSEMMUTEX MutexSem)
-{
+RTDECL(int)  RTSemMutexDestroy(RTSEMMUTEX hMutexSem)
+{
+    if (hMutexSem == NIL_RTSEMMUTEX)
+        return VINF_SUCCESS;
+
     /*
      * Close semaphore handle.
      */
-    int rc = DosCloseMutexSem(SEM2HND(MutexSem));
-    if (!rc)
-        return VINF_SUCCESS;
-    AssertMsgFailed(("Destroy MutexSem %p failed, rc=%d\n", MutexSem, rc));
+    int rc = DosCloseMutexSem(SEM2HND(hMutexSem));
+    if (!rc)
+        return VINF_SUCCESS;
+    AssertMsgFailed(("Destroy hMutexSem %p failed, rc=%d\n", hMutexSem, rc));
     return RTErrConvertFromOS2(rc);
 }
@@ -309 +327 @@
 
 #undef RTSemMutexRequestNoResume
-RTDECL(int)  RTSemMutexRequestNoResume(RTSEMMUTEX MutexSem, unsigned cMillies)
+RTDECL(int)  RTSemMutexRequestNoResume(RTSEMMUTEX hMutexSem, unsigned cMillies)
 {
     /*
      * Lock mutex semaphore.
      */
-    int rc = DosRequestMutexSem(SEM2HND(MutexSem), cMillies == RT_INDEFINITE_WAIT ? SEM_INDEFINITE_WAIT : cMillies);
+    int rc = DosRequestMutexSem(SEM2HND(hMutexSem), cMillies == RT_INDEFINITE_WAIT ? SEM_INDEFINITE_WAIT : cMillies);
     switch (rc)
     {
@@ -324 +342 @@
         default:
         {
-            AssertMsgFailed(("Wait on MutexSem %p failed, rc=%d\n", MutexSem, rc));
+            AssertMsgFailed(("Wait on hMutexSem %p failed, rc=%d\n", hMutexSem, rc));
             return RTErrConvertFromOS2(rc);
         }
@@ -330 +348 @@
 }
 
-RTDECL(int)  RTSemMutexRelease(RTSEMMUTEX MutexSem)
+RTDECL(int)  RTSemMutexRelease(RTSEMMUTEX hMutexSem)
 {
     /*
      * Unlock mutex semaphore.
      */
-    int rc = DosReleaseMutexSem(SEM2HND(MutexSem));
-    if (!rc)
-        return VINF_SUCCESS;
-    AssertMsgFailed(("Release MutexSem %p failed, rc=%d\n", MutexSem, rc));
-    return RTErrConvertFromOS2(rc);
-}
-
-
-RTDECL(bool) RTSemMutexIsOwned(RTSEMMUTEX hMutex);
+    int rc = DosReleaseMutexSem(SEM2HND(hMutexSem));
+    if (!rc)
+        return VINF_SUCCESS;
+    AssertMsgFailed(("Release hMutexSem %p failed, rc=%d\n", hMutexSem, rc));
+    return RTErrConvertFromOS2(rc);
+}
+
+
+RTDECL(bool) RTSemMutexIsOwned(RTSEMMUTEX hMutexSem);
 {
     /*
@@ -351 +369 @@
     TID     tid;
     ULONG   cRecursions;
-    int rc = DosQueryMutexSem(SEM2HND(MutexSem), &pid, &tid, &cRecursions);
+    int rc = DosQueryMutexSem(SEM2HND(hMutexSem), &pid, &tid, &cRecursions);
     if (!rc)
         return cRecursions != 0;
-    AssertMsgFailed(("DosQueryMutexSem %p failed, rc=%d\n", MutexSem, rc));
+    AssertMsgFailed(("DosQueryMutexSem %p failed, rc=%d\n", hMutexSem, rc));
     return rc == ERROR_SEM_OWNER_DIED;
 }
 
-
-RTDECL(void) RTSemEventMultiSetSignaller(RTSEMEVENTMULTI hEventMultiSem, RTTHREAD hThread)
-{
-    /** @todo implement RTSemEventMultiSetSignaller on OS/2 */
-}
-
-
-RTDECL(void) RTSemEventMultiAddSignaller(RTSEMEVENTMULTI hEventMultiSem, RTTHREAD hThread)
-{
-}
-
-
-RTDECL(void) RTSemEventMultiRemoveSignaller(RTSEMEVENTMULTI hEventMultiSem, RTTHREAD hThread)
-{
-}
-