<!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>[205034] 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/205034">205034</a></dd>
<dt>Author</dt> <dd>joepeck@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-26 13:22:24 -0700 (Fri, 26 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: ScriptProfilerAgent and HeapAgent should do less work when frontend disconnects
https://bugs.webkit.org/show_bug.cgi?id=161213
<rdar://problem/28017986>
Reviewed by Brian Burg.
* inspector/agents/InspectorHeapAgent.cpp:
(Inspector::InspectorHeapAgent::willDestroyFrontendAndBackend):
Don't take a final snapshot when disconnecting.
* inspector/agents/InspectorScriptProfilerAgent.cpp:
(Inspector::InspectorScriptProfilerAgent::willDestroyFrontendAndBackend):
(Inspector::InspectorScriptProfilerAgent::stopSamplingWhenDisconnecting):
* inspector/agents/InspectorScriptProfilerAgent.h:
* runtime/SamplingProfiler.h:
Don't process samples when disconnecting.</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="#trunkSourceJavaScriptCoreinspectoragentsInspectorScriptProfilerAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorScriptProfilerAgent.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorScriptProfilerAgenth">trunk/Source/JavaScriptCore/inspector/agents/InspectorScriptProfilerAgent.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeSamplingProfilerh">trunk/Source/JavaScriptCore/runtime/SamplingProfiler.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (205033 => 205034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-08-26 20:22:21 UTC (rev 205033)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-08-26 20:22:24 UTC (rev 205034)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2016-08-26 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: ScriptProfilerAgent and HeapAgent should do less work when frontend disconnects
+ https://bugs.webkit.org/show_bug.cgi?id=161213
+ <rdar://problem/28017986>
+
+ Reviewed by Brian Burg.
+
+ * inspector/agents/InspectorHeapAgent.cpp:
+ (Inspector::InspectorHeapAgent::willDestroyFrontendAndBackend):
+ Don't take a final snapshot when disconnecting.
+
+ * inspector/agents/InspectorScriptProfilerAgent.cpp:
+ (Inspector::InspectorScriptProfilerAgent::willDestroyFrontendAndBackend):
+ (Inspector::InspectorScriptProfilerAgent::stopSamplingWhenDisconnecting):
+ * inspector/agents/InspectorScriptProfilerAgent.h:
+ * runtime/SamplingProfiler.h:
+ Don't process samples when disconnecting.
+
+2016-08-26 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: HeapProfiler/ScriptProfiler do not destruct safely when JSContext is destroyed
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=161027
</span><span class="cx"> <rdar://problem/27871349>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorHeapAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.cpp (205033 => 205034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.cpp 2016-08-26 20:22:21 UTC (rev 205033)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorHeapAgent.cpp 2016-08-26 20:22:24 UTC (rev 205034)
</span><span class="lines">@@ -127,8 +127,10 @@
</span><span class="cx">
</span><span class="cx"> void InspectorHeapAgent::willDestroyFrontendAndBackend(DisconnectReason)
</span><span class="cx"> {
</span><ins>+ // Stop tracking without taking a snapshot.
+ m_tracking = false;
+
</ins><span class="cx"> ErrorString ignored;
</span><del>- stopTracking(ignored);
</del><span class="cx"> disable(ignored);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorScriptProfilerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorScriptProfilerAgent.cpp (205033 => 205034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorScriptProfilerAgent.cpp 2016-08-26 20:22:21 UTC (rev 205033)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorScriptProfilerAgent.cpp 2016-08-26 20:22:24 UTC (rev 205034)
</span><span class="lines">@@ -53,8 +53,15 @@
</span><span class="cx">
</span><span class="cx"> void InspectorScriptProfilerAgent::willDestroyFrontendAndBackend(DisconnectReason)
</span><span class="cx"> {
</span><del>- ErrorString ignored;
- stopTracking(ignored);
</del><ins>+ // Stop tracking without sending results.
+ if (m_tracking) {
+ m_tracking = false;
+ m_activeEvaluateScript = false;
+ m_environment.scriptDebugServer().setProfilingClient(nullptr);
+
+ // Stop sampling without processing the samples.
+ stopSamplingWhenDisconnecting();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void InspectorScriptProfilerAgent::startTracking(ErrorString&, const bool* includeSamples)
</span><span class="lines">@@ -216,6 +223,23 @@
</span><span class="cx"> #endif // ENABLE(SAMPLING_PROFILER)
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void InspectorScriptProfilerAgent::stopSamplingWhenDisconnecting()
+{
+#if ENABLE(SAMPLING_PROFILER)
+ if (!m_enabledSamplingProfiler)
+ return;
+
+ JSLockHolder lock(m_environment.scriptDebugServer().vm());
+ SamplingProfiler* samplingProfiler = m_environment.scriptDebugServer().vm().samplingProfiler();
+ RELEASE_ASSERT(samplingProfiler);
+ LockHolder locker(samplingProfiler->getLock());
+ samplingProfiler->pause(locker);
+ samplingProfiler->clearData(locker);
+
+ m_enabledSamplingProfiler = false;
+#endif
+}
+
</ins><span class="cx"> void InspectorScriptProfilerAgent::programmaticCaptureStarted()
</span><span class="cx"> {
</span><span class="cx"> m_frontendDispatcher->programmaticCaptureStarted();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorScriptProfilerAgenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorScriptProfilerAgent.h (205033 => 205034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorScriptProfilerAgent.h 2016-08-26 20:22:21 UTC (rev 205033)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorScriptProfilerAgent.h 2016-08-26 20:22:24 UTC (rev 205034)
</span><span class="lines">@@ -69,6 +69,7 @@
</span><span class="cx">
</span><span class="cx"> void addEvent(double startTime, double endTime, JSC::ProfilingReason);
</span><span class="cx"> void trackingComplete();
</span><ins>+ void stopSamplingWhenDisconnecting();
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<ScriptProfilerFrontendDispatcher> m_frontendDispatcher;
</span><span class="cx"> RefPtr<ScriptProfilerBackendDispatcher> m_backendDispatcher;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeSamplingProfilerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/SamplingProfiler.h (205033 => 205034)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/SamplingProfiler.h 2016-08-26 20:22:21 UTC (rev 205033)
+++ trunk/Source/JavaScriptCore/runtime/SamplingProfiler.h 2016-08-26 20:22:24 UTC (rev 205034)
</span><span class="lines">@@ -150,6 +150,7 @@
</span><span class="cx"> void processUnverifiedStackTraces(); // You should call this only after acquiring the lock.
</span><span class="cx"> void setStopWatch(const LockHolder&, Ref<Stopwatch>&& stopwatch) { m_stopwatch = WTFMove(stopwatch); }
</span><span class="cx"> void pause(const LockHolder&);
</span><ins>+ void clearData(const LockHolder&);
</ins><span class="cx">
</span><span class="cx"> // Used for debugging in the JSC shell/DRT.
</span><span class="cx"> void registerForReportAtExit();
</span><span class="lines">@@ -160,7 +161,6 @@
</span><span class="cx"> JS_EXPORT_PRIVATE void reportTopBytecodes(PrintStream&);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- void clearData(const LockHolder&);
</del><span class="cx"> void createThreadIfNecessary(const LockHolder&);
</span><span class="cx"> void timerLoop();
</span><span class="cx"> void takeSample(const LockHolder&, std::chrono::microseconds& stackTraceProcessingTime);
</span></span></pre>
</div>
</div>
</body>
</html>