Changeset 206757 in webkit

Timestamp:

Oct 3, 2016, 3:53:43 PM (9 years ago)

Author:

Ryan Haddad

Message:

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

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkResourceLoader.cpp (modified) (2 diffs)
• Platform/Logging.h (modified) (1 diff)
• Platform/mac/SharedMemoryMac.cpp (modified) (5 diffs)
• WebProcess/Network/WebLoaderStrategy.cpp (modified) (2 diffs)
• WebProcess/Network/WebResourceLoader.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-10-03  Ryan Haddad  <ryanhaddad@apple.com>
+
+        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  <krollin@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp

@@ -51 +51 @@
 
 #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 {
@@ -220 +219 @@
     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;

trunk/Source/WebKit2/Platform/Logging.h

@@ -68 +68 @@
     M(TextInput) \
     M(ViewGestures) \
-    M(VirtualMemory) \
     M(VisibleRects) \
 

trunk/Source/WebKit2/Platform/mac/SharedMemoryMac.cpp

@@ -29 +29 @@
 #include "Decoder.h"
 #include "Encoder.h"
-#include "Logging.h"
 #include "MachPort.h"
 #include <WebCore/MachSendRight.h>
@@ -107 +106 @@
     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;
     }
@@ -140 +139 @@
     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 { };
     }
@@ -176 +175 @@
     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));
@@ -194 +191 @@
     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);
     }        
 }

trunk/Source/WebKit2/WebProcess/Network/WebLoaderStrategy.cpp

@@ -306 +306 @@
 void WebLoaderStrategy::networkProcessCrashed()
 {
-    RELEASE_LOG_ERROR(Network, "WebLoaderStrategy::networkProcessCrashed: failing all pending resource loaders");
-
     for (auto& loader : m_webResourceLoaders)
         scheduleInternallyFailedLoad(*loader.value->resourceLoader());
@@ -340 +338 @@
 
     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());

trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp

@@ -200 +200 @@
     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;