<!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>[203674] 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/203674">203674</a></dd>
<dt>Author</dt> <dd>philn@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-24 23:07:40 -0700 (Sun, 24 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Improve GDB backtrace generation for GTK/EFL
https://bugs.webkit.org/show_bug.cgi?id=128928
Reviewed by Carlos Garcia Campos.
Source/WebKit2:
Move the Web, Database and Network ProcessIdentifier functions to
the cross-platform WKContext and WKPage implementations.
* UIProcess/API/C/WKContext.cpp:
(WKContextGetNetworkProcessIdentifier):
(WKContextGetDatabaseProcessIdentifier):
* UIProcess/API/C/WKContextPrivate.h:
* UIProcess/API/C/WKPage.cpp:
(WKPageGetProcessIdentifier):
* UIProcess/API/C/WKPagePrivate.h:
* UIProcess/API/C/mac/WKContextPrivateMac.h:
* UIProcess/API/C/mac/WKContextPrivateMac.mm:
* UIProcess/API/C/mac/WKPagePrivateMac.h:
* UIProcess/API/C/mac/WKPagePrivateMac.mm:
Tools:
The PID of the crashed process is now correctly supplied to the
crash log reporter. The kernel core_pattern needs to be updated
after this change to something like:
echo "|/home/phil/WebKit/Tools/Scripts/process-linux-coredump /tmp/core-pid_%p.dump" > /proc/sys/kernel/core_pattern
* Scripts/process-linux-coredump: Added.
(main): Minimal python script reading coredump data on stdin and writing it to a file in /tmp/.
* Scripts/webkitpy/port/efl.py:
(EflPort._get_crash_log): Supply path of the process-linux-coredump script.
* Scripts/webkitpy/port/gtk.py:
(GtkPort._get_crash_log): Ditto.
* Scripts/webkitpy/port/linux_get_crash_log.py:
(GDBCrashLogGenerator.__init__): New argument for supplying the path of a coredump processor script.
(GDBCrashLogGenerator.generate_crash_log): Update error message, the core_pattern should now be set to pipe coredumps to a script.
(GDBCrashLogGenerator): Deleted.
* Scripts/webkitpy/port/linux_get_crash_log_unittest.py:
(GDBCrashLogGeneratorTest.test_generate_crash_log): Update test expectations.
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::networkProcessDidCrash): Supply PID of crash process.
(WTR::TestController::databaseProcessDidCrash): Ditto.
(WTR::TestController::processDidCrash): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextcpp">trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextPrivateh">trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagePrivateh">trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICmacWKContextPrivateMach">trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICmacWKContextPrivateMacmm">trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICmacWKPagePrivateMach">trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICmacWKPagePrivateMacmm">trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyporteflpy">trunk/Tools/Scripts/webkitpy/port/efl.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportgtkpy">trunk/Tools/Scripts/webkitpy/port/gtk.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportlinux_get_crash_logpy">trunk/Tools/Scripts/webkitpy/port/linux_get_crash_log.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportlinux_get_crash_log_unittestpy">trunk/Tools/Scripts/webkitpy/port/linux_get_crash_log_unittest.py</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2macGetPIDAfterAbortedProcessLaunchcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2/mac/GetPIDAfterAbortedProcessLaunch.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerTestControllercpp">trunk/Tools/WebKitTestRunner/TestController.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (203673 => 203674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-07-25 03:42:50 UTC (rev 203673)
+++ trunk/Source/WebKit2/ChangeLog 2016-07-25 06:07:40 UTC (rev 203674)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-07-25 Philippe Normand <pnormand@igalia.com>
+
+ Improve GDB backtrace generation for GTK/EFL
+ https://bugs.webkit.org/show_bug.cgi?id=128928
+
+ Reviewed by Carlos Garcia Campos.
+
+ Move the Web, Database and Network ProcessIdentifier functions to
+ the cross-platform WKContext and WKPage implementations.
+
+ * UIProcess/API/C/WKContext.cpp:
+ (WKContextGetNetworkProcessIdentifier):
+ (WKContextGetDatabaseProcessIdentifier):
+ * UIProcess/API/C/WKContextPrivate.h:
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageGetProcessIdentifier):
+ * UIProcess/API/C/WKPagePrivate.h:
+ * UIProcess/API/C/mac/WKContextPrivateMac.h:
+ * UIProcess/API/C/mac/WKContextPrivateMac.mm:
+ * UIProcess/API/C/mac/WKPagePrivateMac.h:
+ * UIProcess/API/C/mac/WKPagePrivateMac.mm:
+
</ins><span class="cx"> 2016-07-24 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Add specialization for encoding/decoding WebCore::CertificateInfos in the Network Cache
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (203673 => 203674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2016-07-25 03:42:50 UTC (rev 203673)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp 2016-07-25 06:07:40 UTC (rev 203674)
</span><span class="lines">@@ -572,3 +572,13 @@
</span><span class="cx"> {
</span><span class="cx"> toImpl(contextRef)->setFontWhitelist(toImpl(arrayRef));
</span><span class="cx"> }
</span><ins>+
+pid_t WKContextGetNetworkProcessIdentifier(WKContextRef contextRef)
+{
+ return toImpl(contextRef)->networkProcessIdentifier();
+}
+
+pid_t WKContextGetDatabaseProcessIdentifier(WKContextRef contextRef)
+{
+ return toImpl(contextRef)->databaseProcessIdentifier();
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKContextPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h (203673 => 203674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h 2016-07-25 03:42:50 UTC (rev 203673)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKContextPrivate.h 2016-07-25 06:07:40 UTC (rev 203674)
</span><span class="lines">@@ -94,6 +94,9 @@
</span><span class="cx">
</span><span class="cx"> WK_EXPORT void WKContextSetFontWhitelist(WKContextRef, WKArrayRef);
</span><span class="cx">
</span><ins>+WK_EXPORT pid_t WKContextGetNetworkProcessIdentifier(WKContextRef context);
+WK_EXPORT pid_t WKContextGetDatabaseProcessIdentifier(WKContextRef context);
+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (203673 => 203674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2016-07-25 03:42:50 UTC (rev 203673)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2016-07-25 06:07:40 UTC (rev 203674)
</span><span class="lines">@@ -2752,6 +2752,11 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+pid_t WKPageGetProcessIdentifier(WKPageRef page)
+{
+ return toImpl(page)->processIdentifier();
+}
+
</ins><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx">
</span><span class="cx"> // -- DEPRECATED --
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h (203673 => 203674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h 2016-07-25 03:42:50 UTC (rev 203673)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h 2016-07-25 06:07:40 UTC (rev 203674)
</span><span class="lines">@@ -149,6 +149,8 @@
</span><span class="cx">
</span><span class="cx"> WK_EXPORT void WKPageSetIgnoresViewportScaleLimits(WKPageRef page, bool ignoresViewportScaleLimits);
</span><span class="cx">
</span><ins>+WK_EXPORT pid_t WKPageGetProcessIdentifier(WKPageRef page);
+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICmacWKContextPrivateMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h (203673 => 203674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h 2016-07-25 03:42:50 UTC (rev 203673)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h 2016-07-25 06:07:40 UTC (rev 203674)
</span><span class="lines">@@ -77,9 +77,6 @@
</span><span class="cx"> WK_EXPORT bool WKContextShouldBlockWebGL();
</span><span class="cx"> WK_EXPORT bool WKContextShouldSuggestBlockWebGL();
</span><span class="cx">
</span><del>-WK_EXPORT pid_t WKContextGetNetworkProcessIdentifier(WKContextRef context);
-WK_EXPORT pid_t WKContextGetDatabaseProcessIdentifier(WKContextRef context);
-
</del><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICmacWKContextPrivateMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm (203673 => 203674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm 2016-07-25 03:42:50 UTC (rev 203673)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm 2016-07-25 06:07:40 UTC (rev 203674)
</span><span class="lines">@@ -163,13 +163,3 @@
</span><span class="cx"> {
</span><span class="cx"> return WKShouldSuggestBlockingWebGL();
</span><span class="cx"> }
</span><del>-
-pid_t WKContextGetNetworkProcessIdentifier(WKContextRef contextRef)
-{
- return toImpl(contextRef)->networkProcessIdentifier();
-}
-
-pid_t WKContextGetDatabaseProcessIdentifier(WKContextRef contextRef)
-{
- return toImpl(contextRef)->databaseProcessIdentifier();
-}
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICmacWKPagePrivateMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h (203673 => 203674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h 2016-07-25 03:42:50 UTC (rev 203673)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h 2016-07-25 06:07:40 UTC (rev 203674)
</span><span class="lines">@@ -56,7 +56,6 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-WK_EXPORT pid_t WKPageGetProcessIdentifier(WKPageRef page);
</del><span class="cx"> WK_EXPORT bool WKPageIsURLKnownHSTSHost(WKPageRef page, WKURLRef url);
</span><span class="cx">
</span><span class="cx"> #if TARGET_OS_MAC
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICmacWKPagePrivateMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.mm (203673 => 203674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.mm 2016-07-25 03:42:50 UTC (rev 203673)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.mm 2016-07-25 06:07:40 UTC (rev 203674)
</span><span class="lines">@@ -116,11 +116,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-pid_t WKPageGetProcessIdentifier(WKPageRef pageRef)
-{
- return toImpl(pageRef)->processIdentifier();
-}
-
</del><span class="cx"> bool WKPageIsURLKnownHSTSHost(WKPageRef page, WKURLRef url)
</span><span class="cx"> {
</span><span class="cx"> WebPageProxy* webPageProxy = toImpl(page);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (203673 => 203674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-07-25 03:42:50 UTC (rev 203673)
+++ trunk/Tools/ChangeLog 2016-07-25 06:07:40 UTC (rev 203674)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2016-07-25 Philippe Normand <pnormand@igalia.com>
+
+ Improve GDB backtrace generation for GTK/EFL
+ https://bugs.webkit.org/show_bug.cgi?id=128928
+
+ Reviewed by Carlos Garcia Campos.
+
+ The PID of the crashed process is now correctly supplied to the
+ crash log reporter. The kernel core_pattern needs to be updated
+ after this change to something like:
+
+ echo "|/home/phil/WebKit/Tools/Scripts/process-linux-coredump /tmp/core-pid_%p.dump" > /proc/sys/kernel/core_pattern
+
+ * Scripts/process-linux-coredump: Added.
+ (main): Minimal python script reading coredump data on stdin and writing it to a file in /tmp/.
+ * Scripts/webkitpy/port/efl.py:
+ (EflPort._get_crash_log): Supply path of the process-linux-coredump script.
+ * Scripts/webkitpy/port/gtk.py:
+ (GtkPort._get_crash_log): Ditto.
+ * Scripts/webkitpy/port/linux_get_crash_log.py:
+ (GDBCrashLogGenerator.__init__): New argument for supplying the path of a coredump processor script.
+ (GDBCrashLogGenerator.generate_crash_log): Update error message, the core_pattern should now be set to pipe coredumps to a script.
+ (GDBCrashLogGenerator): Deleted.
+ * Scripts/webkitpy/port/linux_get_crash_log_unittest.py:
+ (GDBCrashLogGeneratorTest.test_generate_crash_log): Update test expectations.
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::networkProcessDidCrash): Supply PID of crash process.
+ (WTR::TestController::databaseProcessDidCrash): Ditto.
+ (WTR::TestController::processDidCrash): Ditto.
+
</ins><span class="cx"> 2016-07-23 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> WPT stash server should be kept running when launching wpt server
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyporteflpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/efl.py (203673 => 203674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/efl.py 2016-07-25 03:42:50 UTC (rev 203673)
+++ trunk/Tools/Scripts/webkitpy/port/efl.py 2016-07-25 06:07:40 UTC (rev 203674)
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> return command
</span><span class="cx">
</span><span class="cx"> def _get_crash_log(self, name, pid, stdout, stderr, newer_than):
</span><del>- return GDBCrashLogGenerator(name, pid, newer_than, self._filesystem, self._path_to_driver).generate_crash_log(stdout, stderr)
</del><ins>+ return GDBCrashLogGenerator(name, pid, newer_than, self._filesystem, self.path_to_script("process-linux-coredump"), self._path_to_driver).generate_crash_log(stdout, stderr)
</ins><span class="cx">
</span><span class="cx"> def test_expectations_file_position(self):
</span><span class="cx"> # EFL port baseline search path is efl -> wk2 -> generic (as efl-wk2 and efl baselines are merged), so port test expectations file is at third to last position.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportgtkpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/gtk.py (203673 => 203674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/gtk.py 2016-07-25 03:42:50 UTC (rev 203673)
+++ trunk/Tools/Scripts/webkitpy/port/gtk.py 2016-07-25 06:07:40 UTC (rev 203674)
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx">
</span><span class="cx"> def _get_crash_log(self, name, pid, stdout, stderr, newer_than):
</span><span class="cx"> name = "WebKitWebProcess" if name == "WebProcess" else name
</span><del>- return GDBCrashLogGenerator(name, pid, newer_than, self._filesystem, self._path_to_driver).generate_crash_log(stdout, stderr)
</del><ins>+ return GDBCrashLogGenerator(name, pid, newer_than, self._filesystem, self.path_to_script("process-linux-coredump"), self._path_to_driver).generate_crash_log(stdout, stderr)
</ins><span class="cx">
</span><span class="cx"> def test_expectations_file_position(self):
</span><span class="cx"> # GTK port baseline search path is gtk -> wk2 -> generic (as gtk-wk2 and gtk baselines are merged), so port test expectations file is at third to last position.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportlinux_get_crash_logpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/linux_get_crash_log.py (203673 => 203674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/linux_get_crash_log.py 2016-07-25 03:42:50 UTC (rev 203673)
+++ trunk/Tools/Scripts/webkitpy/port/linux_get_crash_log.py 2016-07-25 06:07:40 UTC (rev 203674)
</span><span class="lines">@@ -30,13 +30,13 @@
</span><span class="cx"> import subprocess
</span><span class="cx"> import os
</span><span class="cx">
</span><del>-
</del><span class="cx"> class GDBCrashLogGenerator(object):
</span><del>- def __init__(self, name, pid, newer_than, filesystem, path_to_driver):
</del><ins>+ def __init__(self, name, pid, newer_than, filesystem, process_coredump_script_path, path_to_driver):
</ins><span class="cx"> self.name = name
</span><span class="cx"> self.pid = pid
</span><span class="cx"> self.newer_than = newer_than
</span><span class="cx"> self._filesystem = filesystem
</span><ins>+ self._process_coredump_script_path = process_coredump_script_path
</ins><span class="cx"> self._path_to_driver = path_to_driver
</span><span class="cx">
</span><span class="cx"> def _get_gdb_output(self, coredump_path):
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> log_directory = os.environ.get("WEBKIT_CORE_DUMPS_DIRECTORY")
</span><span class="cx"> errors = []
</span><span class="cx"> crash_log = ''
</span><del>- expected_crash_dump_filename = "core-pid_%s-_-process_%s" % (pid_representation, self.name)
</del><ins>+ expected_crash_dump_filename = "core-pid_%s.dump" % pid_representation
</ins><span class="cx"> proc_name = "%s" % (self.name)
</span><span class="cx">
</span><span class="cx"> def match_filename(filesystem, directory, filename):
</span><span class="lines">@@ -76,11 +76,11 @@
</span><span class="cx"> if not crash_log:
</span><span class="cx"> if not log_directory:
</span><span class="cx"> log_directory = "/path/to/coredumps"
</span><del>- core_pattern = os.path.join(log_directory, "core-pid_%p-_-process_%E")
</del><ins>+ process_coredump_script_path = self._process_coredump_script_path
</ins><span class="cx"> crash_log = """\
</span><span class="cx"> Coredump %(expected_crash_dump_filename)s not found. To enable crash logs:
</span><span class="cx">
</span><del>-- run this command as super-user: echo "%(core_pattern)s" > /proc/sys/kernel/core_pattern
</del><ins>+- run this command as super-user: echo "|%(process_coredump_script_path)s %(log_directory)s/core-pid_%%p.dump" > /proc/sys/kernel/core_pattern
</ins><span class="cx"> - enable core dumps: ulimit -c unlimited
</span><span class="cx"> - set the WEBKIT_CORE_DUMPS_DIRECTORY environment variable: export WEBKIT_CORE_DUMPS_DIRECTORY=%(log_directory)s
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportlinux_get_crash_log_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/linux_get_crash_log_unittest.py (203673 => 203674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/linux_get_crash_log_unittest.py 2016-07-25 03:42:50 UTC (rev 203673)
+++ trunk/Tools/Scripts/webkitpy/port/linux_get_crash_log_unittest.py 2016-07-25 06:07:40 UTC (rev 203674)
</span><span class="lines">@@ -41,14 +41,15 @@
</span><span class="cx"> if sys.platform.startswith('win'):
</span><span class="cx"> return
</span><span class="cx">
</span><del>- generator = GDBCrashLogGenerator('DumpRenderTree', 28529, newer_than=None, filesystem=MockFileSystem({'/path/to/coredumps': ''}), path_to_driver=None)
</del><ins>+ process_coredump_script_path = "/path/to/coredump-processor"
+ generator = GDBCrashLogGenerator('DumpRenderTree', 28529, newer_than=None, filesystem=MockFileSystem({'/path/to/coredumps': ''}), process_coredump_script_path=process_coredump_script_path, path_to_driver=None)
</ins><span class="cx">
</span><span class="cx"> core_directory = os.environ.get('WEBKIT_CORE_DUMPS_DIRECTORY', '/path/to/coredumps')
</span><del>- core_pattern = os.path.join(core_directory, "core-pid_%p-_-process_%E")
</del><ins>+ core_pattern = "|%s /path/to/coredumps/core-pid_%%p.dump" % process_coredump_script_path
</ins><span class="cx"> mock_empty_crash_log = """\
</span><span class="cx"> crash log for DumpRenderTree (pid 28529):
</span><span class="cx">
</span><del>-Coredump core-pid_28529-_-process_DumpRenderTree not found. To enable crash logs:
</del><ins>+Coredump core-pid_28529.dump not found. To enable crash logs:
</ins><span class="cx">
</span><span class="cx"> - run this command as super-user: echo "%(core_pattern)s" > /proc/sys/kernel/core_pattern
</span><span class="cx"> - enable core dumps: ulimit -c unlimited
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2macGetPIDAfterAbortedProcessLaunchcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2/mac/GetPIDAfterAbortedProcessLaunch.cpp (203673 => 203674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2/mac/GetPIDAfterAbortedProcessLaunch.cpp 2016-07-25 03:42:50 UTC (rev 203673)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2/mac/GetPIDAfterAbortedProcessLaunch.cpp 2016-07-25 06:07:40 UTC (rev 203674)
</span><span class="lines">@@ -27,8 +27,9 @@
</span><span class="cx"> #include "PlatformUtilities.h"
</span><span class="cx"> #include "PlatformWebView.h"
</span><span class="cx">
</span><ins>+#include <WebKit/WKContextPrivate.h>
+#include <WebKit/WKPagePrivate.h>
</ins><span class="cx"> #include <WebKit/WKPagePrivateMac.h>
</span><del>-#include <WebKit/WKContextPrivate.h>
</del><span class="cx">
</span><span class="cx"> namespace TestWebKitAPI {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerTestControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (203673 => 203674)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/TestController.cpp 2016-07-25 03:42:50 UTC (rev 203673)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2016-07-25 06:07:40 UTC (rev 203674)
</span><span class="lines">@@ -1479,23 +1479,15 @@
</span><span class="cx">
</span><span class="cx"> void TestController::networkProcessDidCrash()
</span><span class="cx"> {
</span><del>-#if PLATFORM(COCOA)
</del><span class="cx"> pid_t pid = WKContextGetNetworkProcessIdentifier(m_context.get());
</span><span class="cx"> fprintf(stderr, "#CRASHED - %s (pid %ld)\n", networkProcessName(), static_cast<long>(pid));
</span><del>-#else
- fprintf(stderr, "#CRASHED - %s\n", networkProcessName());
-#endif
</del><span class="cx"> exit(1);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestController::databaseProcessDidCrash()
</span><span class="cx"> {
</span><del>-#if PLATFORM(COCOA)
</del><span class="cx"> pid_t pid = WKContextGetDatabaseProcessIdentifier(m_context.get());
</span><span class="cx"> fprintf(stderr, "#CRASHED - %s (pid %ld)\n", databaseProcessName(), static_cast<long>(pid));
</span><del>-#else
- fprintf(stderr, "#CRASHED - %s\n", databaseProcessName());
-#endif
</del><span class="cx"> exit(1);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1722,12 +1714,8 @@
</span><span class="cx"> // This function can be called multiple times when crash logs are being saved on Windows, so
</span><span class="cx"> // ensure we only print the crashed message once.
</span><span class="cx"> if (!m_didPrintWebProcessCrashedMessage) {
</span><del>-#if PLATFORM(COCOA)
</del><span class="cx"> pid_t pid = WKPageGetProcessIdentifier(m_mainWebView->page());
</span><span class="cx"> fprintf(stderr, "#CRASHED - %s (pid %ld)\n", webProcessName(), static_cast<long>(pid));
</span><del>-#else
- fprintf(stderr, "#CRASHED - %s\n", webProcessName());
-#endif
</del><span class="cx"> fflush(stderr);
</span><span class="cx"> m_didPrintWebProcessCrashedMessage = true;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>