<!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>[200092] 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/200092">200092</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-26 09:47:33 -0700 (Tue, 26 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve jsc --help and making sampling options
https://bugs.webkit.org/show_bug.cgi?id=157015
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-04-26
Reviewed by Saam Barati.
Simplify sampling options to be easier to remember:
* --reportSamplingProfilerData => --sample
* --samplingProfilerTimingInterval => --sampleInterval
Update the --help to mention --sample, and restore the behavior of
--options outputing all possible options so you can discover which
options are available.
* jsc.cpp:
(printUsageStatement):
(CommandLine::parseArguments):
Improve help and modify option dumping.
* runtime/Options.h:
* runtime/SamplingProfiler.cpp:
(JSC::SamplingProfiler::SamplingProfiler):
Rename the sampling interval option.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorejsccpp">trunk/Source/JavaScriptCore/jsc.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeOptionsh">trunk/Source/JavaScriptCore/runtime/Options.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeSamplingProfilercpp">trunk/Source/JavaScriptCore/runtime/SamplingProfiler.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (200091 => 200092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-04-26 16:45:13 UTC (rev 200091)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-04-26 16:47:33 UTC (rev 200092)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-04-26 Joseph Pecoraro <pecoraro@apple.com>
+
+ Improve jsc --help and making sampling options
+ https://bugs.webkit.org/show_bug.cgi?id=157015
+
+ Reviewed by Saam Barati.
+
+ Simplify sampling options to be easier to remember:
+
+ * --reportSamplingProfilerData => --sample
+ * --samplingProfilerTimingInterval => --sampleInterval
+
+ Update the --help to mention --sample, and restore the behavior of
+ --options outputing all possible options so you can discover which
+ options are available.
+
+ * jsc.cpp:
+ (printUsageStatement):
+ (CommandLine::parseArguments):
+ Improve help and modify option dumping.
+
+ * runtime/Options.h:
+ * runtime/SamplingProfiler.cpp:
+ (JSC::SamplingProfiler::SamplingProfiler):
+ Rename the sampling interval option.
+
</ins><span class="cx"> 2016-04-26 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r200083.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejsccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jsc.cpp (200091 => 200092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jsc.cpp 2016-04-26 16:45:13 UTC (rev 200091)
+++ trunk/Source/JavaScriptCore/jsc.cpp 2016-04-26 16:47:33 UTC (rev 200092)
</span><span class="lines">@@ -2100,8 +2100,9 @@
</span><span class="cx"> fprintf(stderr, " -p <file> Outputs profiling data to a file\n");
</span><span class="cx"> fprintf(stderr, " -x Output exit code before terminating\n");
</span><span class="cx"> fprintf(stderr, "\n");
</span><ins>+ fprintf(stderr, " --sample Collects and outputs sampling profiler data\n");
</ins><span class="cx"> fprintf(stderr, " --options Dumps all JSC VM options and exits\n");
</span><del>- fprintf(stderr, " --dumpOptions Dumps all JSC VM options before continuing\n");
</del><ins>+ fprintf(stderr, " --dumpOptions Dumps all non-default JSC VM options before continuing\n");
</ins><span class="cx"> fprintf(stderr, " --<jsc VM option>=<value> Sets the specified JSC VM option\n");
</span><span class="cx"> fprintf(stderr, "\n");
</span><span class="cx">
</span><span class="lines">@@ -2113,7 +2114,7 @@
</span><span class="cx"> Options::initialize();
</span><span class="cx">
</span><span class="cx"> int i = 1;
</span><del>- bool needToDumpOptions = false;
</del><ins>+ JSC::Options::DumpLevel dumpOptionsLevel = JSC::Options::DumpLevel::None;
</ins><span class="cx"> bool needToExit = false;
</span><span class="cx">
</span><span class="cx"> bool hasBadJSCOptions = false;
</span><span class="lines">@@ -2171,15 +2172,15 @@
</span><span class="cx"> printUsageStatement(true);
</span><span class="cx">
</span><span class="cx"> if (!strcmp(arg, "--options")) {
</span><del>- needToDumpOptions = true;
</del><ins>+ dumpOptionsLevel = JSC::Options::DumpLevel::Verbose;
</ins><span class="cx"> needToExit = true;
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> if (!strcmp(arg, "--dumpOptions")) {
</span><del>- needToDumpOptions = true;
</del><ins>+ dumpOptionsLevel = JSC::Options::DumpLevel::Overridden;
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><del>- if (!strcmp(arg, "--reportSamplingProfilerData")) {
</del><ins>+ if (!strcmp(arg, "--sample")) {
</ins><span class="cx"> JSC::Options::useSamplingProfiler() = true;
</span><span class="cx"> JSC::Options::collectSamplingProfilerDataForJSCShell() = true;
</span><span class="cx"> m_dumpSamplingProfilerData = true;
</span><span class="lines">@@ -2209,8 +2210,8 @@
</span><span class="cx"> for (; i < argc; ++i)
</span><span class="cx"> m_arguments.append(argv[i]);
</span><span class="cx">
</span><del>- if (needToDumpOptions)
- JSC::Options::dumpAllOptions(stderr, JSC::Options::DumpLevel::Overridden, "All JSC runtime options:");
</del><ins>+ if (dumpOptionsLevel != JSC::Options::DumpLevel::None)
+ JSC::Options::dumpAllOptions(stderr, dumpOptionsLevel, "All JSC runtime options:");
</ins><span class="cx"> JSC::Options::ensureOptionsAreCoherent();
</span><span class="cx"> if (needToExit)
</span><span class="cx"> jscExit(EXIT_SUCCESS);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Options.h (200091 => 200092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Options.h 2016-04-26 16:45:13 UTC (rev 200091)
+++ trunk/Source/JavaScriptCore/runtime/Options.h 2016-04-26 16:47:33 UTC (rev 200092)
</span><span class="lines">@@ -315,11 +315,14 @@
</span><span class="cx"> v(unsigned, forceRAMSize, 0, nullptr) \
</span><span class="cx"> v(bool, recordGCPauseTimes, false, nullptr) \
</span><span class="cx"> v(bool, logHeapStatisticsAtExit, false, nullptr) \
</span><ins>+ \
</ins><span class="cx"> v(bool, useTypeProfiler, false, nullptr) \
</span><span class="cx"> v(bool, useControlFlowProfiler, false, nullptr) \
</span><ins>+ \
</ins><span class="cx"> v(bool, useSamplingProfiler, false, nullptr) \
</span><del>- v(unsigned, samplingProfilerTimingInterval, 1000, "Time between stack traces in microseconds.") \
- v(bool, collectSamplingProfilerDataForJSCShell, false, "This corresponds to the JSC shell's --reportSamplingProfilerData option.") \
</del><ins>+ v(unsigned, sampleInterval, 1000, "Time between stack traces in microseconds.") \
+ v(bool, collectSamplingProfilerDataForJSCShell, false, "This corresponds to the JSC shell's --sample option.") \
+ \
</ins><span class="cx"> v(bool, alwaysGeneratePCToCodeOriginMap, false, "This will make sure we always generate a PCToCodeOriginMap for JITed code.") \
</span><span class="cx"> \
</span><span class="cx"> v(bool, verifyHeap, false, nullptr) \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeSamplingProfilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/SamplingProfiler.cpp (200091 => 200092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/SamplingProfiler.cpp 2016-04-26 16:45:13 UTC (rev 200091)
+++ trunk/Source/JavaScriptCore/runtime/SamplingProfiler.cpp 2016-04-26 16:47:33 UTC (rev 200092)
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> SamplingProfiler::SamplingProfiler(VM& vm, RefPtr<Stopwatch>&& stopwatch)
</span><span class="cx"> : m_vm(vm)
</span><span class="cx"> , m_stopwatch(WTFMove(stopwatch))
</span><del>- , m_timingInterval(std::chrono::microseconds(Options::samplingProfilerTimingInterval()))
</del><ins>+ , m_timingInterval(std::chrono::microseconds(Options::sampleInterval()))
</ins><span class="cx"> , m_threadIdentifier(0)
</span><span class="cx"> , m_jscExecutionThread(nullptr)
</span><span class="cx"> , m_isPaused(false)
</span></span></pre>
</div>
</div>
</body>
</html>