Changeset 46651 in vbox for trunk/src

Timestamp:

Jun 19, 2013 11:54:43 AM (12 years ago)

Author:

vboxsync

Message:

Build fix.

Location:

trunk/src/VBox/Main

Files:

• glue/NativeEventQueue.cpp (modified) (5 diffs)
• glue/initterm.cpp (modified) (1 diff)
• src-server/VirtualBoxImpl.cpp (modified) (1 diff)
• webservice/vboxweb.cpp (modified) (2 diffs)

trunk/src/VBox/Main/glue/NativeEventQueue.cpp

@@ -81 +81 @@
 struct MyPLEvent : public PLEvent
 {
-    MyPLEvent(Event *e) : event(e) {}
-    Event *event;
+    MyPLEvent(NativeEvent *e) : event(e) {}
+    NativeEvent *event;
 };
 
@@ -88 +88 @@
 void *PR_CALLBACK com::NativeEventQueue::plEventHandler(PLEvent *self)
 {
-    Event *ev = ((MyPLEvent *)self)->event;
+    NativeEvent *ev = ((MyPLEvent *)self)->event;
     if (ev)
         ev->handler();
@@ -103 +103 @@
 void PR_CALLBACK com::NativeEventQueue::plEventDestructor(PLEvent *self)
 {
-    Event *ev = ((MyPLEvent *)self)->event;
+    NativeEvent *ev = ((MyPLEvent *)self)->event;
     if (ev)
         delete ev;
@@ -222 +222 @@
         /* Check that it actually is the main event queue, i.e. that
            we're called on the right thread. */
-        nsCOMPtr<nsINativeEventQueue> q;
+        nsCOMPtr<nsIEventQueue> q;
         nsresult rv = NS_GetMainEventQ(getter_AddRefs(q));
         Assert(NS_SUCCEEDED(rv));
@@ -646 +646 @@
 {
 #ifdef VBOX_WITH_XPCOM
-    return mEventQ->GetNativeEventQueueSelectFD();
+    return mEventQ->GetEventQueueSelectFD();
 #else
     return -1;

trunk/src/VBox/Main/glue/initterm.cpp

@@ -556 +556 @@
             if (--gXPCOMInitCount == 0)
             {
-                MainEventQueue::uninit();
+                NativeEventQueue::uninit();
                 rc = NS_ShutdownXPCOM(nsnull);
 

trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp

@@ -5380 +5380 @@
          * See @bugref{5724}.
          */
-        while (pEventQueue->processEventQueue(RT_INDEFINITE_WAIT) != VERR_INTERRUPTED)
-            /* nothing */ ;
+        for (;;)
+        {
+            rc = pEventQueue->processEventQueue(RT_INDEFINITE_WAIT);
+            if (rc == VERR_INTERRUPTED)
+            {
+                LogFlow(("Event queue processing ended with rc=%Rrc\n", rc));
+                rc = VINF_SUCCESS; /* Set success when exiting. */
+                break;
+            }
+        }
 
         delete pEventQueue;

trunk/src/VBox/Main/webservice/vboxweb.cpp

@@ -26 +26 @@
 #include <VBox/com/ErrorInfo.h>
 #include <VBox/com/errorprint.h>
-#include <VBox/com/EventQueue.h>
 #include <VBox/com/listeners.h>
+#include <VBox/com/NativeEventQueue.h>
 #include <VBox/VBoxAuth.h>
 #include <VBox/version.h>
@@ -1232 +1232 @@
     }
 
-    com::EventQueue *pQ = com::EventQueue::getMainEventQueue();
+    com::NativeEventQueue *pQ = com::NativeEventQueue::getMainEventQueue();
     for (;;)
     {