Changeset 31579 in vbox for trunk/src/VBox/Frontends/VBoxHeadless

Timestamp:

Aug 11, 2010 5:21:27 PM (14 years ago)

Author:

vboxsync

Message:

EventQueue: Fix losing messages, use the right queue type on XPCOM (the fact that event handling in VBoxSVC worked was mainly luck), big code cleanup. VBoxHeadless and VirtualBoxImpl now use the only remaining event processing style. Eliminated redundant custom StateChange event in VBoxHeadless.

File:

• trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -83 +83 @@
 static EventQueue *gEventQ = NULL;
 
+/* flag whether frontend should terminate */
+static volatile bool g_fTerminateFE = false;
+
 #ifdef VBOX_WITH_VNC
 static VNCFB *g_pFramebufferVNC;
@@ -89 +92 @@
 
 ////////////////////////////////////////////////////////////////////////////////
-
-/**
- *  State change event.
- */
-class StateChangeEvent : public Event
-{
-public:
-    StateChangeEvent(MachineState_T state) : mState(state) {}
-protected:
-    void *handler()
-    {
-        LogFlow(("VBoxHeadless: StateChangeEvent: %d\n", mState));
-        /* post the termination event if the machine has been PoweredDown/Saved/Aborted */
-        if (mState < MachineState_Running)
-            gEventQ->postEvent(NULL);
-        return 0;
-    }
-private:
-    MachineState_T mState;
-};
 
 /**
@@ -319 +302 @@
                 scev->COMGETTER(State)(&machineState);
 
-                gEventQ->postEvent(new StateChangeEvent(machineState));
+                /* Terminate any event wait operation if the machine has been
+                 * PoweredDown/Saved/Aborted. */
+                if (machineState < MachineState_Running)
+                {
+                    g_fTerminateFE = true;
+                    gEventQ->interruptEventQueueProcessing();
+                }
+
                 break;
             }
@@ -1088 +1078 @@
                 break;
 
-            /* Process pending events, then wait for new ones. */
+            /* Process pending events, then wait for new ones. Note, this
+             * processes NULL events signalling event loop termination. */
             gEventQ->processEventQueue(0);
-            gEventQ->processEventQueue(500);
-        }
-
-        /** @todo The error handling here is kind of peculiar, anyone care
-         *        to comment why this works just fine? (this is old the code) */
+            if (!g_fTerminateFE)
+                gEventQ->processEventQueue(500);
+        }
+
         if (SUCCEEDED(progress->WaitForCompletion(-1)))
         {
+            /* Figure out if the operation completed with a failed status
+             * and print the error message. Terminate immediately, and let
+             * the cleanup code take care of potentially pending events. */
             LONG progressRc;
             progress->COMGETTER(ResultCode)(&progressRc);
             rc = progressRc;
-            if (FAILED(progressRc))
+            if (FAILED(rc))
             {
                 com::ProgressErrorInfo info(progress);
@@ -1111 +1104 @@
                     RTPrintf("Error: failed to start machine. No error message available!\n");
                 }
+                break;
             }
         }
@@ -1132 +1126 @@
         Log(("VBoxHeadless: Waiting for PowerDown...\n"));
 
-        Event *e;
-
-        while (gEventQ->waitForEvent(&e) && e)
-          gEventQ->handleEvent(e);
+        while (   !g_fTerminateFE
+               && RT_SUCCESS(gEventQ->processEventQueue(RT_INDEFINITE_WAIT)))
+            /* nothing */ ;
 
         Log(("VBoxHeadless: event loop has terminated...\n"));