<!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>[161174] branches/jsCStack/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/161174">161174</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2013-12-30 23:22:21 -0800 (Mon, 30 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>CStack: Introduce tracking of the top VMEntryScope.
https://bugs.webkit.org/show_bug.cgi?id=126334.
Not yet reviewed.
When we start measuring the stack usage of each VMEntryScope, we'll need
to know which VMEntryScope is the top (most recent) one, not just the
first one.
Also, for correctness, in JSStack::updateStackLimit(), when we set a new
jsStackLimit, we should set it on the top VMEntryScope, and not on the
first (oldest) one. This is because the 2 scopes may be on 2 different
thread stacks, and the most present stack limits only apply to the most
recent scope. That said, presently, VMEntryScope::updateStackLimits()
does not rely on any scope specific data yet. So, calling updateStackLimits()
on the oldest VMEntryScope hasn't manifested any issues yet. Regardless,
this is now fixed.
* interpreter/JSStack.cpp:
(JSC::JSStack::updateStackLimit):
* runtime/VM.cpp:
(JSC::VM::VM):
* runtime/VM.h:
* runtime/VMEntryScope.cpp:
(JSC::VMEntryScope::VMEntryScope):
(JSC::VMEntryScope::~VMEntryScope):
* runtime/VMEntryScope.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesjsCStackSourceJavaScriptCoreChangeLog">branches/jsCStack/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreinterpreterJSStackcpp">branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreruntimeVMcpp">branches/jsCStack/Source/JavaScriptCore/runtime/VM.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreruntimeVMh">branches/jsCStack/Source/JavaScriptCore/runtime/VM.h</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreruntimeVMEntryScopecpp">branches/jsCStack/Source/JavaScriptCore/runtime/VMEntryScope.cpp</a></li>
<li><a href="#branchesjsCStackSourceJavaScriptCoreruntimeVMEntryScopeh">branches/jsCStack/Source/JavaScriptCore/runtime/VMEntryScope.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesjsCStackSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/ChangeLog (161173 => 161174)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-31 06:54:20 UTC (rev 161173)
+++ branches/jsCStack/Source/JavaScriptCore/ChangeLog 2013-12-31 07:22:21 UTC (rev 161174)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2013-12-30 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><ins>+ CStack: Introduce tracking of the top VMEntryScope.
+ https://bugs.webkit.org/show_bug.cgi?id=126334.
+
+ Not yet reviewed.
+
+ When we start measuring the stack usage of each VMEntryScope, we'll need
+ to know which VMEntryScope is the top (most recent) one, not just the
+ first one.
+
+ Also, for correctness, in JSStack::updateStackLimit(), when we set a new
+ jsStackLimit, we should set it on the top VMEntryScope, and not on the
+ first (oldest) one. This is because the 2 scopes may be on 2 different
+ thread stacks, and the most present stack limits only apply to the most
+ recent scope. That said, presently, VMEntryScope::updateStackLimits()
+ does not rely on any scope specific data yet. So, calling updateStackLimits()
+ on the oldest VMEntryScope hasn't manifested any issues yet. Regardless,
+ this is now fixed.
+
+ * interpreter/JSStack.cpp:
+ (JSC::JSStack::updateStackLimit):
+ * runtime/VM.cpp:
+ (JSC::VM::VM):
+ * runtime/VM.h:
+ * runtime/VMEntryScope.cpp:
+ (JSC::VMEntryScope::VMEntryScope):
+ (JSC::VMEntryScope::~VMEntryScope):
+ * runtime/VMEntryScope.h:
+
+2013-12-30 Mark Lam <mark.lam@apple.com>
+
</ins><span class="cx"> CStack: Refactor to split the tracking of the jsStackLimit from the native stackLimit.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126331.
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreinterpreterJSStackcpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.cpp (161173 => 161174)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.cpp 2013-12-31 06:54:20 UTC (rev 161173)
+++ branches/jsCStack/Source/JavaScriptCore/interpreter/JSStack.cpp 2013-12-31 07:22:21 UTC (rev 161174)
</span><span class="lines">@@ -204,8 +204,8 @@
</span><span class="cx"> else
</span><span class="cx"> disableErrorStackReserve();
</span><span class="cx"> #endif
</span><del>- if (m_vm.firstEntryScope)
- m_vm.firstEntryScope->updateStackLimits();
</del><ins>+ if (m_vm.topEntryScope)
+ m_vm.topEntryScope->updateStackLimits();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreruntimeVMcpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/runtime/VM.cpp (161173 => 161174)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/runtime/VM.cpp 2013-12-31 06:54:20 UTC (rev 161173)
+++ branches/jsCStack/Source/JavaScriptCore/runtime/VM.cpp 2013-12-31 07:22:21 UTC (rev 161174)
</span><span class="lines">@@ -199,6 +199,7 @@
</span><span class="cx"> , jsFinalObjectClassInfo(JSFinalObject::info())
</span><span class="cx"> , sizeOfLastScratchBuffer(0)
</span><span class="cx"> , firstEntryScope(0)
</span><ins>+ , topEntryScope(0)
</ins><span class="cx"> , m_enabledProfiler(0)
</span><span class="cx"> , m_regExpCache(new RegExpCache(this))
</span><span class="cx"> #if ENABLE(REGEXP_TRACING)
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreruntimeVMh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/runtime/VM.h (161173 => 161174)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/runtime/VM.h 2013-12-31 06:54:20 UTC (rev 161173)
+++ branches/jsCStack/Source/JavaScriptCore/runtime/VM.h 2013-12-31 07:22:21 UTC (rev 161174)
</span><span class="lines">@@ -427,6 +427,7 @@
</span><span class="cx"> void gatherConservativeRoots(ConservativeRoots&);
</span><span class="cx">
</span><span class="cx"> VMEntryScope* firstEntryScope;
</span><ins>+ VMEntryScope* topEntryScope;
</ins><span class="cx">
</span><span class="cx"> HashSet<JSObject*> stringRecursionCheckVisitedObjects;
</span><span class="cx">
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreruntimeVMEntryScopecpp"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/runtime/VMEntryScope.cpp (161173 => 161174)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/runtime/VMEntryScope.cpp 2013-12-31 06:54:20 UTC (rev 161173)
+++ branches/jsCStack/Source/JavaScriptCore/runtime/VMEntryScope.cpp 2013-12-31 07:22:21 UTC (rev 161174)
</span><span class="lines">@@ -36,6 +36,7 @@
</span><span class="cx"> , m_stack(wtfThreadData().stack())
</span><span class="cx"> , m_globalObject(globalObject)
</span><span class="cx"> , m_prevFirstEntryScope(vm.firstEntryScope)
</span><ins>+ , m_prevTopEntryScope(vm.topEntryScope)
</ins><span class="cx"> , m_prevStackLimit(vm.stackLimit())
</span><span class="cx"> #if !ENABLE(LLINT_C_LOOP)
</span><span class="cx"> , m_prevJSStackLimit(vm.jsStackLimit())
</span><span class="lines">@@ -53,7 +54,9 @@
</span><span class="cx"> // observe time xone changes.
</span><span class="cx"> vm.resetDateCache();
</span><span class="cx"> }
</span><del>- // Clear the exception stack between entries
</del><ins>+ vm.topEntryScope = this;
+
+ // Clear the captured exception stack between entries
</ins><span class="cx"> vm.clearExceptionStack();
</span><span class="cx">
</span><span class="cx"> updateStackLimits();
</span><span class="lines">@@ -63,6 +66,7 @@
</span><span class="cx"> VMEntryScope::~VMEntryScope()
</span><span class="cx"> {
</span><span class="cx"> m_vm.firstEntryScope = m_prevFirstEntryScope;
</span><ins>+ m_vm.topEntryScope = m_prevTopEntryScope;
</ins><span class="cx"> m_vm.setStackLimit(m_prevStackLimit);
</span><span class="cx"> #if !ENABLE(LLINT_C_LOOP)
</span><span class="cx"> m_vm.setJSStackLimit(m_prevJSStackLimit);
</span></span></pre></div>
<a id="branchesjsCStackSourceJavaScriptCoreruntimeVMEntryScopeh"></a>
<div class="modfile"><h4>Modified: branches/jsCStack/Source/JavaScriptCore/runtime/VMEntryScope.h (161173 => 161174)</h4>
<pre class="diff"><span>
<span class="info">--- branches/jsCStack/Source/JavaScriptCore/runtime/VMEntryScope.h 2013-12-31 06:54:20 UTC (rev 161173)
+++ branches/jsCStack/Source/JavaScriptCore/runtime/VMEntryScope.h 2013-12-31 07:22:21 UTC (rev 161174)
</span><span class="lines">@@ -57,6 +57,7 @@
</span><span class="cx">
</span><span class="cx"> // The following pointers may point to a different thread's stack.
</span><span class="cx"> VMEntryScope* m_prevFirstEntryScope;
</span><ins>+ VMEntryScope* m_prevTopEntryScope;
</ins><span class="cx"> void* m_prevStackLimit;
</span><span class="cx"> #if !ENABLE(LLINT_C_LOOP)
</span><span class="cx"> void* m_prevJSStackLimit;
</span></span></pre>
</div>
</div>
</body>
</html>