Changeset 23073 in vbox for trunk/src

Timestamp:

Sep 17, 2009 8:31:00 AM (15 years ago)

Author:

vboxsync

Message:

xpcom18a4/xpcom/threads/pleven.c: Backported the CFRunLoop changes from the mozilla1.8.0 branch. These changes are related to mozilla bugs 271050 and 282940. This should fix the VBoxHeadless issue on Snow Leopard.

File:

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

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

@@ -69 +69 @@
 #endif
 
-#if defined(XP_MAC) || defined(XP_MACOSX)
-#if !defined(MOZ_WIDGET_COCOA) && TARGET_CARBON
-#include <CarbonEvents.h>
-#define MAC_USE_CARBON_EVENT
-#else
-#include <Processes.h>
-#define MAC_USE_WAKEUPPROCESS
-#endif
-#endif
-
-#if defined(XP_MAC)
-#include "pprthred.h"
-#else
+#if defined(XP_MACOSX)
+#if defined(MOZ_WIDGET_COCOA)
+#include <CoreFoundation/CoreFoundation.h>
+#define MAC_USE_CFRUNLOOPSOURCE
+#elif defined(TARGET_CARBON)
+/* #include <CarbonEvents.h> */
+/* #define MAC_USE_CARBON_EVENT */
+#include <CoreFoundation/CoreFoundation.h>
+#define MAC_USE_CFRUNLOOPSOURCE
+#endif
+#endif
+
 #include "private/pprthred.h"
-#endif /* defined(XP_MAC) */
 
 #if defined(VMS)
@@ -152 +150 @@
     PRPackedBool        processingEvents;
     PRPackedBool        notified;
-#if defined(_WIN32) 
+#if defined(_WIN32)
     PRPackedBool        timerSet;
 #endif
@@ -169 +167 @@
 #elif defined(XP_BEOS)
     port_id             eventport;
-#elif defined(XP_MAC) || defined(XP_MACOSX)
-#if defined(MAC_USE_CARBON_EVENT)
+#elif defined(XP_MACOSX)
+#if defined(MAC_USE_CFRUNLOOPSOURCE)
+    CFRunLoopSourceRef  mRunLoopSource;
+    CFRunLoopRef        mMainRunLoop;
+#elif defined(MAC_USE_CARBON_EVENT)
     EventHandlerUPP     eventHandlerUPP;
     EventHandlerRef     eventHandlerRef;
-#elif defined(MAC_USE_WAKEUPPROCESS)
-    ProcessSerialNumber psn;
 #endif
 #endif
@@ -259 +258 @@
     self->removeMsg = PR_TRUE;
 #endif
-#if defined(MAC_USE_WAKEUPPROCESS)
-    self->psn.lowLongOfPSN = kNoProcess;
-#endif
 
     self->notified = PR_FALSE;
@@ -286 +282 @@
 }
 
-PR_EXTERN(PLEventQueue *) 
+PR_EXTERN(PLEventQueue *)
 PL_CreateNativeEventQueue(const char *name, PRThread *handlerThread)
 {
@@ -292 +288 @@
 }
 
