<!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>[207802] branches/safari-602-branch/Source/WebKit2</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/207802">207802</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-10-24 20:23:14 -0700 (Mon, 24 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/206762">r206762</a>. rdar://problem/28544885</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari602branchSourceWebKit2ChangeLog">branches/safari-602-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari602branchSourceWebKit2NetworkProcessNetworkResourceLoadercpp">branches/safari-602-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKit2PlatformmacSharedMemoryMaccpp">branches/safari-602-branch/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKit2WebProcessNetworkWebLoaderStrategycpp">branches/safari-602-branch/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp</a></li>
<li><a href="#branchessafari602branchSourceWebKit2WebProcessNetworkWebResourceLoadercpp">branches/safari-602-branch/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari602branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/ChangeLog (207801 => 207802)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-10-25 03:23:10 UTC (rev 207801)
+++ branches/safari-602-branch/Source/WebKit2/ChangeLog 2016-10-25 03:23:14 UTC (rev 207802)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2016-10-24 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r206762. rdar://problem/28544885
+
+ 2016-10-03 Keith Rollin <krollin@apple.com>
+
+ More logging to diagnose "WebKit encountered an internal error" messages
+ https://bugs.webkit.org/show_bug.cgi?id=162754
+
+ Reviewed by Antti Koivisto.
+
+ Add more logging around calls to internalError, as well as some
+ low-level logging around SharedMemory, and mach_vm_map in particular.
+
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::startNetworkLoad):
+ * Platform/Logging.h:
+ * Platform/mac/SharedMemoryMac.cpp:
+ (WebKit::SharedMemory::allocate):
+ (WebKit::makeMemoryEntry):
+ (WebKit::SharedMemory::map):
+ (WebKit::SharedMemory::~SharedMemory):
+ * WebProcess/Network/WebLoaderStrategy.cpp:
+ (WebKit::WebLoaderStrategy::networkProcessCrashed):
+ (WebKit::WebLoaderStrategy::loadResourceSynchronously):
+ * WebProcess/Network/WebResourceLoader.cpp:
+ (WebKit::WebResourceLoader::didReceiveResource):
+
+2016-10-24 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r204472. rdar://problem/28544885
</span><span class="cx">
</span><span class="cx"> 2016-08-15 Keith Rollin <krollin@apple.com>
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (207801 => 207802)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-10-25 03:23:10 UTC (rev 207801)
+++ branches/safari-602-branch/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-10-25 03:23:14 UTC (rev 207802)
</span><span class="lines">@@ -216,6 +216,7 @@
</span><span class="cx"> auto* networkSession = SessionTracker::networkSession(parameters.sessionID);
</span><span class="cx"> if (!networkSession) {
</span><span class="cx"> WTFLogAlways("Attempted to create a NetworkLoad with a session (id=%" PRIu64 ") that does not exist.", parameters.sessionID.sessionID());
</span><ins>+ RELEASE_LOG_ERROR_IF_ALLOWED("startNetworkLoad: Attempted to create a NetworkLoad with a session that does not exist (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ", sessionID=%" PRIu64 ")", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier, parameters.sessionID.sessionID());
</ins><span class="cx"> didFailLoading(internalError(request.url()));
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2PlatformmacSharedMemoryMaccpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp (207801 => 207802)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp 2016-10-25 03:23:10 UTC (rev 207801)
+++ branches/safari-602-branch/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp 2016-10-25 03:23:14 UTC (rev 207802)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include "ArgumentDecoder.h"
</span><span class="cx"> #include "ArgumentEncoder.h"
</span><span class="cx"> #include "Arguments.h"
</span><ins>+#include "Logging.h"
</ins><span class="cx"> #include "MachPort.h"
</span><span class="cx"> #include <WebCore/MachSendRight.h>
</span><span class="cx"> #include <WebCore/MachVMSPI.h>
</span><span class="lines">@@ -106,7 +107,11 @@
</span><span class="cx"> mach_vm_address_t address;
</span><span class="cx"> kern_return_t kr = mach_vm_allocate(mach_task_self(), &address, round_page(size), VM_FLAGS_ANYWHERE);
</span><span class="cx"> if (kr != KERN_SUCCESS) {
</span><ins>+#if RELEASE_LOG_DISABLED
</ins><span class="cx"> LOG_ERROR("Failed to allocate mach_vm_allocate shared memory (%zu bytes). %s (%x)", size, mach_error_string(kr), kr);
</span><ins>+#else
+ RELEASE_LOG_ERROR("%p - SharedMemory::allocate: Failed to allocate mach_vm_allocate shared memory (%zu bytes). %{public}s (%x)", nullptr, size, mach_error_string(kr), kr);
+#endif
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -139,7 +144,11 @@
</span><span class="cx"> mach_port_t port;
</span><span class="cx"> kern_return_t kr = mach_make_memory_entry_64(mach_task_self(), &memoryObjectSize, offset, machProtection(protection) | VM_PROT_IS_MASK | MAP_MEM_VM_SHARE, &port, parentEntry);
</span><span class="cx"> if (kr != KERN_SUCCESS) {
</span><ins>+#if RELEASE_LOG_DISABLED
</ins><span class="cx"> LOG_ERROR("Failed to create a mach port for shared memory. %s (%x)", mach_error_string(kr), kr);
</span><ins>+#else
+ RELEASE_LOG_ERROR("%p - SharedMemory::makeMemoryEntry: Failed to create a mach port for shared memory. %{public}s (%x)", nullptr, mach_error_string(kr), kr);
+#endif
</ins><span class="cx"> return { };
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -175,8 +184,15 @@
</span><span class="cx"> vm_prot_t vmProtection = machProtection(protection);
</span><span class="cx"> mach_vm_address_t mappedAddress = 0;
</span><span class="cx"> kern_return_t kr = mach_vm_map(mach_task_self(), &mappedAddress, round_page(handle.m_size), 0, VM_FLAGS_ANYWHERE, handle.m_port, 0, false, vmProtection, vmProtection, VM_INHERIT_NONE);
</span><ins>+#if RELEASE_LOG_DISABLED
</ins><span class="cx"> if (kr != KERN_SUCCESS)
</span><span class="cx"> return nullptr;
</span><ins>+#else
+ if (kr != KERN_SUCCESS) {
+ RELEASE_LOG_ERROR("%p - SharedMemory::map: Failed to map shared memory. %{public}s (%x)", nullptr, mach_error_string(kr), kr);
+ return nullptr;
+ }
+#endif
</ins><span class="cx">
</span><span class="cx"> auto sharedMemory(adoptRef(*new SharedMemory));
</span><span class="cx"> sharedMemory->m_size = handle.m_size;
</span><span class="lines">@@ -191,12 +207,26 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_data) {
</span><span class="cx"> kern_return_t kr = mach_vm_deallocate(mach_task_self(), toVMAddress(m_data), round_page(m_size));
</span><ins>+#if RELEASE_LOG_DISABLED
</ins><span class="cx"> ASSERT_UNUSED(kr, kr == KERN_SUCCESS);
</span><ins>+#else
+ if (kr != KERN_SUCCESS) {
+ RELEASE_LOG_ERROR("%p - SharedMemory::~SharedMemory: Failed to deallocate shared memory. %{public}s (%x)", this, mach_error_string(kr), kr);
+ ASSERT_NOT_REACHED();
+ }
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_port) {
</span><span class="cx"> kern_return_t kr = mach_port_deallocate(mach_task_self(), m_port);
</span><ins>+#if RELEASE_LOG_DISABLED
</ins><span class="cx"> ASSERT_UNUSED(kr, kr == KERN_SUCCESS);
</span><ins>+#else
+ if (kr != KERN_SUCCESS) {
+ RELEASE_LOG_ERROR("%p - SharedMemory::~SharedMemory: Failed to deallocate port. %{public}s (%x)", this, mach_error_string(kr), kr);
+ ASSERT_NOT_REACHED();
+ }
+#endif
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2WebProcessNetworkWebLoaderStrategycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp (207801 => 207802)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp 2016-10-25 03:23:10 UTC (rev 207801)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp 2016-10-25 03:23:14 UTC (rev 207802)
</span><span class="lines">@@ -294,6 +294,8 @@
</span><span class="cx">
</span><span class="cx"> void WebLoaderStrategy::networkProcessCrashed()
</span><span class="cx"> {
</span><ins>+ RELEASE_LOG_ERROR("WebLoaderStrategy::networkProcessCrashed: failing all pending resource loaders");
+
</ins><span class="cx"> for (auto& loader : m_webResourceLoaders)
</span><span class="cx"> scheduleInternallyFailedLoad(*loader.value->resourceLoader());
</span><span class="cx">
</span><span class="lines">@@ -326,6 +328,7 @@
</span><span class="cx"> HangDetectionDisabler hangDetectionDisabler;
</span><span class="cx">
</span><span class="cx"> if (!WebProcess::singleton().networkConnection().connection().sendSync(Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad(loadParameters), Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::Reply(error, response, data), 0)) {
</span><ins>+ RELEASE_LOG_ERROR_IF_ALLOWED("loadResourceSynchronously: failed sending synchronous network process message (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ")", loadParameters.webPageID, loadParameters.webFrameID, loadParameters.identifier);
</ins><span class="cx"> response = ResourceResponse();
</span><span class="cx"> error = internalError(request.url());
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari602branchSourceWebKit2WebProcessNetworkWebResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602-branch/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp (207801 => 207802)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602-branch/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2016-10-25 03:23:10 UTC (rev 207801)
+++ branches/safari-602-branch/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2016-10-25 03:23:14 UTC (rev 207802)
</span><span class="lines">@@ -198,6 +198,7 @@
</span><span class="cx">
</span><span class="cx"> if (!buffer) {
</span><span class="cx"> LOG_ERROR("Unable to create buffer from ShareableResource sent from the network process.");
</span><ins>+ RELEASE_LOG_IF_ALLOWED("didReceiveResource: Unable to create SharedBuffer");
</ins><span class="cx"> m_coreLoader->didFail(internalError(m_coreLoader->request().url()));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -221,3 +222,4 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><ins>+
</ins></span></pre>
</div>
</div>
</body>
</html>