Changeset 51222 in webkit for trunk/JavaScriptCore

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.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def (modified) (1 diff)
• wtf/MainThread.cpp (modified) (3 diffs)
• wtf/MainThread.h (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2009-11-19  Alexey Proskuryakov  <[email protected]>
+
+        Reviewed by Darin Adler.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31690
+        Make SocketStreamHandleCFNet work on Windows
+
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
+        * wtf/MainThread.cpp:
+        (WTF::FunctionWithContext::FunctionWithContext):
+        (WTF::dispatchFunctionsFromMainThread):
+        (WTF::callOnMainThreadAndWait):
+        * wtf/MainThread.h:
+        Re-add callOnMainThreadAndWait(), which was removed in bug 23926.
+
 2009-11-19  Dmitry Titov  <[email protected]>
 

trunk/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def

@@ -53 +53 @@
     ?call@JSC@@YA?AVJSValue@1@PAVExecState@1@V21@W4CallType@1@ABTCallData@1@1ABVArgList@1@@Z
     ?callOnMainThread@WTF@@YAXP6AXPAX@Z0@Z
+    ?callOnMainThreadAndWait@WTF@@YAXP6AXPAX@Z0@Z
     ?changePrototypeTransition@Structure@JSC@@SA?AV?$PassRefPtr@VStructure@JSC@@@WTF@@PAV12@VJSValue@2@@Z
     ?checkSameIdentifierTable@Identifier@JSC@@CAXPAVExecState@2@PAURep@UString@2@@Z

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)
 {

trunk/JavaScriptCore/wtf/MainThread.h

@@ -39 +39 @@
 void callOnMainThread(MainThreadFunction*, void* context);
 
+// Blocks the thread until the call finishes on the main thread. Misusing this can easily cause deadlocks.
+void callOnMainThreadAndWait(MainThreadFunction*, void* context);
+
 void setMainThreadCallbacksPaused(bool paused);
 
@@ -53 +56 @@
 
 using WTF::callOnMainThread;
+using WTF::callOnMainThreadAndWait;
 using WTF::setMainThreadCallbacksPaused;