Diff
Modified: trunk/Source/WebKit2/ChangeLog (206756 => 206757)
--- trunk/Source/WebKit2/ChangeLog 2016-10-03 22:43:37 UTC (rev 206756)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-03 22:53:43 UTC (rev 206757)
@@ -1,3 +1,16 @@
+2016-10-03 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r206754.
+
+ This change broke the El Capitan and Yosemite debug builds.
+
+ Reverted changeset:
+
+ "More logging to diagnose "WebKit encountered an internal
+ error" messages"
+ https://bugs.webkit.org/show_bug.cgi?id=162754
+ http://trac.webkit.org/changeset/206754
+
2016-10-03 Keith Rollin <[email protected]>
More logging to diagnose "WebKit encountered an internal error" messages
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (206756 => 206757)
--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-10-03 22:43:37 UTC (rev 206756)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2016-10-03 22:53:43 UTC (rev 206757)
@@ -50,7 +50,6 @@
using namespace WebCore;
#define RELEASE_LOG_IF_ALLOWED(fmt, ...) RELEASE_LOG_IF(isAlwaysOnLoggingAllowed(), Network, "%p - NetworkResourceLoader::" fmt, this, ##__VA_ARGS__)
-#define RELEASE_LOG_ERROR_IF_ALLOWED(fmt, ...) RELEASE_LOG_ERROR_IF(isAlwaysOnLoggingAllowed(), Network, "%p - NetworkResourceLoader::" fmt, this, ##__VA_ARGS__)
namespace WebKit {
@@ -219,7 +218,7 @@
auto* networkSession = SessionTracker::networkSession(parameters.sessionID);
if (!networkSession) {
WTFLogAlways("Attempted to create a NetworkLoad with a session (id=%" PRIu64 ") that does not exist.", parameters.sessionID.sessionID());
- 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());
+ RELEASE_LOG_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());
didFailLoading(internalError(request.url()));
return;
}
Modified: trunk/Source/WebKit2/Platform/Logging.h (206756 => 206757)
--- trunk/Source/WebKit2/Platform/Logging.h 2016-10-03 22:43:37 UTC (rev 206756)
+++ trunk/Source/WebKit2/Platform/Logging.h 2016-10-03 22:53:43 UTC (rev 206757)
@@ -67,7 +67,6 @@
M(StorageAPI) \
M(TextInput) \
M(ViewGestures) \
- M(VirtualMemory) \
M(VisibleRects) \
WEBKIT2_LOG_CHANNELS(DECLARE_LOG_CHANNEL)
Modified: trunk/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp (206756 => 206757)
--- trunk/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp 2016-10-03 22:43:37 UTC (rev 206756)
+++ trunk/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp 2016-10-03 22:53:43 UTC (rev 206757)
@@ -28,7 +28,6 @@
#include "Decoder.h"
#include "Encoder.h"
-#include "Logging.h"
#include "MachPort.h"
#include <WebCore/MachSendRight.h>
#include <WebCore/MachVMSPI.h>
@@ -106,7 +105,7 @@
mach_vm_address_t address;
kern_return_t kr = mach_vm_allocate(mach_task_self(), &address, round_page(size), VM_FLAGS_ANYWHERE);
if (kr != KERN_SUCCESS) {
- RELEASE_LOG_ERROR(VirtualMemory, "%p - SharedMemory::allocate: Failed to allocate mach_vm_allocate shared memory (%zu bytes). %{public}s (%x)", nullptr, size, mach_error_string(kr), kr);
+ LOG_ERROR("Failed to allocate mach_vm_allocate shared memory (%zu bytes). %s (%x)", size, mach_error_string(kr), kr);
return nullptr;
}
@@ -139,7 +138,7 @@
mach_port_t port;
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);
if (kr != KERN_SUCCESS) {
- RELEASE_LOG_ERROR(VirtualMemory, "%p - SharedMemory::makeMemoryEntry: Failed to create a mach port for shared memory. %{public}s (%x)", nullptr, mach_error_string(kr), kr);
+ LOG_ERROR("Failed to create a mach port for shared memory. %s (%x)", mach_error_string(kr), kr);
return { };
}
@@ -175,10 +174,8 @@
vm_prot_t vmProtection = machProtection(protection);
mach_vm_address_t mappedAddress = 0;
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);
- if (kr != KERN_SUCCESS) {
- RELEASE_LOG_ERROR(VirtualMemory, "%p - SharedMemory::map: Failed to map shared memory. %{public}s (%x)", nullptr, mach_error_string(kr), kr);
+ if (kr != KERN_SUCCESS)
return nullptr;
- }
auto sharedMemory(adoptRef(*new SharedMemory));
sharedMemory->m_size = handle.m_size;
@@ -193,18 +190,12 @@
{
if (m_data) {
kern_return_t kr = mach_vm_deallocate(mach_task_self(), toVMAddress(m_data), round_page(m_size));
- if (kr != KERN_SUCCESS) {
- RELEASE_LOG_ERROR(VirtualMemory, "%p - SharedMemory::~SharedMemory: Failed to deallocate shared memory. %{public}s (%x)", this, mach_error_string(kr), kr);
- ASSERT_NOT_REACHED();
- }
+ ASSERT_UNUSED(kr, kr == KERN_SUCCESS);
}
if (m_port) {
kern_return_t kr = mach_port_deallocate(mach_task_self(), m_port);
- if (kr != KERN_SUCCESS) {
- RELEASE_LOG_ERROR(VirtualMemory, "%p - SharedMemory::~SharedMemory: Failed to deallocate port. %{public}s (%x)", this, mach_error_string(kr), kr);
- ASSERT_NOT_REACHED();
- }
+ ASSERT_UNUSED(kr, kr == KERN_SUCCESS);
}
}
Modified: trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp (206756 => 206757)
--- trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp 2016-10-03 22:43:37 UTC (rev 206756)
+++ trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp 2016-10-03 22:53:43 UTC (rev 206757)
@@ -305,8 +305,6 @@
void WebLoaderStrategy::networkProcessCrashed()
{
- RELEASE_LOG_ERROR(Network, "WebLoaderStrategy::networkProcessCrashed: failing all pending resource loaders");
-
for (auto& loader : m_webResourceLoaders)
scheduleInternallyFailedLoad(*loader.value->resourceLoader());
@@ -339,7 +337,6 @@
HangDetectionDisabler hangDetectionDisabler;
if (!WebProcess::singleton().networkConnection().connection().sendSync(Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad(loadParameters), Messages::NetworkConnectionToWebProcess::PerformSynchronousLoad::Reply(error, response, data), 0)) {
- RELEASE_LOG_ERROR_IF_ALLOWED(loadParameters.sessionID, "loadResourceSynchronously: failed sending synchronous network process message (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ")", loadParameters.webPageID, loadParameters.webFrameID, loadParameters.identifier);
response = ResourceResponse();
error = internalError(request.url());
}
Modified: trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp (206756 => 206757)
--- trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2016-10-03 22:43:37 UTC (rev 206756)
+++ trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp 2016-10-03 22:53:43 UTC (rev 206757)
@@ -199,7 +199,6 @@
if (!buffer) {
LOG_ERROR("Unable to create buffer from ShareableResource sent from the network process.");
- RELEASE_LOG_IF_ALLOWED("didReceiveResource: Unable to create SharedBuffer (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ")", m_trackingParameters.pageID, m_trackingParameters.frameID, m_trackingParameters.resourceID);
m_coreLoader->didFail(internalError(m_coreLoader->request().url()));
return;
}
