<!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>[183259] trunk</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/183259">183259</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-04-24 04:05:40 -0700 (Fri, 24 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>
Source/WebCore:
CrashTracer: WebProcess at com.apple.WebCore: WebCore::toScriptElementIfPossible + 4
https://bugs.webkit.org/show_bug.cgi?id=144050
Reviewed by Chris Dumez.
We are seeing null Element pointer crashes with this stack:
47 com.apple.WebCore: WebCore::toScriptElementIfPossible + 4 <==
47 com.apple.WebCore: WebCore::ScriptRunner::timerFired + 452
47 com.apple.WebCore: WebCore::ThreadTimers::sharedTimerFiredInternal + 175
The most likely cause seems to be that this code
ASSERT(m_pendingAsyncScripts.contains(scriptElement));
m_scriptsToExecuteSoon.append(m_pendingAsyncScripts.take(scriptElement));
in ScriptRunner::notifyScriptReady fails to find scriptElement and we are left with null entry in
m_scriptsToExecuteSoon. However I haven't managed to repro this or find the exact path how this
could happen. The related code is fragile with lot of state (especially in ScriptElement class)
and involves many opportunities for re-entry via scripts.
No repro, no test case.
* dom/ScriptRunner.cpp:
(WebCore::ScriptRunner::timerFired):
Paper this over by adding a null check. We could check m_pendingAsyncScripts.take() above
but this also covers possibility this is caused by something else.
LayoutTests:
Memory cache live resources repeatedly purged during painting
https://bugs.webkit.org/show_bug.cgi?id=144104
Reviewed by Chris Dumez.
* http/tests/cache/disk-cache/disk-cache-vary-cookie.html:
These clearMemoryCache calls are now done by cache-test.js.
* http/tests/cache/disk-cache/resources/cache-test.js:
(loadResources):
Make sure to clear the memory cache explicitly in the beginning so we always hit the disk cache.
(runTests):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestscachediskcachediskcachevarycookiehtml">trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-vary-cookie.html</a></li>
<li><a href="#trunkLayoutTestshttptestscachediskcacheresourcescachetestjs">trunk/LayoutTests/http/tests/cache/disk-cache/resources/cache-test.js</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourcecpp">trunk/Source/WebCore/loader/cache/CachedResource.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheMemoryCachecpp">trunk/Source/WebCore/loader/cache/MemoryCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheMemoryCacheh">trunk/Source/WebCore/loader/cache/MemoryCache.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (183258 => 183259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-04-24 10:21:13 UTC (rev 183258)
+++ trunk/LayoutTests/ChangeLog 2015-04-24 11:05:40 UTC (rev 183259)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-04-24 Antti Koivisto <antti@apple.com>
+
+ Memory cache live resources repeatedly purged during painting
+ https://bugs.webkit.org/show_bug.cgi?id=144104
+
+ Reviewed by Chris Dumez.
+
+ * http/tests/cache/disk-cache/disk-cache-vary-cookie.html:
+
+ These clearMemoryCache calls are now done by cache-test.js.
+
+ * http/tests/cache/disk-cache/resources/cache-test.js:
+ (loadResources):
+
+ Make sure to clear the memory cache explicitly in the beginning so we always hit the disk cache.
+
+ (runTests):
+
</ins><span class="cx"> 2015-04-23 Basile Clement <basile_clement@apple.com>
</span><span class="cx">
</span><span class="cx"> Allow function allocation sinking
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscachediskcachediskcachevarycookiehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-vary-cookie.html (183258 => 183259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-vary-cookie.html 2015-04-24 10:21:13 UTC (rev 183258)
+++ trunk/LayoutTests/http/tests/cache/disk-cache/disk-cache-vary-cookie.html 2015-04-24 11:05:40 UTC (rev 183259)
</span><span class="lines">@@ -15,16 +15,13 @@
</span><span class="cx"> document.cookie = "cookie=value";
</span><span class="cx"> loadResources(tests, function () {
</span><span class="cx"> printResults(tests);
</span><del>- internals.clearMemoryCache();
</del><span class="cx"> debug("Loading again");
</span><span class="cx"> loadResources(tests, function () {
</span><span class="cx"> printResults(tests);
</span><del>- internals.clearMemoryCache();
</del><span class="cx"> debug("Changing cookie and loading");
</span><span class="cx"> document.cookie = "cookie=othervalue";
</span><span class="cx"> loadResources(tests, function () {
</span><span class="cx"> printResults(tests);
</span><del>- internals.clearMemoryCache()
</del><span class="cx"> debug("Loading again");
</span><span class="cx"> loadResources(tests, function () {
</span><span class="cx"> printResults(tests);
</span></span></pre></div>
<a id="trunkLayoutTestshttptestscachediskcacheresourcescachetestjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/cache/disk-cache/resources/cache-test.js (183258 => 183259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/cache/disk-cache/resources/cache-test.js 2015-04-24 10:21:13 UTC (rev 183258)
+++ trunk/LayoutTests/http/tests/cache/disk-cache/resources/cache-test.js 2015-04-24 11:05:40 UTC (rev 183259)
</span><span class="lines">@@ -69,6 +69,9 @@
</span><span class="cx">
</span><span class="cx"> function loadResources(tests, completetion)
</span><span class="cx"> {
</span><ins>+ // Otherwise we just get responses from the memory cache.
+ internals.clearMemoryCache();
+
</ins><span class="cx"> var pendingCount = tests.length;
</span><span class="cx"> for (var i = 0; i < tests.length; ++i) {
</span><span class="cx"> loadResource(tests[i], function (ev) {
</span><span class="lines">@@ -97,8 +100,6 @@
</span><span class="cx"> function runTests(tests, completionHandler)
</span><span class="cx"> {
</span><span class="cx"> loadResources(tests, function () {
</span><del>- // Otherwise we just get responses from the memory cache.
- internals.clearMemoryCache();
</del><span class="cx"> // Wait a bit so things settle down in the disk cache.
</span><span class="cx"> setTimeout(function () {
</span><span class="cx"> loadResources(tests, function () {
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (183258 => 183259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-24 10:21:13 UTC (rev 183258)
+++ trunk/Source/WebCore/ChangeLog 2015-04-24 11:05:40 UTC (rev 183259)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2015-04-24 Antti Koivisto <antti@apple.com>
+
+ CrashTracer: WebProcess at com.apple.WebCore: WebCore::toScriptElementIfPossible + 4
+ https://bugs.webkit.org/show_bug.cgi?id=144050
+
+ Reviewed by Chris Dumez.
+
+ We are seeing null Element pointer crashes with this stack:
+
+ 47 com.apple.WebCore: WebCore::toScriptElementIfPossible + 4 <==
+ 47 com.apple.WebCore: WebCore::ScriptRunner::timerFired + 452
+ 47 com.apple.WebCore: WebCore::ThreadTimers::sharedTimerFiredInternal + 175
+
+ The most likely cause seems to be that this code
+
+ ASSERT(m_pendingAsyncScripts.contains(scriptElement));
+ m_scriptsToExecuteSoon.append(m_pendingAsyncScripts.take(scriptElement));
+
+ in ScriptRunner::notifyScriptReady fails to find scriptElement and we are left with null entry in
+ m_scriptsToExecuteSoon. However I haven't managed to repro this or find the exact path how this
+ could happen. The related code is fragile with lot of state (especially in ScriptElement class)
+ and involves many opportunities for re-entry via scripts.
+
+ No repro, no test case.
+
+ * dom/ScriptRunner.cpp:
+ (WebCore::ScriptRunner::timerFired):
+
+ Paper this over by adding a null check. We could check m_pendingAsyncScripts.take() above
+ but this also covers possibility this is caused by something else.
+
</ins><span class="cx"> 2015-04-24 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [SOUP] Use a webkit subdirectory for the disk cache
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (183258 => 183259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2015-04-24 10:21:13 UTC (rev 183258)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2015-04-24 11:05:40 UTC (rev 183259)
</span><span class="lines">@@ -460,7 +460,7 @@
</span><span class="cx"> // We allow non-secure content to be reused in history, but we do not allow secure content to be reused.
</span><span class="cx"> memoryCache.remove(*this);
</span><span class="cx"> }
</span><del>- memoryCache.prune();
</del><ins>+ memoryCache.pruneSoon();
</ins><span class="cx"> }
</span><span class="cx"> // This object may be dead here.
</span><span class="cx"> }
</span><span class="lines">@@ -557,7 +557,7 @@
</span><span class="cx"> memoryCache.removeFromLiveDecodedResourcesList(*this);
</span><span class="cx"> memoryCache.insertInLiveDecodedResourcesList(*this);
</span><span class="cx"> }
</span><del>- memoryCache.prune();
</del><ins>+ memoryCache.pruneSoon();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheMemoryCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/MemoryCache.cpp (183258 => 183259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2015-04-24 10:21:13 UTC (rev 183258)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2015-04-24 11:05:40 UTC (rev 183259)
</span><span class="lines">@@ -69,6 +69,7 @@
</span><span class="cx"> , m_deadDecodedDataDeletionInterval(defaultDecodedDataDeletionInterval)
</span><span class="cx"> , m_liveSize(0)
</span><span class="cx"> , m_deadSize(0)
</span><ins>+ , m_pruneTimer(*this, &MemoryCache::pruneTimerFired)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -745,15 +746,34 @@
</span><span class="cx"> ASSERT(!m_sessionResources.contains(sessionID));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool MemoryCache::needsPruning() const
+{
+ return m_liveSize + m_deadSize > m_capacity || m_deadSize > m_maxDeadCapacity;
+}
+
</ins><span class="cx"> void MemoryCache::prune()
</span><span class="cx"> {
</span><del>- if (m_liveSize + m_deadSize <= m_capacity && m_deadSize <= m_maxDeadCapacity) // Fast path.
</del><ins>+ if (!needsPruning())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> pruneDeadResources(); // Prune dead first, in case it was "borrowing" capacity from live.
</span><span class="cx"> pruneLiveResources();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MemoryCache::pruneTimerFired()
+{
+ prune();
+}
+
+void MemoryCache::pruneSoon()
+{
+ if (m_pruneTimer.isActive())
+ return;
+ if (!needsPruning())
+ return;
+ m_pruneTimer.startOneShot(0);
+}
+
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> void MemoryCache::dumpStats()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheMemoryCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/MemoryCache.h (183258 => 183259)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/MemoryCache.h 2015-04-24 10:21:13 UTC (rev 183258)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.h 2015-04-24 11:05:40 UTC (rev 183259)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> #include "NativeImagePtr.h"
</span><span class="cx"> #include "SecurityOriginHash.h"
</span><span class="cx"> #include "SessionID.h"
</span><ins>+#include "Timer.h"
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="lines">@@ -117,6 +118,7 @@
</span><span class="cx"> WEBCORE_EXPORT void evictResources(SessionID);
</span><span class="cx">
</span><span class="cx"> void prune();
</span><ins>+ void pruneSoon();
</ins><span class="cx"> unsigned size() const { return m_liveSize + m_deadSize; }
</span><span class="cx">
</span><span class="cx"> void setDeadDecodedDataDeletionInterval(std::chrono::milliseconds interval) { m_deadDecodedDataDeletionInterval = interval; }
</span><span class="lines">@@ -184,6 +186,8 @@
</span><span class="cx">
</span><span class="cx"> unsigned liveCapacity() const;
</span><span class="cx"> unsigned deadCapacity() const;
</span><ins>+ bool needsPruning() const;
+ void pruneTimerFired();
</ins><span class="cx">
</span><span class="cx"> CachedResource* resourceForRequestImpl(const ResourceRequest&, CachedResourceMap&);
</span><span class="cx">
</span><span class="lines">@@ -213,6 +217,8 @@
</span><span class="cx"> // referenced by a Web page).
</span><span class="cx"> typedef HashMap<SessionID, std::unique_ptr<CachedResourceMap>> SessionCachedResourceMap;
</span><span class="cx"> SessionCachedResourceMap m_sessionResources;
</span><ins>+
+ Timer m_pruneTimer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>