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

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/VBoxSDL

Files:

• Framebuffer.cpp (modified) (1 diff)
• VBoxSDL.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp

@@ -52 +52 @@
 
 #if defined(VBOX_WITH_XPCOM)
-NS_IMPL_ISUPPORTS1_CI(VBoxSDLFB, IFramebuffer)
+NS_IMPL_THREADSAFE_ISUPPORTS1_CI(VBoxSDLFB, IFramebuffer)
 NS_DECL_CLASSINFO(VBoxSDLFB)
-NS_IMPL_ISUPPORTS1_CI(VBoxSDLFBOverlay, IFramebufferOverlay)
+NS_IMPL_THREADSAFE_ISUPPORTS1_CI(VBoxSDLFBOverlay, IFramebufferOverlay)
 NS_DECL_CLASSINFO(VBoxSDLFBOverlay)
 #endif

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -1012 +1012 @@
     }
 
-    // create the event queue
-    // (here it is necessary only to process remaining XPCOM/IPC events
-    // after the session is closed)
-    /// @todo
-//    EventQueue eventQ;
-
-#ifdef USE_XPCOM_QUEUE_THREAD
-    nsCOMPtr<nsIEventQueue> eventQ;
-    NS_GetMainEventQ(getter_AddRefs(eventQ));
-#endif /* USE_XPCOM_QUEUE_THREAD */
+    EventQueue* eventQ = com::EventQueue::getMainEventQueue();
 
     /* Get the number of network adapters */
@@ -2043 +2034 @@
      * event queue buffer!
      */
-    startXPCOMEventQueueThread(eventQ->GetEventQueueSelectFD());
+    startXPCOMEventQueueThread(eventQ->getSelectFD());
 #endif /* USE_XPCOM_QUEUE_THREAD */
 
@@ -2124 +2115 @@
                     {
                         LogFlow(("SDL_USER_EVENT_XPCOM_EVENTQUEUE: processing XPCOM event queue...\n"));
-                        eventQ->ProcessPendingEvents();
+                        eventQ->processEventQueue(0);
                         signalXPCOMEventQueueThread();
                         break;
@@ -2156 +2147 @@
             }
         }
+        eventQ->processEventQueue(0);
     } while (   rc == S_OK
              && (   machineState == MachineState_Starting
@@ -2591 +2583 @@
             {
                 LogFlow(("SDL_USER_EVENT_XPCOM_EVENTQUEUE: processing XPCOM event queue...\n"));
-                eventQ->ProcessPendingEvents();
+                eventQ->processEventQueue(0);
                 signalXPCOMEventQueueThread();
                 break;