<!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>[173162] 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/173162">173162</a></dd>
<dt>Author</dt> <dd>burg@cs.washington.edu</dd>
<dt>Date</dt> <dd>2014-09-01 14:15:21 -0700 (Mon, 01 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Provide column numbers to DTrace willExecute/didExecute probes
https://bugs.webkit.org/show_bug.cgi?id=136434
Reviewed by Antti Koivisto.
Source/JavaScriptCore:
Provide the columnNumber and update stubs for !HAVE(DTRACE).
* profiler/ProfileGenerator.cpp:
(JSC::ProfileGenerator::willExecute):
(JSC::ProfileGenerator::didExecute):
* runtime/Tracing.d:
* runtime/Tracing.h:
Tools:
Create a directory for DTrace scripts. Add an example script that
shows how to use static probes provided by JavaScriptCore's profiler.
* Scripts/dtrace/jsc-trace-profiler-events.d: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreprofilerProfileGeneratorcpp">trunk/Source/JavaScriptCore/profiler/ProfileGenerator.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeTracingd">trunk/Source/JavaScriptCore/runtime/Tracing.d</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeTracingh">trunk/Source/JavaScriptCore/runtime/Tracing.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/Tools/Scripts/dtrace/</li>
<li><a href="#trunkToolsScriptsdtracejsctraceprofilereventsd">trunk/Tools/Scripts/dtrace/jsc-trace-profiler-events.d</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (173161 => 173162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-09-01 19:16:14 UTC (rev 173161)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-09-01 21:15:21 UTC (rev 173162)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-09-01 Brian J. Burg <burg@cs.washington.edu>
+
+ Provide column numbers to DTrace willExecute/didExecute probes
+ https://bugs.webkit.org/show_bug.cgi?id=136434
+
+ Reviewed by Antti Koivisto.
+
+ Provide the columnNumber and update stubs for !HAVE(DTRACE).
+
+ * profiler/ProfileGenerator.cpp:
+ (JSC::ProfileGenerator::willExecute):
+ (JSC::ProfileGenerator::didExecute):
+ * runtime/Tracing.d:
+ * runtime/Tracing.h:
+
</ins><span class="cx"> 2014-09-01 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> [CMAKE] Build warning by INTERFACE_LINK_LIBRARIES
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreprofilerProfileGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/profiler/ProfileGenerator.cpp (173161 => 173162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/profiler/ProfileGenerator.cpp 2014-09-01 19:16:14 UTC (rev 173161)
+++ trunk/Source/JavaScriptCore/profiler/ProfileGenerator.cpp 2014-09-01 21:15:21 UTC (rev 173162)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> if (JAVASCRIPTCORE_PROFILE_WILL_EXECUTE_ENABLED()) {
</span><span class="cx"> CString name = callIdentifier.functionName().utf8();
</span><span class="cx"> CString url = callIdentifier.url().utf8();
</span><del>- JAVASCRIPTCORE_PROFILE_WILL_EXECUTE(m_profileGroup, const_cast<char*>(name.data()), const_cast<char*>(url.data()), callIdentifier.lineNumber());
</del><ins>+ JAVASCRIPTCORE_PROFILE_WILL_EXECUTE(m_profileGroup, const_cast<char*>(name.data()), const_cast<char*>(url.data()), callIdentifier.lineNumber(), callIdentifier.columnNumber());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_origin)
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> if (JAVASCRIPTCORE_PROFILE_DID_EXECUTE_ENABLED()) {
</span><span class="cx"> CString name = callIdentifier.functionName().utf8();
</span><span class="cx"> CString url = callIdentifier.url().utf8();
</span><del>- JAVASCRIPTCORE_PROFILE_DID_EXECUTE(m_profileGroup, const_cast<char*>(name.data()), const_cast<char*>(url.data()), callIdentifier.lineNumber());
</del><ins>+ JAVASCRIPTCORE_PROFILE_DID_EXECUTE(m_profileGroup, const_cast<char*>(name.data()), const_cast<char*>(url.data()), callIdentifier.lineNumber(), callIdentifier.columnNumber());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_origin)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeTracingd"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Tracing.d (173161 => 173162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Tracing.d 2014-09-01 19:16:14 UTC (rev 173161)
+++ trunk/Source/JavaScriptCore/runtime/Tracing.d 2014-09-01 21:15:21 UTC (rev 173162)
</span><span class="lines">@@ -28,9 +28,9 @@
</span><span class="cx"> probe gc__begin();
</span><span class="cx"> probe gc__marked();
</span><span class="cx"> probe gc__end();
</span><del>-
- probe profile__will_execute(int, char*, char*, int);
- probe profile__did_execute(int, char*, char*, int);
</del><ins>+
+ probe profile__will_execute(int, char*, char*, int, int);
+ probe profile__did_execute(int, char*, char*, int, int);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #pragma D attributes Unstable/Unstable/Common provider JavaScriptCore provider
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeTracingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Tracing.h (173161 => 173162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Tracing.h 2014-09-01 19:16:14 UTC (rev 173161)
+++ trunk/Source/JavaScriptCore/runtime/Tracing.h 2014-09-01 21:15:21 UTC (rev 173162)
</span><span class="lines">@@ -39,10 +39,10 @@
</span><span class="cx"> #define JAVASCRIPTCORE_GC_MARKED()
</span><span class="cx"> #define JAVASCRIPTCORE_GC_MARKED_ENABLED() 0
</span><span class="cx">
</span><del>-#define JAVASCRIPTCORE_PROFILE_WILL_EXECUTE(arg0, arg1, arg2, arg3)
</del><ins>+#define JAVASCRIPTCORE_PROFILE_WILL_EXECUTE(arg0, arg1, arg2, arg3, arg4)
</ins><span class="cx"> #define JAVASCRIPTCORE_PROFILE_WILL_EXECUTE_ENABLED() 0
</span><span class="cx">
</span><del>-#define JAVASCRIPTCORE_PROFILE_DID_EXECUTE(arg0, arg1, arg2, arg3)
</del><ins>+#define JAVASCRIPTCORE_PROFILE_DID_EXECUTE(arg0, arg1, arg2, arg3, arg4)
</ins><span class="cx"> #define JAVASCRIPTCORE_PROFILE_DID_EXECUTE_ENABLED() 0
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (173161 => 173162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-09-01 19:16:14 UTC (rev 173161)
+++ trunk/Tools/ChangeLog 2014-09-01 21:15:21 UTC (rev 173162)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-09-01 Brian J. Burg <burg@cs.washington.edu>
+
+ Provide column numbers to DTrace willExecute/didExecute probes
+ https://bugs.webkit.org/show_bug.cgi?id=136434
+
+ Reviewed by Antti Koivisto.
+
+ Create a directory for DTrace scripts. Add an example script that
+ shows how to use static probes provided by JavaScriptCore's profiler.
+
+ * Scripts/dtrace/jsc-trace-profiler-events.d: Added.
+
</ins><span class="cx"> 2014-09-01 Carlos Alberto Lopez Perez <clopez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] [JHBuild] Cyclic dependency between cairo and librsvg.
</span></span></pre></div>
<a id="trunkToolsScriptsdtracejsctraceprofilereventsd"></a>
<div class="addfile"><h4>Added: trunk/Tools/Scripts/dtrace/jsc-trace-profiler-events.d (0 => 173162)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/dtrace/jsc-trace-profiler-events.d (rev 0)
+++ trunk/Tools/Scripts/dtrace/jsc-trace-profiler-events.d 2014-09-01 21:15:21 UTC (rev 173162)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+#!/usr/sbin/dtrace -qs
+
+/*
+ * Copyright (C) 2014 University of Washington. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of Apple Inc. ("Apple") nor the names of
+ * its contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * DTrace example: tracing function calls when the profiler is enabled.
+ * To use this, first enable the JavaScript tracing profiler using the Web Inspector.
+ *
+ * These run for any process; restrict to a pid by changing the provider to JavaScriptCore$target
+ * and passing the arguments '-p <pid>' to the script.
+ */
+
+JavaScriptCore*:::profile-will_execute
+{
+ printf("[%d] -> %s (%s:%d:%d)\n",arg0, copyinstr(arg1), copyinstr(arg2), arg3, arg4);
+}
+
+JavaScriptCore*:::profile-did_execute
+{
+ printf("[%d] <- %s (%s:%d:%d)\n",arg0, copyinstr(arg1), copyinstr(arg2), arg3, arg4);
+}
</ins><span class="cx">Property changes on: trunk/Tools/Scripts/dtrace/jsc-trace-profiler-events.d
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnexecutable"></a>
<div class="addfile"><h4>Added: svn:executable</h4></div>
</div>
</body>
</html>