Changeset 25655 in vbox

Timestamp:

Jan 5, 2010 3:37:32 PM (15 years ago)

Author:

vboxsync

Message:

semevent-win.cpp: Moved RTEventSignal up in the file

File:

• trunk/src/VBox/Runtime/r3/win/semevent-win.cpp (modified) (4 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2009 Sun Microsystems, Inc.
+ * Copyright (C) 2006-2010 Sun Microsystems, Inc.
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -135 +135 @@
 
 
+RTDECL(int)  RTSemEventSignal(RTSEMEVENT EventSem)
+{
+    /*
+     * Validate input.
+     */
+    struct RTSEMEVENTINTERNAL *pThis = EventSem;
+    AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
+    AssertReturn(pThis->u32Magic == RTSEMEVENT_MAGIC, VERR_INVALID_HANDLE);
+
+#ifdef RTSEMEVENT_STRICT
+    if (pThis->fEverHadSignallers)
+    {
+        int rc9 = RTLockValidatorRecSharedCheckSignaller(&pThis->Signallers, NIL_RTTHREAD);
+        if (RT_FAILURE(rc9))
+            return rc9;
+    }
+#endif
+
+    /*
+     * Signal the object.
+     */
+    if (SetEvent(pThis->hev))
+        return VINF_SUCCESS;
+    DWORD dwErr = GetLastError();
+    AssertMsgFailed(("Signaling EventSem %p failed, lasterr=%d\n", pThis, dwErr));
+    return RTErrConvertFromWin32(dwErr);
+}
+
+
 RTDECL(int)   RTSemEventWaitNoResume(RTSEMEVENT EventSem, unsigned cMillies)
 {
@@ -176 +205 @@
         case WAIT_FAILED:
         {
-            AssertMsgFailed(("Wait on EventSem %p failed, rc=%d lasterr=%d\n", EventSem, rc, GetLastError()));
+            AssertMsgFailed(("Wait on EventSem %p failed, rc=%d lasterr=%d\n", pThis, rc, GetLastError()));
             int rc2 = RTErrConvertFromWin32(GetLastError());
             if (rc2)
@@ -188 +217 @@
 
 
-RTDECL(int)  RTSemEventSignal(RTSEMEVENT EventSem)
-{
-    /*
-     * Validate input.
-     */
-    struct RTSEMEVENTINTERNAL *pThis = EventSem;
-    AssertPtrReturn(pThis, VERR_INVALID_HANDLE);
-    AssertReturn(pThis->u32Magic == RTSEMEVENT_MAGIC, VERR_INVALID_HANDLE);
-
-#ifdef RTSEMEVENT_STRICT
-    if (pThis->fEverHadSignallers)
-    {
-        int rc9 = RTLockValidatorRecSharedCheckSignaller(&pThis->Signallers, NIL_RTTHREAD);
-        if (RT_FAILURE(rc9))
-            return rc9;
-    }
-#endif
-
-    /*
-     * Signal the object.
-     */
-    if (SetEvent(pThis->hev))
-        return VINF_SUCCESS;
-    DWORD dwErr = GetLastError();
-    AssertMsgFailed(("Signaling EventSem %p failed, lasterr=%d\n", pThis, dwErr));
-    return RTErrConvertFromWin32(dwErr);
-}
-
-
 RTDECL(void) RTSemEventSetSignaller(RTSEMEVENT hEventSem, RTTHREAD hThread)
 {