<!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>[202492] trunk/Source/JavaScriptCore</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/202492">202492</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2016-06-27 10:50:17 -0700 (Mon, 27 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: CRASH in backend at Inspector::HeapFrontendDispatcher::garbageCollected + 552 when closing frontend/inspected page
https://bugs.webkit.org/show_bug.cgi?id=159075
<rdar://problem/26094341>
Reviewed by Timothy Hatcher.
Move the asynchronous work to a task class that can be cancelled when the
heap agent is reset, disabled or destroyed.
* inspector/agents/InspectorHeapAgent.cpp:
(Inspector::SendGarbageCollectionEventsTask::SendGarbageCollectionEventsTask):
(Inspector::SendGarbageCollectionEventsTask::addGarbageCollection):
(Inspector::SendGarbageCollectionEventsTask::reset):
(Inspector::SendGarbageCollectionEventsTask::timerFired):
Added. This holds onto GarbageCollectionData that needs to be sent asynchronously.
It uses the RunLoop variant of Timer and can queue multiple collections to be sent.
The data vector is guarded with a lock so that garbageCollected() can safely add
collection data from a non-main thread while the main thread sends out events.
(Inspector::InspectorHeapAgent::InspectorHeapAgent):
(Inspector::InspectorHeapAgent::~InspectorHeapAgent):
(Inspector::InspectorHeapAgent::disable):
Reset the task when disabling or tearing down the agent so the timer doesn't fire after destruction.
(Inspector::InspectorHeapAgent::didGarbageCollect):
Add the collection data to the task, which will dispatch an event for it asynchronously.
* inspector/agents/InspectorHeapAgent.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorHeapAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorHeapAgenth">trunk/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (202491 => 202492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-06-27 17:44:16 UTC (rev 202491)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-06-27 17:50:17 UTC (rev 202492)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2016-06-27 Brian Burg <bburg@apple.com>
+
+ Web Inspector: CRASH in backend at Inspector::HeapFrontendDispatcher::garbageCollected + 552 when closing frontend/inspected page
+ https://bugs.webkit.org/show_bug.cgi?id=159075
+ <rdar://problem/26094341>
+
+ Reviewed by Timothy Hatcher.
+
+ Move the asynchronous work to a task class that can be cancelled when the
+ heap agent is reset, disabled or destroyed.
+
+ * inspector/agents/InspectorHeapAgent.cpp:
+ (Inspector::SendGarbageCollectionEventsTask::SendGarbageCollectionEventsTask):
+ (Inspector::SendGarbageCollectionEventsTask::addGarbageCollection):
+ (Inspector::SendGarbageCollectionEventsTask::reset):
+ (Inspector::SendGarbageCollectionEventsTask::timerFired):
+ Added. This holds onto GarbageCollectionData that needs to be sent asynchronously.
+ It uses the RunLoop variant of Timer and can queue multiple collections to be sent.
+ The data vector is guarded with a lock so that garbageCollected() can safely add
+ collection data from a non-main thread while the main thread sends out events.
+
+ (Inspector::InspectorHeapAgent::InspectorHeapAgent):
+ (Inspector::InspectorHeapAgent::~InspectorHeapAgent):
+ (Inspector::InspectorHeapAgent::disable):
+ Reset the task when disabling or tearing down the agent so the timer doesn't fire after destruction.
+
+ (Inspector::InspectorHeapAgent::didGarbageCollect):
+ Add the collection data to the task, which will dispatch an event for it asynchronously.
+
+ * inspector/agents/InspectorHeapAgent.h:
+
</ins><span class="cx"> 2016-06-27 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> ES6 Change: Unify handling of RegExp CharacterClassEscapes \w and \W and Word Asserts \b and \B
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorHeapAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.cpp (202491 => 202492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.cpp 2016-06-27 17:44:16 UTC (rev 202491)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.cpp 2016-06-27 17:50:17 UTC (rev 202492)
</span><span class="lines">@@ -39,6 +39,73 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><ins>+struct GarbageCollectionData {
+ Inspector::Protocol::Heap::GarbageCollection::Type type;
+ double startTime;
+ double endTime;
+};
+
+class SendGarbageCollectionEventsTask {
+public:
+ SendGarbageCollectionEventsTask(HeapFrontendDispatcher&);
+ void addGarbageCollection(GarbageCollectionData&);
+ void reset();
+private:
+ void timerFired();
+
+ HeapFrontendDispatcher& m_frontendDispatcher;
+ Vector<GarbageCollectionData> m_collections;
+ RunLoop::Timer<SendGarbageCollectionEventsTask> m_timer;
+ Lock m_mutex;
+};
+
+SendGarbageCollectionEventsTask::SendGarbageCollectionEventsTask(HeapFrontendDispatcher& frontendDispatcher)
+ : m_frontendDispatcher(frontendDispatcher)
+ , m_timer(RunLoop::main(), this, &SendGarbageCollectionEventsTask::timerFired)
+{
+}
+
+void SendGarbageCollectionEventsTask::addGarbageCollection(GarbageCollectionData& collection)
+{
+ {
+ std::lock_guard<Lock> lock(m_mutex);
+ m_collections.append(collection);
+ }
+
+ if (!m_timer.isActive())
+ m_timer.startOneShot(0);
+}
+
+void SendGarbageCollectionEventsTask::reset()
+{
+ {
+ std::lock_guard<Lock> lock(m_mutex);
+ m_collections.clear();
+ }
+
+ m_timer.stop();
+}
+
+void SendGarbageCollectionEventsTask::timerFired()
+{
+ Vector<GarbageCollectionData> collectionsToSend;
+
+ {
+ std::lock_guard<Lock> lock(m_mutex);
+ m_collections.swap(collectionsToSend);
+ }
+
+ // The timer is stopped on agent destruction, so this method will never be called after agent has been destroyed.
+ for (auto& collection : collectionsToSend) {
+ auto protocolObject = Inspector::Protocol::Heap::GarbageCollection::create()
+ .setType(collection.type)
+ .setStartTime(collection.startTime)
+ .setEndTime(collection.endTime)
+ .release();
+ m_frontendDispatcher.garbageCollected(WTFMove(protocolObject));
+ }
+}
+
</ins><span class="cx"> InspectorHeapAgent::InspectorHeapAgent(AgentContext& context)
</span><span class="cx"> : InspectorAgentBase(ASCIILiteral("Heap"))
</span><span class="cx"> , m_injectedScriptManager(context.injectedScriptManager)
</span><span class="lines">@@ -45,11 +112,13 @@
</span><span class="cx"> , m_frontendDispatcher(std::make_unique<HeapFrontendDispatcher>(context.frontendRouter))
</span><span class="cx"> , m_backendDispatcher(HeapBackendDispatcher::create(context.backendDispatcher, this))
</span><span class="cx"> , m_environment(context.environment)
</span><ins>+ , m_sendGarbageCollectionEventsTask(std::make_unique<SendGarbageCollectionEventsTask>(*m_frontendDispatcher))
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> InspectorHeapAgent::~InspectorHeapAgent()
</span><span class="cx"> {
</span><ins>+ m_sendGarbageCollectionEventsTask->reset();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorHeapAgent::didCreateFrontendAndBackend(FrontendRouter*, BackendDispatcher*)
</span><span class="lines">@@ -81,6 +150,7 @@
</span><span class="cx"> m_enabled = false;
</span><span class="cx">
</span><span class="cx"> m_environment.vm().heap.removeObserver(this);
</span><ins>+ m_sendGarbageCollectionEventsTask->reset();
</ins><span class="cx">
</span><span class="cx"> clearHeapSnapshots();
</span><span class="cx"> }
</span><span class="lines">@@ -276,9 +346,6 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Include number of bytes freed by collection.
</span><span class="cx">
</span><del>- double startTime = m_gcStartTime;
- double endTime = m_environment.executionStopwatch()->elapsedTime();
-
</del><span class="cx"> // Dispatch the event asynchronously because this method may be
</span><span class="cx"> // called between collection and sweeping and we don't want to
</span><span class="cx"> // create unexpected JavaScript allocations that the Sweeper does
</span><span class="lines">@@ -286,15 +353,12 @@
</span><span class="cx"> // with WebKitLegacy's in process inspector which shares the same
</span><span class="cx"> // VM as the inspected page.
</span><span class="cx">
</span><del>- RunLoop::current().dispatch([this, startTime, endTime, operation]() {
- auto collection = Inspector::Protocol::Heap::GarbageCollection::create()
- .setType(protocolTypeForHeapOperation(operation))
- .setStartTime(startTime)
- .setEndTime(endTime)
- .release();
</del><ins>+ GarbageCollectionData data;
+ data.type = protocolTypeForHeapOperation(operation);
+ data.startTime = m_gcStartTime;
+ data.endTime = m_environment.executionStopwatch()->elapsedTime();
</ins><span class="cx">
</span><del>- m_frontendDispatcher->garbageCollected(WTFMove(collection));
- });
</del><ins>+ m_sendGarbageCollectionEventsTask->addGarbageCollection(data);
</ins><span class="cx">
</span><span class="cx"> m_gcStartTime = NAN;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorHeapAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.h (202491 => 202492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.h 2016-06-27 17:44:16 UTC (rev 202491)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.h 2016-06-27 17:50:17 UTC (rev 202492)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><span class="cx"> class InjectedScriptManager;
</span><ins>+class SendGarbageCollectionEventsTask;
</ins><span class="cx"> typedef String ErrorString;
</span><span class="cx">
</span><span class="cx"> class JS_EXPORT_PRIVATE InspectorHeapAgent : public InspectorAgentBase, public HeapBackendDispatcherHandler, public JSC::HeapObserver {
</span><span class="lines">@@ -73,6 +74,8 @@
</span><span class="cx"> RefPtr<HeapBackendDispatcher> m_backendDispatcher;
</span><span class="cx"> InspectorEnvironment& m_environment;
</span><span class="cx">
</span><ins>+ std::unique_ptr<SendGarbageCollectionEventsTask> m_sendGarbageCollectionEventsTask;
+
</ins><span class="cx"> bool m_enabled { false };
</span><span class="cx"> bool m_tracking { false };
</span><span class="cx"> double m_gcStartTime { NAN };
</span></span></pre>
</div>
</div>
</body>
</html>