<!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>[183801] trunk/Source/WebKit2</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/183801">183801</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-05 01:20:47 -0700 (Tue, 05 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[SOUP] Network Cache: IOChannel operations are not sent to the right thread
https://bugs.webkit.org/show_bug.cgi?id=144542
Reviewed by Darin Adler.
We are ignoring the given WorkQueue and running the async
operations in the current thread. Check the given WorkQueue
instead and schedule the operation to the given queue. If the
given queue is nullptr, which means the operation should be run in
the main context, the operation is run directly if the current
context is the main one or sent to the main context using a
GMainLoopSource.
Fixes crashes due to asserts when running disk-cache layout tests
in a Debug build.
* NetworkProcess/cache/NetworkCacheIOChannel.h:
* NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp:
(WebKit::NetworkCache::runTaskInQueue):
(WebKit::NetworkCache::IOChannel::read):
(WebKit::NetworkCache::IOChannel::readSync):
(WebKit::NetworkCache::IOChannel::write):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheIOChannelh">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannel.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscacheNetworkCacheIOChannelSoupcpp">trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183800 => 183801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-05-05 08:16:16 UTC (rev 183800)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-05 08:20:47 UTC (rev 183801)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-05-05 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [SOUP] Network Cache: IOChannel operations are not sent to the right thread
+ https://bugs.webkit.org/show_bug.cgi?id=144542
+
+ Reviewed by Darin Adler.
+
+ We are ignoring the given WorkQueue and running the async
+ operations in the current thread. Check the given WorkQueue
+ instead and schedule the operation to the given queue. If the
+ given queue is nullptr, which means the operation should be run in
+ the main context, the operation is run directly if the current
+ context is the main one or sent to the main context using a
+ GMainLoopSource.
+
+ Fixes crashes due to asserts when running disk-cache layout tests
+ in a Debug build.
+
+ * NetworkProcess/cache/NetworkCacheIOChannel.h:
+ * NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp:
+ (WebKit::NetworkCache::runTaskInQueue):
+ (WebKit::NetworkCache::IOChannel::read):
+ (WebKit::NetworkCache::IOChannel::readSync):
+ (WebKit::NetworkCache::IOChannel::write):
+
</ins><span class="cx"> 2015-05-04 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> WebKit always goes through LaunchServices for main frame navigation actions
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheIOChannelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannel.h (183800 => 183801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannel.h 2015-05-05 08:16:16 UTC (rev 183800)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannel.h 2015-05-05 08:20:47 UTC (rev 183801)
</span><span class="lines">@@ -60,6 +60,12 @@
</span><span class="cx"> private:
</span><span class="cx"> IOChannel(const String& filePath, IOChannel::Type);
</span><span class="cx">
</span><ins>+#if USE(SOUP)
+ void read(size_t offset, size_t, std::function<void (Data&, int error)>);
+ void readSync(size_t offset, size_t, std::function<void (Data&, int error)>);
+ void write(size_t offset, const Data&, std::function<void (int error)>);
+#endif
+
</ins><span class="cx"> String m_path;
</span><span class="cx"> Type m_type;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheIOChannelSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp (183800 => 183801)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp 2015-05-05 08:16:16 UTC (rev 183800)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp 2015-05-05 08:20:47 UTC (rev 183801)
</span><span class="lines">@@ -29,6 +29,8 @@
</span><span class="cx"> #if ENABLE(NETWORK_CACHE)
</span><span class="cx">
</span><span class="cx"> #include "NetworkCacheFileSystemPosix.h"
</span><ins>+#include <wtf/gobject/GMainLoopSource.h>
+#include <wtf/gobject/GMutexLocker.h>
</ins><span class="cx"> #include <wtf/gobject/GUniquePtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -68,6 +70,17 @@
</span><span class="cx"> return adoptRef(*new IOChannel(filePath, type));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static inline void runTaskInQueue(std::function<void ()> task, WorkQueue* queue)
+{
+ if (queue) {
+ queue->dispatch(task);
+ return;
+ }
+
+ // Using nullptr as queue submits the result to the main context.
+ GMainLoopSource::scheduleAndDeleteOnDestroy("[WebKit] IOChannel task", task);
+}
+
</ins><span class="cx"> static void fillDataFromReadBuffer(SoupBuffer* readBuffer, size_t size, Data& data)
</span><span class="cx"> {
</span><span class="cx"> GRefPtr<SoupBuffer> buffer;
</span><span class="lines">@@ -125,7 +138,7 @@
</span><span class="cx"> reinterpret_cast<GAsyncReadyCallback>(inputStreamReadReadyCallback), asyncData.release());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void IOChannel::read(size_t offset, size_t size, WorkQueue*, std::function<void (Data&, int error)> completionHandler)
</del><ins>+void IOChannel::read(size_t offset, size_t size, std::function<void (Data&, int error)> completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_inputStream);
</span><span class="cx">
</span><span class="lines">@@ -139,8 +152,16 @@
</span><span class="cx"> reinterpret_cast<GAsyncReadyCallback>(inputStreamReadReadyCallback), asyncData);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void IOChannel::read(size_t offset, size_t size, WorkQueue* queue, std::function<void (Data&, int error)> completionHandler)
+{
+ RefPtr<IOChannel> channel(this);
+ runTaskInQueue([channel, offset, size, completionHandler] {
+ channel->read(offset, size, completionHandler);
+ }, queue);
+}
+
</ins><span class="cx"> // FIXME: It would be better to do without this.
</span><del>-void IOChannel::readSync(size_t offset, size_t size, WorkQueue*, std::function<void (Data&, int error)> completionHandler)
</del><ins>+void IOChannel::readSync(size_t offset, size_t size, std::function<void (Data&, int error)> completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_inputStream);
</span><span class="cx"> size_t bufferSize = std::min(size, gDefaultReadBufferSize);
</span><span class="lines">@@ -170,6 +191,20 @@
</span><span class="cx"> completionHandler(data, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void IOChannel::readSync(size_t offset, size_t size, WorkQueue* queue, std::function<void (Data&, int error)> completionHandler)
+{
+ static GMutex mutex;
+ static GCond condition;
+
+ WTF::GMutexLocker<GMutex> lock(mutex);
+ RefPtr<IOChannel> channel(this);
+ runTaskInQueue([channel, offset, size, completionHandler] {
+ channel->readSync(offset, size, completionHandler);
+ g_cond_signal(&condition);
+ }, queue);
+ g_cond_wait(&condition, &mutex);
+}
+
</ins><span class="cx"> struct WriteAsyncData {
</span><span class="cx"> RefPtr<IOChannel> channel;
</span><span class="cx"> GRefPtr<SoupBuffer> buffer;
</span><span class="lines">@@ -198,7 +233,7 @@
</span><span class="cx"> reinterpret_cast<GAsyncReadyCallback>(outputStreamWriteReadyCallback), asyncData.release());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void IOChannel::write(size_t offset, const Data& data, WorkQueue*, std::function<void (int error)> completionHandler)
</del><ins>+void IOChannel::write(size_t offset, const Data& data, std::function<void (int error)> completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_outputStream || m_ioStream);
</span><span class="cx">
</span><span class="lines">@@ -209,6 +244,14 @@
</span><span class="cx"> reinterpret_cast<GAsyncReadyCallback>(outputStreamWriteReadyCallback), asyncData);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void IOChannel::write(size_t offset, const Data& data, WorkQueue* queue, std::function<void (int error)> completionHandler)
+{
+ RefPtr<IOChannel> channel(this);
+ runTaskInQueue([channel, offset, data, completionHandler] {
+ channel->write(offset, data, completionHandler);
+ }, queue);
+}
+
</ins><span class="cx"> } // namespace NetworkCache
</span><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>