<!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>[197901] trunk/Source</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/197901">197901</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-09 16:45:35 -0800 (Wed, 09 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add state dumping facility
https://bugs.webkit.org/show_bug.cgi?id=154930
<rdar://problem/24939135>
Patch by Keith Rollin <krollin@apple.com> on 2016-03-09
Reviewed by Anders Carlsson.
Source/WebKit2:
Collect the times at which pages are loaded. Dump them when an OS
state dump is triggered.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::didCommitLoad):
* WebProcess/WebPage/WebPage.h:
(WebKit::WebPage::lastPageLoadTime):
* WebProcess/WebProcess.h:
* WebProcess/cocoa/WebProcessCocoa.mm:
(WebKit::WebProcess::registerWithStateDumper):
(WebKit::WebProcess::platformInitializeProcess):
Source/WTF:
Add an OS_STATE flag to control the inclusion of process state dumping
functionality.
* wtf/Platform.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessh">trunk/Source/WebKit2/WebProcess/WebProcess.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm">trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (197900 => 197901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-03-10 00:40:30 UTC (rev 197900)
+++ trunk/Source/WTF/ChangeLog 2016-03-10 00:45:35 UTC (rev 197901)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-03-09 Keith Rollin <krollin@apple.com>
+
+ Add state dumping facility
+ https://bugs.webkit.org/show_bug.cgi?id=154930
+ <rdar://problem/24939135>
+
+ Reviewed by Anders Carlsson.
+
+ Add an OS_STATE flag to control the inclusion of process state dumping
+ functionality.
+
+ * wtf/Platform.h:
+
</ins><span class="cx"> 2016-03-09 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix old iOS
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (197900 => 197901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2016-03-10 00:40:30 UTC (rev 197900)
+++ trunk/Source/WTF/wtf/Platform.h 2016-03-10 00:45:35 UTC (rev 197901)
</span><span class="lines">@@ -1136,7 +1136,10 @@
</span><span class="cx">
</span><span class="cx"> #if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101200) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)
</span><span class="cx"> #define USE_OS_LOG 1
</span><ins>+#if USE(APPLE_INTERNAL_SDK)
+#define USE_OS_STATE 1
</ins><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> #if defined(ENABLE_SEPARATED_WX_HEAP)
</span><span class="cx"> #if !(CPU(ARM64) && ((PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)))
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (197900 => 197901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-03-10 00:40:30 UTC (rev 197900)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-10 00:45:35 UTC (rev 197901)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-03-09 Keith Rollin <krollin@apple.com>
+
+ Add state dumping facility
+ https://bugs.webkit.org/show_bug.cgi?id=154930
+ <rdar://problem/24939135>
+
+ Reviewed by Anders Carlsson.
+
+ Collect the times at which pages are loaded. Dump them when an OS
+ state dump is triggered.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::didCommitLoad):
+ * WebProcess/WebPage/WebPage.h:
+ (WebKit::WebPage::lastPageLoadTime):
+ * WebProcess/WebProcess.h:
+ * WebProcess/cocoa/WebProcessCocoa.mm:
+ (WebKit::WebProcess::registerWithStateDumper):
+ (WebKit::WebProcess::platformInitializeProcess):
+
</ins><span class="cx"> 2016-03-09 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> _WKWebsiteDataSize.h should be an SPI header.
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (197900 => 197901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-03-10 00:40:30 UTC (rev 197900)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-03-10 00:45:35 UTC (rev 197901)
</span><span class="lines">@@ -4828,6 +4828,10 @@
</span><span class="cx"> resetPrimarySnapshottedPlugIn();
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if USE(OS_STATE)
+ m_loadCommitTime = std::chrono::system_clock::now();
+#endif
+
</ins><span class="cx"> WebProcess::singleton().updateActivePages();
</span><span class="cx">
</span><span class="cx"> updateMainFrameScrollOffsetPinning();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (197900 => 197901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-03-10 00:40:30 UTC (rev 197900)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2016-03-10 00:45:35 UTC (rev 197901)
</span><span class="lines">@@ -934,6 +934,10 @@
</span><span class="cx">
</span><span class="cx"> void insertNewlineInQuotedContent();
</span><span class="cx">
</span><ins>+#if USE(OS_STATE)
+ std::chrono::system_clock::time_point loadCommitTime() const { return m_loadCommitTime; }
+#endif
+
</ins><span class="cx"> private:
</span><span class="cx"> WebPage(uint64_t pageID, const WebPageCreationParameters&);
</span><span class="cx">
</span><span class="lines">@@ -1442,6 +1446,10 @@
</span><span class="cx"> #if ENABLE(VIDEO) && USE(GSTREAMER)
</span><span class="cx"> RefPtr<WebCore::MediaPlayerRequestInstallMissingPluginsCallback> m_installMediaPluginsCallback;
</span><span class="cx"> #endif
</span><ins>+
+#if USE(OS_STATE)
+ std::chrono::system_clock::time_point m_loadCommitTime;
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (197900 => 197901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2016-03-10 00:40:30 UTC (rev 197900)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2016-03-10 00:45:35 UTC (rev 197901)
</span><span class="lines">@@ -216,6 +216,10 @@
</span><span class="cx"> void initializeWebProcess(WebProcessCreationParameters&&);
</span><span class="cx"> void platformInitializeWebProcess(WebProcessCreationParameters&&);
</span><span class="cx">
</span><ins>+#if USE(OS_STATE)
+ void registerWithStateDumper();
+#endif
+
</ins><span class="cx"> void clearCachedCredentials();
</span><span class="cx">
</span><span class="cx"> void platformTerminate();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcesscocoaWebProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm (197900 => 197901)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2016-03-10 00:40:30 UTC (rev 197900)
+++ trunk/Source/WebKit2/WebProcess/cocoa/WebProcessCocoa.mm 2016-03-10 00:45:35 UTC (rev 197901)
</span><span class="lines">@@ -66,6 +66,10 @@
</span><span class="cx"> #import <WebCore/GraphicsServicesSPI.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if USE(OS_STATE)
+#include <os/state_private.h>
+#endif
+
</ins><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="lines">@@ -206,10 +210,81 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if USE(OS_STATE)
+void WebProcess::registerWithStateDumper()
+{
+ dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
+ os_state_add_handler(queue, ^(os_state_hints_t hints) {
+
+ @autoreleasepool {
+ os_state_data_t os_state = nil;
+
+ // Only gather state on faults and sysdiagnose. It's overkill for
+ // general error messages.
+ if (hints->osh_api == OS_STATE_API_ERROR)
+ return os_state;
+
+ // Create a dictionary to contain the collected state. This
+ // dictionary will be serialized and passed back to os_state.
+ auto stateDict = adoptNS([[NSMutableDictionary alloc] init]);
+
+ auto pageLoadTimes = adoptNS([[NSMutableArray alloc] init]);
+ for (auto& page : m_pageMap.values()) {
+ if (page->usesEphemeralSession())
+ continue;
+
+ NSDate* date = [NSDate dateWithTimeIntervalSince1970:std::chrono::system_clock::to_time_t(page->loadCommitTime())];
+ [pageLoadTimes addObject:date];
+ }
+
+ // Adding an empty array to the process state may provide an
+ // indication of the existance of private sessions, which we'd like
+ // to hide, so don't add empty arrays.
+ if ([pageLoadTimes count])
+ [stateDict setObject:pageLoadTimes.get() forKey:@"Page Load Times"];
+
+ // --- Possibly add other state here as other entries in the dictionary. ---
+
+ // Submitting an empty process state object may provide an
+ // indication of the existance of private sessions, which we'd like
+ // to hide, so don't return empty dictionaries.
+ if (![stateDict count])
+ return os_state;
+
+ // Serialize the accumulated process state so that we can put the
+ // result in an os_state_data_t structure.
+ NSError* error = nil;
+ NSData* data = [NSPropertyListSerialization dataWithPropertyList:stateDict.get() format:NSPropertyListBinaryFormat_v1_0 options:0 error:&error];
+
+ if (!data) {
+ ASSERT(data);
+ return os_state;
+ }
+
+ size_t neededSize = OS_STATE_DATA_SIZE_NEEDED(data.length);
+ os_state = (os_state_data_t)malloc(neededSize);
+ if (os_state) {
+ memset(os_state, 0, neededSize);
+ os_state->osd_type = OS_STATE_DATA_SERIALIZED_NSCF_OBJECT;
+ os_state->osd_data_size = data.length;
+ strcpy(os_state->osd_title, "WebContent state"); // NB: Only 64 bytes of buffer here.
+ memcpy(os_state->osd_data, data.bytes, data.length);
+ }
+
+ return os_state;
+ }
+ });
+}
+#endif
+
</ins><span class="cx"> void WebProcess::platformInitializeProcess(const ChildProcessInitializationParameters&)
</span><span class="cx"> {
</span><span class="cx"> registerWithAccessibility();
</span><span class="cx">
</span><ins>+#if USE(OS_STATE)
+ registerWithStateDumper();
+#endif
+
</ins><span class="cx"> #if ENABLE(SEC_ITEM_SHIM)
</span><span class="cx"> SecItemShim::singleton().initialize(this);
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>