-PR_EXTERN(PLEventQueue *) 
+PR_EXTERN(PLEventQueue *)
 PL_CreateMonitoredEventQueue(const char *name, PRThread *handlerThread)
 {
@@ -307 +303 @@
 _pl_destroyEvent(PLEvent* event, void* data, PLEventQueue* queue)
 {
-#ifdef XP_MAC
-#pragma unused (data, queue)
-#endif
     PL_DequeueEvent(event, queue);
     PL_DestroyEvent(event);
@@ -735 +728 @@
 PL_DequeueEvent(PLEvent* self, PLEventQueue* queue)
 {
-#ifdef XP_MAC
-#pragma unused (queue)
-#endif
     if (self == NULL)
         return;
@@ -851 +841 @@
 _pl_SetupNativeNotifier(PLEventQueue* self)
 {
-#if defined(XP_MAC)
-#pragma unused (self)
-#endif
-
 #if defined(VMS)
     unsigned int status;
@@ -907 +893 @@
     char portname[64];
     char semname[64];
-    PR_snprintf(portname, sizeof(portname), "event%lx", 
+    PR_snprintf(portname, sizeof(portname), "event%lx",
                 (long unsigned) self->handlerThread);
-    PR_snprintf(semname, sizeof(semname), "sync%lx", 
+    PR_snprintf(semname, sizeof(semname), "sync%lx",
                 (long unsigned) self->handlerThread);
 
@@ -932 +918 @@
 _pl_CleanupNativeNotifier(PLEventQueue* self)
 {
-#if defined(XP_MAC)
-#pragma unused (self)
-#endif
-
 #if defined(VMS)
     {
@@ -953 +935 @@
     RemoveProp(self->eventReceiverWindow, _md_GetEventQueuePropName());
 
-    /* DestroyWindow doesn't do anything when called from a non ui thread.  Since 
+    /* DestroyWindow doesn't do anything when called from a non ui thread.  Since
      * self->eventReceiverWindow was created on the ui thread, it must be destroyed
      * on the ui thread.
@@ -961 +943 @@
 #elif defined(XP_OS2)
     WinDestroyWindow(self->eventReceiverWindow);
+#elif defined(MAC_USE_CFRUNLOOPSOURCE)
+
+    CFRunLoopRemoveSource(self->mMainRunLoop, self->mRunLoopSource, kCFRunLoopCommonModes);
+    CFRelease(self->mRunLoopSource);
+    CFRelease(self->mMainRunLoop);
+
 #elif defined(MAC_USE_CARBON_EVENT)
     EventComparatorUPP comparator = NewEventComparatorUPP(_md_CarbonEventComparator);
@@ -1259 +1247 @@
 #endif /* XP_BEOS */
 
-#if defined(XP_MAC) || defined(XP_MACOSX)
+#if defined(XP_MACOSX)
 static PRStatus
 _pl_NativeNotify(PLEventQueue* self)
 {
-#if defined(MAC_USE_CARBON_EVENT)
+#if defined(MAC_USE_CFRUNLOOPSOURCE)
+        CFRunLoopSourceSignal(self->mRunLoopSource);
+        CFRunLoopWakeUp(self->mMainRunLoop);
+#elif defined(MAC_USE_CARBON_EVENT)
     OSErr err;
     EventRef newEvent;
@@ -1277 +1268 @@
     if (err != noErr)
         return PR_FAILURE;
-#elif defined(MAC_USE_WAKEUPPROCESS)
-    WakeUpProcess(&self->psn);
 #endif
     return PR_SUCCESS;
 }
-#endif /* defined(XP_MAC) || defined(XP_MACOSX) */
+#endif /* defined(XP_MACOSX) */
 
 static PRStatus
@@ -1341 +1330 @@
 #else
 
-#if defined(XP_MAC)
-#pragma unused (self)
-#endif
-
     /* nothing to do on the other platforms */
     return PR_SUCCESS;
@@ -1577 +1562 @@
 #endif /* (defined(XP_UNIX) && !defined(XP_MACOSX)) || defined(XP_BEOS) */
 
-#if defined(MAC_USE_CARBON_EVENT)
+#if defined(MAC_USE_CFRUNLOOPSOURCE)
+static void _md_EventReceiverProc(void *info)
+{
+  PLEventQueue *queue = (PLEventQueue*)info;
+  PL_ProcessPendingEvents(queue);
+}
+
+#elif defined(MAC_USE_CARBON_EVENT)
 /*
 ** _md_CreateEventQueue() -- ModelDependent initializer
@@ -1619 +1611 @@
 #endif /* defined(MAC_USE_CARBON_EVENT) */
 
-#if defined(XP_MAC) || defined(XP_MACOSX)
+#if defined(XP_MACOSX)
 static void _md_CreateEventQueue( PLEventQueue *eventQueue )
 {
-#if defined(MAC_USE_CARBON_EVENT)
+#if defined(MAC_USE_CFRUNLOOPSOURCE)
+    CFRunLoopSourceContext sourceContext = { 0 };
+    sourceContext.version = 0;
+    sourceContext.info = (void*)eventQueue;
+    sourceContext.perform = _md_EventReceiverProc;
+
+    /* make a run loop source */
+    eventQueue->mRunLoopSource = CFRunLoopSourceCreate(kCFAllocatorDefault, 0 /* order */, &sourceContext);
+    PR_ASSERT(eventQueue->mRunLoopSource);
+
+    eventQueue->mMainRunLoop = CFRunLoopGetCurrent();
+    CFRetain(eventQueue->mMainRunLoop);
+
+    /* and add it to the run loop */
+    CFRunLoopAddSource(eventQueue->mMainRunLoop, eventQueue->mRunLoopSource, kCFRunLoopCommonModes);
+
+#elif defined(MAC_USE_CARBON_EVENT)
     eventQueue->eventHandlerUPP = NewEventHandlerUPP(_md_EventReceiverProc);
     PR_ASSERT(eventQueue->eventHandlerUPP);
@@ -1636 +1644 @@
       PR_ASSERT(eventQueue->eventHandlerRef);
     }
-#elif defined(MAC_USE_WAKEUPPROCESS)
-    OSErr err = GetCurrentProcess(&eventQueue->psn);
-    PR_ASSERT(err == noErr);
 #endif
 } /* end _md_CreateEventQueue() */
-#endif /* defined(XP_MAC) || defined(XP_MACOSX) */
+#endif /* defined(XP_MACOSX) */
 
 /* extra functions for unix */