Changeset 206410 in webkit

Timestamp:

Sep 26, 2016 8:35:01 PM (8 years ago)

Author:

mitz@apple.com

Message:

-_webViewWebProcessDidBecomeUnresponsive: gets called when the Web process is stopped in the debugger
​https://bugs.webkit.org/show_bug.cgi?id=162234

Reviewed by Sam Weinig.

• UIProcess/Cocoa/WebProcessProxyCocoa.mm:

(WebKit::WebProcessProxy::platformIsBeingDebugged): Use the KERN_PROC sysctl to get the

process flags and check for P_TRACED.

• UIProcess/ResponsivenessTimer.cpp:

(WebKit::ResponsivenessTimer::timerFired): Call the new client function

mayBecomeUnresponsive. If it returns false, restart the timer and bail out without
changing the responsiveness state.

• UIProcess/ResponsivenessTimer.h: Declared new client function mayBecomeUnresponsive.

• UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::platformIsBeingDebugged): A generic implementation that always

returns false.

(WebKit::WebProcessProxy::mayBecomeUnresponsive): Implement this new

ResponsivenessTimer::Client function to return true unless the process is being debugged.

• UIProcess/WebProcessProxy.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/WebProcessProxyCocoa.mm (modified) (2 diffs)
• UIProcess/ResponsivenessTimer.cpp (modified) (1 diff)
• UIProcess/ResponsivenessTimer.h (modified) (1 diff)
• UIProcess/WebProcessProxy.cpp (modified) (2 diffs)
• UIProcess/WebProcessProxy.h (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-09-26  Dan Bernstein  <mitz@apple.com>
+
+        -_webViewWebProcessDidBecomeUnresponsive: gets called when the Web process is stopped in the debugger
+        https://bugs.webkit.org/show_bug.cgi?id=162234
+
+        Reviewed by Sam Weinig.
+
+        * UIProcess/Cocoa/WebProcessProxyCocoa.mm:
+        (WebKit::WebProcessProxy::platformIsBeingDebugged): Use the KERN_PROC sysctl to get the
+          process flags and check for P_TRACED.
+
+        * UIProcess/ResponsivenessTimer.cpp:
+        (WebKit::ResponsivenessTimer::timerFired): Call the new client function
+          mayBecomeUnresponsive. If it returns false, restart the timer and bail out without
+          changing the responsiveness state.
+
+        * UIProcess/ResponsivenessTimer.h: Declared new client function mayBecomeUnresponsive.
+
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::platformIsBeingDebugged): A generic implementation that always
+          returns false.
+        (WebKit::WebProcessProxy::mayBecomeUnresponsive): Implement this new
+          ResponsivenessTimer::Client function to return true unless the process is being debugged.
+        * UIProcess/WebProcessProxy.h:
+
 2016-09-26  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessProxyCocoa.mm

@@ -31 +31 @@
 #import "WKBrowsingContextHandleInternal.h"
 #import "WKTypeRefWrapper.h"
+#import <sys/sysctl.h>
 #import <wtf/NeverDestroyed.h>
 
@@ -121 +122 @@
 }
 
+bool WebProcessProxy::platformIsBeingDebugged() const
+{
+    struct kinfo_proc info;
+    int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, processIdentifier() };
+    size_t size = sizeof(info);
+    if (sysctl(mib, WTF_ARRAY_LENGTH(mib), &info, &size, nullptr, 0) == -1)
+        return false;
+
+    return info.kp_proc.p_flag & P_TRACED;
 }
+
+}

trunk/Source/WebKit2/UIProcess/ResponsivenessTimer.cpp

@@ -53 +53 @@
         return;
 
+    if (!m_client.mayBecomeUnresponsive()) {
+        m_timer.startOneShot(responsivenessTimeout);
+        return;
+    }
+
     m_client.willChangeIsResponsive();
     m_isResponsive = false;

trunk/Source/WebKit2/UIProcess/ResponsivenessTimer.h

@@ -41 +41 @@
         virtual void willChangeIsResponsive() = 0;
         virtual void didChangeIsResponsive() = 0;
+
+        virtual bool mayBecomeUnresponsive() = 0;
     };
 

trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp

@@ -473 +473 @@
 }
 
+#if !PLATFORM(COCOA)
+bool WebProcessProxy::platformIsBeingDebugged() const
+{
+    return false;
+}
+#endif
+
 void WebProcessProxy::didReceiveMessage(IPC::Connection& connection, IPC::Decoder& decoder)
 {
@@ -578 +585 @@
     for (auto& page : pages)
         page->didChangeProcessIsResponsive();
+}
+
+bool WebProcessProxy::mayBecomeUnresponsive()
+{
+    return !platformIsBeingDebugged();
 }
 

trunk/Source/WebKit2/UIProcess/WebProcessProxy.h

@@ -187 +187 @@
     void releaseRemainingIconsForPageURLs();
 
+    bool platformIsBeingDebugged() const;
+
     static const HashSet<String>& platformPathsWithAssumedReadAccess();
 
@@ -201 +203 @@
     void willChangeIsResponsive() override;
     void didChangeIsResponsive() override;
+    bool mayBecomeUnresponsive() override;
 
     // ProcessThrottlerClient