<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[162235] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/162235">162235</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-01-17 17:58:16 -0800 (Fri, 17 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a callOnMainThreadAndWait variant in SocketStreamHandle
https://bugs.webkit.org/show_bug.cgi?id=127180
Reviewed by Geoffrey Garen.
Source/WebCore:
WTF::callOnMainThreadAndWait was only used inside SocketStreamHandleCFNet.cpp,
so add an improved version there which is implemented in terms of callOnMainThread and
with the bonus of handling spurious wake-ups correctly (the old version didn't).
* platform/network/cf/SocketStreamHandle.h:
* platform/network/cf/SocketStreamHandleCFNet.cpp:
(WebCore::callOnMainThreadAndWait):
(WebCore::SocketStreamHandle::pacExecutionCallback):
(WebCore::SocketStreamHandle::readStreamCallback):
(WebCore::SocketStreamHandle::writeStreamCallback):
Source/WTF:
Remove callOnMainThreadAndWait from WTF.
* wtf/MainThread.cpp:
* wtf/MainThread.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfMainThreadcpp">trunk/Source/WTF/wtf/MainThread.cpp</a></li>
<li><a href="#trunkSourceWTFwtfMainThreadh">trunk/Source/WTF/wtf/MainThread.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfSocketStreamHandleh">trunk/Source/WebCore/platform/network/cf/SocketStreamHandle.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfSocketStreamHandleCFNetcpp">trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (162234 => 162235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-01-18 01:47:19 UTC (rev 162234)
+++ trunk/Source/WTF/ChangeLog 2014-01-18 01:58:16 UTC (rev 162235)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-01-17 Anders Carlsson <andersca@apple.com>
+
+ Add a callOnMainThreadAndWait variant in SocketStreamHandle
+ https://bugs.webkit.org/show_bug.cgi?id=127180
+
+ Reviewed by Geoffrey Garen.
+
+ Remove callOnMainThreadAndWait from WTF.
+
+ * wtf/MainThread.cpp:
+ * wtf/MainThread.h:
+
</ins><span class="cx"> 2014-01-17 Peter Molnar <pmolnar.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> Remove workaround for compilers not supporting deleted functions
</span></span></pre></div>
<a id="trunkSourceWTFwtfMainThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/MainThread.cpp (162234 => 162235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/MainThread.cpp 2014-01-18 01:47:19 UTC (rev 162234)
+++ trunk/Source/WTF/wtf/MainThread.cpp 2014-01-18 01:58:16 UTC (rev 162235)
</span><span class="lines">@@ -194,24 +194,6 @@
</span><span class="cx"> scheduleDispatchFunctionsOnMainThread();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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);
-}
-
</del><span class="cx"> void cancelCallOnMainThread(MainThreadFunction* function, void* context)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(function);
</span></span></pre></div>
<a id="trunkSourceWTFwtfMainThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/MainThread.h (162234 => 162235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/MainThread.h 2014-01-18 01:47:19 UTC (rev 162234)
+++ trunk/Source/WTF/wtf/MainThread.h 2014-01-18 01:58:16 UTC (rev 162235)
</span><span class="lines">@@ -42,7 +42,6 @@
</span><span class="cx"> WTF_EXPORT_PRIVATE void initializeMainThread();
</span><span class="cx">
</span><span class="cx"> WTF_EXPORT_PRIVATE void callOnMainThread(MainThreadFunction*, void* context);
</span><del>-WTF_EXPORT_PRIVATE void callOnMainThreadAndWait(MainThreadFunction*, void* context);
</del><span class="cx"> WTF_EXPORT_PRIVATE void cancelCallOnMainThread(MainThreadFunction*, void* context);
</span><span class="cx">
</span><span class="cx"> WTF_EXPORT_PRIVATE void callOnMainThread(std::function<void ()>);
</span><span class="lines">@@ -94,7 +93,6 @@
</span><span class="cx"> } // namespace WTF
</span><span class="cx">
</span><span class="cx"> using WTF::callOnMainThread;
</span><del>-using WTF::callOnMainThreadAndWait;
</del><span class="cx"> using WTF::cancelCallOnMainThread;
</span><span class="cx"> using WTF::setMainThreadCallbacksPaused;
</span><span class="cx"> using WTF::isMainThread;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162234 => 162235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-18 01:47:19 UTC (rev 162234)
+++ trunk/Source/WebCore/ChangeLog 2014-01-18 01:58:16 UTC (rev 162235)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2014-01-17 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Add a callOnMainThreadAndWait variant in SocketStreamHandle
+ https://bugs.webkit.org/show_bug.cgi?id=127180
+
+ Reviewed by Geoffrey Garen.
+
+ WTF::callOnMainThreadAndWait was only used inside SocketStreamHandleCFNet.cpp,
+ so add an improved version there which is implemented in terms of callOnMainThread and
+ with the bonus of handling spurious wake-ups correctly (the old version didn't).
+
+ * platform/network/cf/SocketStreamHandle.h:
+ * platform/network/cf/SocketStreamHandleCFNet.cpp:
+ (WebCore::callOnMainThreadAndWait):
+ (WebCore::SocketStreamHandle::pacExecutionCallback):
+ (WebCore::SocketStreamHandle::readStreamCallback):
+ (WebCore::SocketStreamHandle::writeStreamCallback):
+
+2014-01-17 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Clean up PageCache classes
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=127202
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfSocketStreamHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/SocketStreamHandle.h (162234 => 162235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/SocketStreamHandle.h 2014-01-18 01:47:19 UTC (rev 162234)
+++ trunk/Source/WebCore/platform/network/cf/SocketStreamHandle.h 2014-01-18 01:58:16 UTC (rev 162235)
</span><span class="lines">@@ -66,7 +66,6 @@
</span><span class="cx"> void removePACRunLoopSource();
</span><span class="cx"> RetainPtr<CFRunLoopSourceRef> m_pacRunLoopSource;
</span><span class="cx"> static void pacExecutionCallback(void* client, CFArrayRef proxyList, CFErrorRef error);
</span><del>- static void pacExecutionCallbackMainThread(void*);
</del><span class="cx"> static CFStringRef copyPACExecutionDescription(void*);
</span><span class="cx">
</span><span class="cx"> bool shouldUseSSL() const { return m_url.protocolIs("wss"); }
</span><span class="lines">@@ -79,10 +78,6 @@
</span><span class="cx"> static CFStringRef copyCFStreamDescription(void*);
</span><span class="cx"> static void readStreamCallback(CFReadStreamRef, CFStreamEventType, void*);
</span><span class="cx"> static void writeStreamCallback(CFWriteStreamRef, CFStreamEventType, void*);
</span><del>-#if PLATFORM(WIN)
- static void readStreamCallbackMainThread(void*);
- static void writeStreamCallbackMainThread(void*);
-#endif
</del><span class="cx"> void readStreamCallback(CFStreamEventType);
</span><span class="cx"> void writeStreamCallback(CFStreamEventType);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfSocketStreamHandleCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp (162234 => 162235)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp 2014-01-18 01:47:19 UTC (rev 162234)
+++ trunk/Source/WebCore/platform/network/cf/SocketStreamHandleCFNet.cpp 2014-01-18 01:58:16 UTC (rev 162235)
</span><span class="lines">@@ -38,6 +38,8 @@
</span><span class="cx"> #include "ProtectionSpace.h"
</span><span class="cx"> #include "SocketStreamError.h"
</span><span class="cx"> #include "SocketStreamHandleClient.h"
</span><ins>+#include <condition_variable>
+#include <mutex>
</ins><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -125,6 +127,30 @@
</span><span class="cx"> return CFSTR("WebSocket proxy PAC file execution");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void callOnMainThreadAndWait(std::function<void ()> function)
+{
+ if (isMainThread()) {
+ function();
+ return;
+ }
+
+ std::mutex mutex;
+ std::condition_variable conditionVariable;
+
+ bool isFinished = false;
+
+ callOnMainThread([&] {
+ function();
+
+ std::lock_guard<std::mutex> lock(mutex);
+ isFinished = true;
+ conditionVariable.notify_one();
+ });
+
+ std::unique_lock<std::mutex> lock(mutex);
+ conditionVariable.wait(lock, [&] { return isFinished; });
+}
+
</ins><span class="cx"> struct MainThreadPACCallbackInfo {
</span><span class="cx"> MainThreadPACCallbackInfo(SocketStreamHandle* handle, CFArrayRef proxyList) : handle(handle), proxyList(proxyList) { }
</span><span class="cx"> RefPtr<SocketStreamHandle> handle;
</span><span class="lines">@@ -134,21 +160,16 @@
</span><span class="cx"> void SocketStreamHandle::pacExecutionCallback(void* client, CFArrayRef proxyList, CFErrorRef)
</span><span class="cx"> {
</span><span class="cx"> SocketStreamHandle* handle = static_cast<SocketStreamHandle*>(client);
</span><del>- MainThreadPACCallbackInfo info(handle, proxyList);
- // If we're already on main thread (e.g. on Mac), callOnMainThreadAndWait() will be just a function call.
- callOnMainThreadAndWait(pacExecutionCallbackMainThread, &info);
-}
</del><span class="cx">
</span><del>-void SocketStreamHandle::pacExecutionCallbackMainThread(void* invocation)
-{
- MainThreadPACCallbackInfo* info = static_cast<MainThreadPACCallbackInfo*>(invocation);
- ASSERT(info->handle->m_connectingSubstate == ExecutingPACFile);
- // This time, the array won't have PAC as a first entry.
- if (info->handle->m_state != Connecting)
- return;
- info->handle->chooseProxyFromArray(info->proxyList);
- info->handle->createStreams();
- info->handle->scheduleStreams();
</del><ins>+ callOnMainThreadAndWait([&] {
+ ASSERT(handle->m_connectingSubstate == ExecutingPACFile);
+ // This time, the array won't have PAC as a first entry.
+ if (handle->m_state != Connecting)
+ return;
+ handle->chooseProxyFromArray(proxyList);
+ handle->createStreams();
+ handle->scheduleStreams();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SocketStreamHandle::executePACFileURL(CFURLRef pacFileURL)
</span><span class="lines">@@ -399,19 +420,14 @@
</span><span class="cx"> return String("WebKit socket stream, " + handle->m_url.string()).createCFString().leakRef();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-struct MainThreadEventCallbackInfo {
- MainThreadEventCallbackInfo(CFStreamEventType type, SocketStreamHandle* handle) : type(type), handle(handle) { }
- CFStreamEventType type;
- RefPtr<SocketStreamHandle> handle;
-};
-
</del><span class="cx"> void SocketStreamHandle::readStreamCallback(CFReadStreamRef stream, CFStreamEventType type, void* clientCallBackInfo)
</span><span class="cx"> {
</span><span class="cx"> SocketStreamHandle* handle = static_cast<SocketStreamHandle*>(clientCallBackInfo);
</span><span class="cx"> ASSERT_UNUSED(stream, stream == handle->m_readStream.get());
</span><span class="cx"> #if PLATFORM(WIN)
</span><del>- MainThreadEventCallbackInfo info(type, handle);
- callOnMainThreadAndWait(readStreamCallbackMainThread, &info);
</del><ins>+ callOnMainThreadAndWait([&] {
+ handle->readStreamCallback(type);
+ });
</ins><span class="cx"> #else
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> handle->readStreamCallback(type);
</span><span class="lines">@@ -423,28 +439,15 @@
</span><span class="cx"> SocketStreamHandle* handle = static_cast<SocketStreamHandle*>(clientCallBackInfo);
</span><span class="cx"> ASSERT_UNUSED(stream, stream == handle->m_writeStream.get());
</span><span class="cx"> #if PLATFORM(WIN)
</span><del>- MainThreadEventCallbackInfo info(type, handle);
- callOnMainThreadAndWait(writeStreamCallbackMainThread, &info);
</del><ins>+ callOnMainThreadAndWait([&] {
+ handle->writeStreamCallback(type);
+ });
</ins><span class="cx"> #else
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> handle->writeStreamCallback(type);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if PLATFORM(WIN)
-void SocketStreamHandle::readStreamCallbackMainThread(void* invocation)
-{
- MainThreadEventCallbackInfo* info = static_cast<MainThreadEventCallbackInfo*>(invocation);
- info->handle->readStreamCallback(info->type);
-}
-
-void SocketStreamHandle::writeStreamCallbackMainThread(void* invocation)
-{
- MainThreadEventCallbackInfo* info = static_cast<MainThreadEventCallbackInfo*>(invocation);
- info->handle->writeStreamCallback(info->type);
-}
-#endif // PLATFORM(WIN)
-
</del><span class="cx"> void SocketStreamHandle::readStreamCallback(CFStreamEventType type)
</span><span class="cx"> {
</span><span class="cx"> switch(type) {
</span></span></pre>
</div>
</div>
</body>
</html>