Changeset 51222 in webkit for trunk/JavaScriptCore/wtf/MainThread.cpp

Timestamp:

Nov 19, 2009, 4:53:38 PM (16 years ago)

Author:

[email protected]

Message:

Reviewed by Darin Adler.

​https://bugs.webkit.org/show_bug.cgi?id=31690
Make SocketStreamHandleCFNet work on Windows

• WebCore.vcproj/WebCore.vcproj: Added LoaderRunLoopCF.

• platform/network/ResourceHandle.h: Removed loaderRunLoop().

• platform/network/cf/LoaderRunLoopCF.cpp: Added. (WebCore::emptyPerform): (WebCore::runLoaderThread): (WebCore::loaderRunLoop):
• platform/network/cf/LoaderRunLoopCF.h: Added. Moved the run loop that we use for CFNetwork from ResourceHandle to its own file, because it's needed for more than just resource loading.

• platform/network/cf/ResourceHandleCFNet.cpp: Use loaderRunLoop() from its new location.

• platform/network/cf/DNSCFNet.cpp: (WebCore::DNSResolveQueue::resolve): Ditto.

• platform/network/cf/SocketStreamHandle.h: Added static callbacks for forwarding events to main thread.
• platform/network/cf/SocketStreamHandleCFNet.cpp: (WebCore::SocketStreamHandle::SocketStreamHandle): Use loaderRunLoop() on Windows instead of inoperable main run loop.

(WebCore::MainThreadEventCallbackInfo::MainThreadEventCallbackInfo):
(WebCore::SocketStreamHandle::readStreamCallback):
(WebCore::SocketStreamHandle::writeStreamCallback):
(WebCore::SocketStreamHandle::readStreamCallbackMainThread):
(WebCore::SocketStreamHandle::writeStreamCallbackMainThread):
Forward stream events to main thread on Windows.

File:

• trunk/JavaScriptCore/wtf/MainThread.cpp (modified) (3 diffs)

trunk/JavaScriptCore/wtf/MainThread.cpp

@@ -40 +40 @@
     MainThreadFunction* function;
     void* context;
+    ThreadCondition* syncFlag;
 
-    FunctionWithContext(MainThreadFunction* function = 0, void* context = 0)
+    FunctionWithContext(MainThreadFunction* function = 0, void* context = 0, ThreadCondition* syncFlag = 0)
         : function(function)
         , context(context)
+        , syncFlag(syncFlag)
     { 
     }
@@ -93 +95 @@
 
         invocation.function(invocation.context);
+        if (invocation.syncFlag)
+            invocation.syncFlag->signal();
 
         // If we are running accumulated functions for too long so UI may become unresponsive, we need to
@@ -118 +122 @@
 }
 
+void callOnMainThreadAndWait(MainThreadFunction* function, void* context)
+{
+    ASSERT(function);
+
+    if (isMainThread()) {
+        function(context);
+        return;
+    }
+
+    ThreadCondition syncFlag;
+    Mutex& functionQueueMutex = mainThreadFunctionQueueMutex();
+    MutexLocker locker(functionQueueMutex);
+    functionQueue().append(FunctionWithContext(function, context, &syncFlag));
+    if (functionQueue().size() == 1)
+        scheduleDispatchFunctionsOnMainThread();
+    syncFlag.wait(functionQueueMutex);
+}
+
 void setMainThreadCallbacksPaused(bool paused)
 {