<!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>[184901] 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/184901">184901</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-27 01:37:20 -0700 (Wed, 27 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[SOUP] Network Cache: Handle the case when we fail to create the IO stream
https://bugs.webkit.org/show_bug.cgi?id=145406
Reviewed by Sergio Villar Senin.
We were asserting in that case, but it can happen that we
fail to create the stream. It happened to me after <a href="http://trac.webkit.org/projects/webkit/changeset/184690">r184690</a>, that
changed the NetworkCache::Key hash. Since this was not expected to
happen, the async operation never finished and the completion
handler never called, leaving resources loading forever. We
should make sure we call the completion handler with an error
code, so that the load finishes and the entry is silently removed
from the cache.
* NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp:
(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="#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 (184900 => 184901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-05-27 07:23:49 UTC (rev 184900)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-27 08:37:20 UTC (rev 184901)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-05-27 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [SOUP] Network Cache: Handle the case when we fail to create the IO stream
+ https://bugs.webkit.org/show_bug.cgi?id=145406
+
+ Reviewed by Sergio Villar Senin.
+
+ We were asserting in that case, but it can happen that we
+ fail to create the stream. It happened to me after r184690, that
+ changed the NetworkCache::Key hash. Since this was not expected to
+ happen, the async operation never finished and the completion
+ handler never called, leaving resources loading forever. We
+ should make sure we call the completion handler with an error
+ code, so that the load finishes and the entry is silently removed
+ from the cache.
+
+ * NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp:
+ (WebKit::NetworkCache::IOChannel::read):
+ (WebKit::NetworkCache::IOChannel::readSync):
+ (WebKit::NetworkCache::IOChannel::write):
+
</ins><span class="cx"> 2015-05-26 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Network Cache: Add cache capacity to the totals of JSON file
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscacheNetworkCacheIOChannelSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp (184900 => 184901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp 2015-05-27 07:23:49 UTC (rev 184900)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp 2015-05-27 08:37:20 UTC (rev 184901)
</span><span class="lines">@@ -48,7 +48,6 @@
</span><span class="cx"> case Type::Create: {
</span><span class="cx"> g_file_delete(file.get(), nullptr, nullptr);
</span><span class="cx"> m_outputStream = adoptGRef(G_OUTPUT_STREAM(g_file_create(file.get(), static_cast<GFileCreateFlags>(G_FILE_CREATE_PRIVATE), nullptr, nullptr)));
</span><del>- ASSERT(m_outputStream);
</del><span class="cx"> #if !HAVE(STAT_BIRTHTIME)
</span><span class="cx"> GUniquePtr<char> birthtimeString(g_strdup_printf("%" G_GUINT64_FORMAT, std::chrono::system_clock::to_time_t(std::chrono::system_clock::now())));
</span><span class="cx"> g_file_set_attribute_string(file.get(), "xattr::birthtime", birthtimeString.get(), G_FILE_QUERY_INFO_NONE, nullptr, nullptr);
</span><span class="lines">@@ -57,12 +56,10 @@
</span><span class="cx"> }
</span><span class="cx"> case Type::Write: {
</span><span class="cx"> m_ioStream = adoptGRef(g_file_open_readwrite(file.get(), nullptr, nullptr));
</span><del>- ASSERT(m_ioStream);
</del><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> case Type::Read:
</span><span class="cx"> m_inputStream = adoptGRef(G_INPUT_STREAM(g_file_read(file.get(), nullptr, nullptr)));
</span><del>- ASSERT(m_inputStream);
</del><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -142,7 +139,11 @@
</span><span class="cx">
</span><span class="cx"> void IOChannel::read(size_t offset, size_t size, std::function<void (Data&, int error)> completionHandler)
</span><span class="cx"> {
</span><del>- ASSERT(m_inputStream);
</del><ins>+ if (!m_inputStream) {
+ Data data;
+ completionHandler(data, -1);
+ return;
+ }
</ins><span class="cx">
</span><span class="cx"> size_t bufferSize = std::min(size, gDefaultReadBufferSize);
</span><span class="cx"> uint8_t* bufferData = static_cast<uint8_t*>(fastMalloc(bufferSize));
</span><span class="lines">@@ -165,7 +166,12 @@
</span><span class="cx"> // FIXME: It would be better to do without this.
</span><span class="cx"> void IOChannel::readSync(size_t offset, size_t size, std::function<void (Data&, int error)> completionHandler)
</span><span class="cx"> {
</span><del>- ASSERT(m_inputStream);
</del><ins>+ if (!m_inputStream) {
+ Data data;
+ completionHandler(data, -1);
+ return;
+ }
+
</ins><span class="cx"> size_t bufferSize = std::min(size, gDefaultReadBufferSize);
</span><span class="cx"> uint8_t* bufferData = static_cast<uint8_t*>(fastMalloc(bufferSize));
</span><span class="cx"> GRefPtr<SoupBuffer> readBuffer = adoptGRef(soup_buffer_new_with_owner(bufferData, bufferSize, bufferData, fastFree));
</span><span class="lines">@@ -237,9 +243,17 @@
</span><span class="cx">
</span><span class="cx"> void IOChannel::write(size_t offset, const Data& data, std::function<void (int error)> completionHandler)
</span><span class="cx"> {
</span><del>- ASSERT(m_outputStream || m_ioStream);
</del><ins>+ if (!m_outputStream && !m_ioStream) {
+ completionHandler(-1);
+ return;
+ }
</ins><span class="cx">
</span><span class="cx"> GOutputStream* stream = m_outputStream ? m_outputStream.get() : g_io_stream_get_output_stream(G_IO_STREAM(m_ioStream.get()));
</span><ins>+ if (!stream) {
+ completionHandler(-1);
+ return;
+ }
+
</ins><span class="cx"> WriteAsyncData* asyncData = new WriteAsyncData { this, data.soupBuffer(), completionHandler };
</span><span class="cx"> // FIXME: implement offset.
</span><span class="cx"> g_output_stream_write_async(stream, asyncData->buffer->data, data.size(), G_PRIORITY_DEFAULT, nullptr,
</span></span></pre>
</div>
</div>
</body>
</html>