Changeset 30135 in vbox for trunk/src/libs/xpcom18a4/xpcom/threads/plevent.c

Timestamp:

Jun 9, 2010 6:28:05 PM (15 years ago)

Author:

vboxsync

Message:

plevent.c: Acknowledge the native queue on darwin so that we don't end up spinning when using EventQueue::processEventQueue in a state checking loop (like in testdriver.base.waitForTasks).

File:

• trunk/src/libs/xpcom18a4/xpcom/threads/plevent.c (modified) (4 diffs)

trunk/src/libs/xpcom18a4/xpcom/threads/plevent.c

@@ -171 +171 @@
     CFRunLoopSourceRef  mRunLoopSource;
     CFRunLoopRef        mMainRunLoop;
+    CFStringRef         mRunLoopModeStr;                                                                /* vbox */
 #elif defined(MAC_USE_CARBON_EVENT)
     EventHandlerUPP     eventHandlerUPP;
@@ -946 +947 @@
 
     CFRunLoopRemoveSource(self->mMainRunLoop, self->mRunLoopSource, kCFRunLoopCommonModes);
+    CFRunLoopRemoveSource(self->mMainRunLoop, self->mRunLoopSource, self->mRunLoopModeStr);             /* vbox */
     CFRelease(self->mRunLoopSource);
     CFRelease(self->mMainRunLoop);
+    CFRelease(self->mRunLoopModeStr);                                                                   /* vbox */
 
 #elif defined(MAC_USE_CARBON_EVENT)
@@ -1335 +1338 @@
         return PR_SUCCESS;
     return PR_FAILURE;
+#elif defined(MAC_USE_CFRUNLOOPSOURCE)                                                                  /* vbox */
+                                                                                                        /* vbox */
+    CFRunLoopRunInMode(self->mRunLoopModeStr, 0.0, 1);                                                  /* vbox */
+    return PR_SUCCESS;                                                                                  /* vbox */
 #else
 
@@ -1637 +1644 @@
     CFRunLoopAddSource(eventQueue->mMainRunLoop, eventQueue->mRunLoopSource, kCFRunLoopCommonModes);
 
+    /* Add it again but with a unique mode name so we can acknowledge it
+       without processing any other message sources. */
+    {                                                                                                   /* vbox */
+        char szModeName[80];                                                                            /* vbox */
+        snprintf(szModeName, sizeof(szModeName), "VBoxXPCOMQueueMode-%p", eventQueue);                  /* vbox */
+        eventQueue->mRunLoopModeStr = CFStringCreateWithCString(kCFAllocatorDefault,                    /* vbox */
+                                                                szModeName, kCFStringEncodingASCII);    /* vbox */
+        CFRunLoopAddSource(eventQueue->mMainRunLoop,                                                    /* vbox */
+                           eventQueue->mRunLoopSource, eventQueue->mRunLoopModeStr);                    /* vbox */
+    }                                                                                                   /* vbox */
+
 #elif defined(MAC_USE_CARBON_EVENT)
     eventQueue->eventHandlerUPP = NewEventHandlerUPP(_md_EventReceiverProc);