Changeset 31598 in vbox

Timestamp:

Aug 12, 2010 12:56:15 PM (14 years ago)

Author:

vboxsync

Message:

EventQueue: Don't return VERR_TIMEOUT if we processed a message in waitForEventsOnDarwin. return VINF_INTERRUPTED when encountering EINTR.

Location:

trunk

Files:

• include/VBox/com/EventQueue.h (modified) (1 diff)
• src/VBox/Main/glue/EventQueue.cpp (modified) (5 diffs)
• src/VBox/Main/webservice/vboxweb.cpp (modified) (1 diff)
• src/libs/xpcom18a4/java/src/nsJavaInterfaces.cpp (modified) (1 diff)

trunk/include/VBox/com/EventQueue.h

@@ -92 +92 @@
 
     BOOL postEvent(Event *event);
-    int processEventQueue(uint32_t cMsTimeout);
+    int processEventQueue(RTMSINTERVAL cMsTimeout);
     int interruptEventQueueProcessing();
     int getSelectFD();

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

@@ -281 +281 @@
     CFTimeInterval rdTimeout = cMsTimeout == RT_INDEFINITE_WAIT ? 1e10 : (double)cMsTimeout / 1000;
     OSStatus orc = CFRunLoopRunInMode(kCFRunLoopDefaultMode, rdTimeout, true /*returnAfterSourceHandled*/);
-    /** @todo Not entire sure if the poll actually processes more than one message.
-     *        Feel free to check the sources anyone.  */
     if (orc == kCFRunLoopRunHandledSource)
-        orc = CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.0, false /*returnAfterSourceHandled*/);
+    {
+        OSStatus orc2 = CFRunLoopRunInMode(kCFRunLoopDefaultMode, 0.0, false /*returnAfterSourceHandled*/);
+        if (   orc2 == kCFRunLoopRunStopped
+            || orc2 == kCFRunLoopRunFinished)
+            orc = orc2;
+    }
     if (    orc == 0
         ||  orc == kCFRunLoopRunHandledSource)
@@ -301 +304 @@
  * @retval  VINF_SUCCESS
  * @retval  VERR_TIMEOUT
- * @retval  VERR_INTERRUPTED
+ * @retval  VINF_INTERRUPTED
  * @retval  VERR_INTERNAL_ERROR_4
  *
@@ -333 +336 @@
         rc = VERR_TIMEOUT;
     else if (errno == EINTR)
-        rc = VERR_INTERRUPTED;
+        rc = VINF_INTERRUPTED;
     else
     {
@@ -452 +455 @@
  * @retval  VERR_INTERRUPTED if interruptEventQueueProcessing was called.
  *          On Windows will also be returned when WM_QUIT is encountered.
- *          On UNIXy systems this may also be returned when a signal is
- *          dispatched on the calling thread.
  *          On Darwin this may also be returned when the native queue is
  *          stopped or destroyed/finished.
- * @todo Change this method to use some status other than VERR_INTERRUPTED
- *       for indicating harmless interruptions by the system, or some other
- *       status for indicating interruptEventQueueProcessing/WM_QUIT.  Maybe
- *       VINF_INTERRUPTED for system interruption would be best appropriate.
+ * @retval  VINF_INTERRUPTED if the native system call was interrupted by a
+ *          an asynchronous event delivery (signal) or just felt like returning
+ *          out of bounds.  On darwin it will also be returned if the queue is
+ *          stopped.
  */
 int EventQueue::processEventQueue(RTMSINTERVAL cMsTimeout)
@@ -535 +536 @@
 #endif // !VBOX_WITH_XPCOM
 
+    Assert(rc != VERR_TIMEOUT || cMsTimeout != RT_INDEFINITE_WAIT);
     return rc;
 }

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

@@ -771 +771 @@
 
     com::EventQueue *pQ = com::EventQueue::getMainEventQueue();
-    while (1)
+    for (;;)
     {
         // we have to process main event queue
         WEBDEBUG(("Pumping COM event queue\n"));
         int vrc = pQ->processEventQueue(RT_INDEFINITE_WAIT);
-        if (RT_FAILURE(vrc) && vrc != VERR_TIMEOUT)
+        if (RT_FAILURE(vrc))
             RTMsgError("processEventQueue -> %Rrc", rc);
     }

trunk/src/libs/xpcom18a4/java/src/nsJavaInterfaces.cpp

@@ -372 +372 @@
 
     if (   rc == VERR_TIMEOUT
-           || rc == VERR_INTERRUPTED)
+        || rc == VERR_INTERRUPTED)
         return 1;