Changeset 22911 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Sep 10, 2009 12:02:36 PM (16 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

52173

Message:

event queues cleaned up

Location:

trunk/src/VBox/Frontends/VBoxManage

Files:

• VBoxManage.cpp (modified) (2 diffs)
• VBoxManage.h (modified) (2 diffs)
• VBoxManageGuestProp.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -1825 +1825 @@
     }
 
-    /* create the event queue
-     * (here it is necessary only to process remaining XPCOM/IPC events
-     * after the session is closed) */
-
-#ifdef VBOX_WITH_XPCOM
-    nsCOMPtr<nsIEventQueue> eventQ;
-    NS_GetMainEventQ(getter_AddRefs(eventQ));
-#endif
-
-#ifdef VBOX_WITH_XPCOM
-    HandlerArg handlerArg = { 0, NULL, eventQ, virtualBox, session };
-#else
     HandlerArg handlerArg = { 0, NULL, virtualBox, session };
-#endif
 
     /*
@@ -1917 +1904 @@
     session->Close();
 
-#ifdef VBOX_WITH_XPCOM
-    eventQ->ProcessPendingEvents();
-#endif
-
+    EventQueue::getMainEventQueue()->processEventQueue(0);
     // end "all-stuff" scope
     ////////////////////////////////////////////////////////////////////////////

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.h

@@ -27 +27 @@
 #include <VBox/com/ptr.h>
 #include <VBox/com/VirtualBox.h>
-#include <VBox/com/EventQueue.h>
 #include <VBox/com/string.h>
 #endif /* !VBOX_ONLY_DOCS */
 
 #include <iprt/types.h>
-
-#if defined(VBOX_WITH_XPCOM) && !defined(RT_OS_DARWIN) && !defined(RT_OS_OS2)
-# define USE_XPCOM_QUEUE
-#endif
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -108 +103 @@
     char **argv;
 
-#ifdef VBOX_WITH_XPCOM
-    nsCOMPtr<nsIEventQueue> eventQ;
-#endif
 #ifndef VBOX_ONLY_DOCS
     ComPtr<IVirtualBox> virtualBox;

trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp

@@ -33 +33 @@
 
 #include <VBox/com/VirtualBox.h>
+#include <VBox/com/EventQueue.h>
 
 #include <VBox/log.h>
@@ -393 +394 @@
 
 /**
- * Callback for processThreadEventQueue.
- *
- * @param   pvUser  Pointer to the callback object.
- *
- * @returns true if it should return or false if it should continue waiting for
- *          events.
- */
-static bool eventExitCheck(void *pvUser)
-{
-    GuestPropertyCallback const *pCallbacks = (GuestPropertyCallback const *)pvUser;
-    return pCallbacks->Signalled();
-}
-
-/**
  * Enumerates the properties in the guest property store.
  *
@@ -473 +460 @@
     a->virtualBox->RegisterCallback(callback);
 
-    int vrc = com::EventQueue::processThreadEventQueue(cMsTimeout, eventExitCheck, (void *)cbImpl,
-                                                       1000 /*cMsPollInterval*/, false /*fReturnOnEvent*/);
-    if (   RT_FAILURE(vrc)
-        && vrc != VERR_CALLBACK_RETURN
-        && vrc != VERR_TIMEOUT)
-    {
-        RTPrintf("Error waiting for event: %Rrc\n", vrc);
-        return 1;
-    }
+    do {
+      int vrc = com::EventQueue::getMainEventQueue()->processEventQueue(1000);
+      if (RT_FAILURE(vrc) && vrc != VERR_TIMEOUT)
+      {
+          RTPrintf("Error waiting for event: %Rrc\n", vrc);
+          return 1;
+      }
+    } while  (!cbImpl->Signalled());
 
     a->virtualBox->UnregisterCallback(callback);