<!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>[209154] 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/209154">209154</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-11-30 14:21:16 -0800 (Wed, 30 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION: inspector/sampling-profiler/* LayoutTests are flaky timeouts
https://bugs.webkit.org/show_bug.cgi?id=164388
<rdar://problem/29101555>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-11-30
Reviewed by Saam Barati.
Source/JavaScriptCore:
There was a possibility of a deadlock between the main thread and the GC thread
with the SamplingProfiler lock when Inspector is processing samples to send to
the frontend. The Inspector (main thread) was holding the SamplingProfiler lock
while processing samples, which runs JavaScript that could trigger a GC, and
GC then tries to acquire the SamplingProfiler lock to process unprocessed samples.
A simple solution here is to tighten the bounds of when Inspector holds the
SamplingProfiler lock. It only needs the lock when extracting samples from
the SamplingProfiler. It doesn't need to hold the lock for processing those
samples, which is what can run script and cause a GC.
* inspector/agents/InspectorScriptProfilerAgent.cpp:
(Inspector::InspectorScriptProfilerAgent::trackingComplete):
Tighten bounds of this lock to only where it is needed.
LayoutTests:
* platform/mac/TestExpectations:
Unskip now that tests are no longer flakey.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectoragentsInspectorScriptProfilerAgentcpp">trunk/Source/JavaScriptCore/inspector/agents/InspectorScriptProfilerAgent.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209153 => 209154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-11-30 22:10:49 UTC (rev 209153)
+++ trunk/LayoutTests/ChangeLog 2016-11-30 22:21:16 UTC (rev 209154)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-11-30 Joseph Pecoraro <pecoraro@apple.com>
+
+ REGRESSION: inspector/sampling-profiler/* LayoutTests are flaky timeouts
+ https://bugs.webkit.org/show_bug.cgi?id=164388
+ <rdar://problem/29101555>
+
+ Reviewed by Saam Barati.
+
+ * platform/mac/TestExpectations:
+ Unskip now that tests are no longer flakey.
+
</ins><span class="cx"> 2016-11-30 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Skipping crashing test js/dom/modules/module-will-fire-beforeload.html.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (209153 => 209154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2016-11-30 22:10:49 UTC (rev 209153)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-11-30 22:21:16 UTC (rev 209154)
</span><span class="lines">@@ -1462,6 +1462,4 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/164277 fast/preloader/image-srcset.html [ Pass Failure ]
</span><span class="cx">
</span><del>-webkit.org/b/164388 inspector/sampling-profiler [ Pass Timeout ]
-
</del><span class="cx"> webkit.org/b/161650 http/tests/cache/disk-cache/disk-cache-remove-several-pending-writes.html [ Pass Failure ]
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (209153 => 209154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-11-30 22:10:49 UTC (rev 209153)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-11-30 22:21:16 UTC (rev 209154)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-11-30 Joseph Pecoraro <pecoraro@apple.com>
+
+ REGRESSION: inspector/sampling-profiler/* LayoutTests are flaky timeouts
+ https://bugs.webkit.org/show_bug.cgi?id=164388
+ <rdar://problem/29101555>
+
+ Reviewed by Saam Barati.
+
+ There was a possibility of a deadlock between the main thread and the GC thread
+ with the SamplingProfiler lock when Inspector is processing samples to send to
+ the frontend. The Inspector (main thread) was holding the SamplingProfiler lock
+ while processing samples, which runs JavaScript that could trigger a GC, and
+ GC then tries to acquire the SamplingProfiler lock to process unprocessed samples.
+
+ A simple solution here is to tighten the bounds of when Inspector holds the
+ SamplingProfiler lock. It only needs the lock when extracting samples from
+ the SamplingProfiler. It doesn't need to hold the lock for processing those
+ samples, which is what can run script and cause a GC.
+
+ * inspector/agents/InspectorScriptProfilerAgent.cpp:
+ (Inspector::InspectorScriptProfilerAgent::trackingComplete):
+ Tighten bounds of this lock to only where it is needed.
+
</ins><span class="cx"> 2016-11-30 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Proxy is not allowed in the global prototype chain.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectoragentsInspectorScriptProfilerAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/agents/InspectorScriptProfilerAgent.cpp (209153 => 209154)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/agents/InspectorScriptProfilerAgent.cpp 2016-11-30 22:10:49 UTC (rev 209153)
+++ trunk/Source/JavaScriptCore/inspector/agents/InspectorScriptProfilerAgent.cpp 2016-11-30 22:21:16 UTC (rev 209154)
</span><span class="lines">@@ -206,13 +206,14 @@
</span><span class="cx"> JSLockHolder lock(m_environment.scriptDebugServer().vm());
</span><span class="cx"> SamplingProfiler* samplingProfiler = m_environment.scriptDebugServer().vm().samplingProfiler();
</span><span class="cx"> RELEASE_ASSERT(samplingProfiler);
</span><ins>+
</ins><span class="cx"> LockHolder locker(samplingProfiler->getLock());
</span><span class="cx"> samplingProfiler->pause(locker);
</span><span class="cx"> Vector<SamplingProfiler::StackTrace> stackTraces = samplingProfiler->releaseStackTraces(locker);
</span><ins>+ locker.unlockEarly();
+
</ins><span class="cx"> Ref<Protocol::ScriptProfiler::Samples> samples = buildSamples(m_environment.scriptDebugServer().vm(), WTFMove(stackTraces));
</span><span class="cx">
</span><del>- locker.unlockEarly();
-
</del><span class="cx"> m_enabledSamplingProfiler = false;
</span><span class="cx">
</span><span class="cx"> m_frontendDispatcher->trackingComplete(WTFMove(samples));
</span></span></pre>
</div>
</div>
</body>
</html>