<!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>[201361] 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/201361">201361</a></dd>
<dt>Author</dt> <dd>keith_miller@apple.com</dd>
<dt>Date</dt> <dd>2016-05-24 16:03:09 -0700 (Tue, 24 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>We should be able to use the sampling profiler with DRT/WTR.
https://bugs.webkit.org/show_bug.cgi?id=158041
Reviewed by Saam Barati.
This patch makes the sampling profiler use a new option, samplingProfilerPath, which
specifies the path to a directory to output sampling profiler data when the program
terminates or the VM is destroyed. Additionally, it fixes some other issues with the
bytecode profiler that would cause crashes on debug builds.
* profiler/ProfilerDatabase.cpp:
(JSC::Profiler::Database::ensureBytecodesFor):
(JSC::Profiler::Database::performAtExitSave):
* runtime/Options.h:
* runtime/SamplingProfiler.cpp:
(JSC::SamplingProfiler::registerForReportAtExit):
(JSC::SamplingProfiler::reportDataToOptionFile):
(JSC::SamplingProfiler::reportTopFunctions):
(JSC::SamplingProfiler::reportTopBytecodes):
* runtime/SamplingProfiler.h:
* runtime/VM.cpp:
(JSC::VM::VM):
(JSC::VM::~VM):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreprofilerProfilerDatabasecpp">trunk/Source/JavaScriptCore/profiler/ProfilerDatabase.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>
<li><a href="#trunkSourceJavaScriptCoreruntimeSamplingProfilerh">trunk/Source/JavaScriptCore/runtime/SamplingProfiler.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMcpp">trunk/Source/JavaScriptCore/runtime/VM.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (201360 => 201361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-05-24 23:02:14 UTC (rev 201360)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-05-24 23:03:09 UTC (rev 201361)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-05-24 Keith Miller <keith_miller@apple.com>
+
+ We should be able to use the sampling profiler with DRT/WTR.
+ https://bugs.webkit.org/show_bug.cgi?id=158041
+
+ Reviewed by Saam Barati.
+
+ This patch makes the sampling profiler use a new option, samplingProfilerPath, which
+ specifies the path to a directory to output sampling profiler data when the program
+ terminates or the VM is destroyed. Additionally, it fixes some other issues with the
+ bytecode profiler that would cause crashes on debug builds.
+
+ * profiler/ProfilerDatabase.cpp:
+ (JSC::Profiler::Database::ensureBytecodesFor):
+ (JSC::Profiler::Database::performAtExitSave):
+ * runtime/Options.h:
+ * runtime/SamplingProfiler.cpp:
+ (JSC::SamplingProfiler::registerForReportAtExit):
+ (JSC::SamplingProfiler::reportDataToOptionFile):
+ (JSC::SamplingProfiler::reportTopFunctions):
+ (JSC::SamplingProfiler::reportTopBytecodes):
+ * runtime/SamplingProfiler.h:
+ * runtime/VM.cpp:
+ (JSC::VM::VM):
+ (JSC::VM::~VM):
+
</ins><span class="cx"> 2016-05-24 Saam barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> We can cache lookups to JSScope::abstractResolve inside CodeBlock::finishCreation
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreprofilerProfilerDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/profiler/ProfilerDatabase.cpp (201360 => 201361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/profiler/ProfilerDatabase.cpp 2016-05-24 23:02:14 UTC (rev 201360)
+++ trunk/Source/JavaScriptCore/profiler/ProfilerDatabase.cpp 2016-05-24 23:03:09 UTC (rev 201361)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> Bytecodes* Database::ensureBytecodesFor(const LockHolder&, CodeBlock* codeBlock)
</span><span class="cx"> {
</span><del>- codeBlock = codeBlock->baselineVersion();
</del><ins>+ codeBlock = codeBlock->baselineAlternative();
</ins><span class="cx">
</span><span class="cx"> HashMap<CodeBlock*, Bytecodes*>::iterator iter = m_bytecodesMap.find(codeBlock);
</span><span class="cx"> if (iter != m_bytecodesMap.end())
</span><span class="lines">@@ -182,6 +182,7 @@
</span><span class="cx">
</span><span class="cx"> void Database::performAtExitSave() const
</span><span class="cx"> {
</span><ins>+ JSLockHolder lock(m_vm);
</ins><span class="cx"> save(m_atExitSaveFilename.data());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Options.h (201360 => 201361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Options.h 2016-05-24 23:02:14 UTC (rev 201360)
+++ trunk/Source/JavaScriptCore/runtime/Options.h 2016-05-24 23:03:09 UTC (rev 201361)
</span><span class="lines">@@ -327,6 +327,7 @@
</span><span class="cx"> v(bool, useSamplingProfiler, false, Normal, nullptr) \
</span><span class="cx"> v(unsigned, sampleInterval, 1000, Normal, "Time between stack traces in microseconds.") \
</span><span class="cx"> v(bool, collectSamplingProfilerDataForJSCShell, false, Normal, "This corresponds to the JSC shell's --sample option.") \
</span><ins>+ v(optionString, samplingProfilerPath, nullptr, Normal, "The path to the directory to write sampiling profiler output to. This probably will not work with WK2 unless the path is in the whitelist.") \
</ins><span class="cx"> \
</span><span class="cx"> v(bool, alwaysGeneratePCToCodeOriginMap, false, Normal, "This will make sure we always generate a PCToCodeOriginMap for JITed code.") \
</span><span class="cx"> \
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeSamplingProfilercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/SamplingProfiler.cpp (201360 => 201361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/SamplingProfiler.cpp 2016-05-24 23:02:14 UTC (rev 201360)
+++ trunk/Source/JavaScriptCore/runtime/SamplingProfiler.cpp 2016-05-24 23:03:09 UTC (rev 201361)
</span><span class="lines">@@ -47,6 +47,8 @@
</span><span class="cx"> #include "StructureInlines.h"
</span><span class="cx"> #include "VM.h"
</span><span class="cx"> #include "VMEntryScope.h"
</span><ins>+#include <wtf/HashSet.h>
+#include <wtf/RefPtr.h>
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="lines">@@ -760,8 +762,46 @@
</span><span class="cx"> return json.toString();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void SamplingProfiler::registerForReportAtExit()
+{
+ static StaticLock registrationLock;
+ static HashSet<RefPtr<SamplingProfiler>>* profilesToReport;
+
+ LockHolder holder(registrationLock);
+
+ if (!profilesToReport) {
+ profilesToReport = new HashSet<RefPtr<SamplingProfiler>>();
+ atexit([]() {
+ for (auto profile : *profilesToReport)
+ profile->reportDataToOptionFile();
+ });
+ }
+
+ profilesToReport->add(adoptRef(this));
+ m_needsReportAtExit = true;
+}
+
+void SamplingProfiler::reportDataToOptionFile()
+{
+ if (m_needsReportAtExit) {
+ m_needsReportAtExit = false;
+ const char* path = Options::samplingProfilerPath();
+ StringPrintStream pathOut;
+ pathOut.print(path, "/");
+ pathOut.print("JSCSampilingProfile-", reinterpret_cast<uintptr_t>(this), ".txt");
+ auto out = FilePrintStream::open(pathOut.toCString().data(), "w");
+ reportTopFunctions(*out);
+ reportTopBytecodes(*out);
+ }
+}
+
</ins><span class="cx"> void SamplingProfiler::reportTopFunctions()
</span><span class="cx"> {
</span><ins>+ reportTopFunctions(WTF::dataFile());
+}
+
+void SamplingProfiler::reportTopFunctions(PrintStream& out)
+{
</ins><span class="cx"> LockHolder locker(m_lock);
</span><span class="cx">
</span><span class="cx"> {
</span><span class="lines">@@ -794,19 +834,24 @@
</span><span class="cx"> return std::make_pair(maxFrameDescription, maxFrameCount);
</span><span class="cx"> };
</span><span class="cx">
</span><del>- dataLog("\n\nSampling rate: ", m_timingInterval.count(), " microseconds\n");
- dataLog("Hottest functions as <numSamples 'functionName:sourceID'>\n");
</del><ins>+ out.print("\n\nSampling rate: ", m_timingInterval.count(), " microseconds\n");
+ out.print("Hottest functions as <numSamples 'functionName:sourceID'>\n");
</ins><span class="cx"> for (size_t i = 0; i < 40; i++) {
</span><span class="cx"> auto pair = takeMax();
</span><span class="cx"> if (pair.first.isEmpty())
</span><span class="cx"> break;
</span><del>- dataLogF("%6zu ", pair.second);
- dataLog(" '", pair.first, "'\n");
</del><ins>+ out.printf("%6zu ", pair.second);
+ out.print(" '", pair.first, "'\n");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SamplingProfiler::reportTopBytecodes()
</span><span class="cx"> {
</span><ins>+ reportTopBytecodes(WTF::dataFile());
+}
+
+void SamplingProfiler::reportTopBytecodes(PrintStream& out)
+{
</ins><span class="cx"> LockHolder locker(m_lock);
</span><span class="cx">
</span><span class="cx"> {
</span><span class="lines">@@ -852,14 +897,14 @@
</span><span class="cx"> return std::make_pair(maxFrameDescription, maxFrameCount);
</span><span class="cx"> };
</span><span class="cx">
</span><del>- dataLog("\n\nSampling rate: ", m_timingInterval.count(), " microseconds\n");
- dataLog("Hottest bytecodes as <numSamples 'functionName#hash:JITType:bytecodeIndex'>\n");
</del><ins>+ out.print("\n\nSampling rate: ", m_timingInterval.count(), " microseconds\n");
+ out.print("Hottest bytecodes as <numSamples 'functionName#hash:JITType:bytecodeIndex'>\n");
</ins><span class="cx"> for (size_t i = 0; i < 80; i++) {
</span><span class="cx"> auto pair = takeMax();
</span><span class="cx"> if (pair.first.isEmpty())
</span><span class="cx"> break;
</span><del>- dataLogF("%6zu ", pair.second);
- dataLog(" '", pair.first, "'\n");
</del><ins>+ out.printf("%6zu ", pair.second);
+ out.print(" '", pair.first, "'\n");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeSamplingProfilerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/SamplingProfiler.h (201360 => 201361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/SamplingProfiler.h 2016-05-24 23:02:14 UTC (rev 201360)
+++ trunk/Source/JavaScriptCore/runtime/SamplingProfiler.h 2016-05-24 23:03:09 UTC (rev 201361)
</span><span class="lines">@@ -152,9 +152,13 @@
</span><span class="cx"> void setStopWatch(const LockHolder&, Ref<Stopwatch>&& stopwatch) { m_stopwatch = WTFMove(stopwatch); }
</span><span class="cx"> void pause(const LockHolder&);
</span><span class="cx">
</span><del>- // Used for debugging in the JSC shell.
</del><ins>+ // Used for debugging in the JSC shell/DRT.
+ void registerForReportAtExit();
+ void reportDataToOptionFile();
</ins><span class="cx"> JS_EXPORT_PRIVATE void reportTopFunctions();
</span><ins>+ JS_EXPORT_PRIVATE void reportTopFunctions(PrintStream&);
</ins><span class="cx"> JS_EXPORT_PRIVATE void reportTopBytecodes();
</span><ins>+ JS_EXPORT_PRIVATE void reportTopBytecodes(PrintStream&);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void clearData(const LockHolder&);
</span><span class="lines">@@ -173,6 +177,7 @@
</span><span class="cx"> MachineThreads::Thread* m_jscExecutionThread;
</span><span class="cx"> bool m_isPaused;
</span><span class="cx"> bool m_isShutDown;
</span><ins>+ bool m_needsReportAtExit { false };
</ins><span class="cx"> HashSet<JSCell*> m_liveCellPointers;
</span><span class="cx"> Vector<UnprocessedStackFrame> m_currentFrames;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.cpp (201360 => 201361)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.cpp 2016-05-24 23:02:14 UTC (rev 201360)
+++ trunk/Source/JavaScriptCore/runtime/VM.cpp 2016-05-24 23:03:09 UTC (rev 201361)
</span><span class="lines">@@ -315,6 +315,8 @@
</span><span class="cx"> Ref<Stopwatch> stopwatch = Stopwatch::create();
</span><span class="cx"> stopwatch->start();
</span><span class="cx"> m_samplingProfiler = adoptRef(new SamplingProfiler(*this, WTFMove(stopwatch)));
</span><ins>+ if (Options::samplingProfilerPath())
+ m_samplingProfiler->registerForReportAtExit();
</ins><span class="cx"> m_samplingProfiler->start();
</span><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(SAMPLING_PROFILER)
</span><span class="lines">@@ -335,8 +337,10 @@
</span><span class="cx"> heap.incrementDeferralDepth();
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SAMPLING_PROFILER)
</span><del>- if (m_samplingProfiler)
</del><ins>+ if (m_samplingProfiler) {
+ m_samplingProfiler->reportDataToOptionFile();
</ins><span class="cx"> m_samplingProfiler->shutdown();
</span><ins>+ }
</ins><span class="cx"> #endif // ENABLE(SAMPLING_PROFILER)
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span></span></pre>
</div>
</div>
</body>
</html>