Changeset 116417 in webkit

Timestamp:

May 8, 2012 7:00:31 AM (12 years ago)

Author:

alexis.menard@openbossa.org

Message:

[Qt] Unbreak debugging of WebKit2.
​https://bugs.webkit.org/show_bug.cgi?id=85839

Reviewed by Simon Hausmann.

Source/WebKit2:

When you attach GDB to a running process, it stops it.
​http://trac.webkit.org/changeset/115958 introduced a pause()
call to wait the debugger to be attached to then continue
the execution of the WebProcess. Unfortunately the pause()
function does not return unless a signal handler is called.
This patch introduce an event handler to exit from the paused
state when the debugger send the signal SIGCONT. The old code
works with older version of GDB (<7.0) but not with newer
versions where the behavior of pause() is correct.

• qt/MainQt.cpp:

(sigcontHandler):
(main):

Tools:

When you attach GDB to a running process, it stops it.
​http://trac.webkit.org/changeset/115958 introduced a pause()
call to wait the debugger to be attached to then continue
the execution of the WebProcess. Unfortunately the pause()
function does not return unless a signal handler is called.
This patch introduce an event handler to exit from the paused
state when the debugger send the signal SIGCONT. The old code
works with older version of GDB (<7.0) but not with newer
versions where the behavior of pause() is correct.

• WebKitTestRunner/qt/main.cpp:

(sigcontHandler):
(main):

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/qt/MainQt.cpp (modified) (3 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/qt/main.cpp (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-05-07  Alexis Menard  <alexis.menard@openbossa.org>
+
+        [Qt] Unbreak debugging of WebKit2.
+        https://bugs.webkit.org/show_bug.cgi?id=85839
+
+        Reviewed by Simon Hausmann.
+
+        When you attach GDB to a running process, it stops it.
+        http://trac.webkit.org/changeset/115958 introduced a pause()
+        call to wait the debugger to be attached to then continue
+        the execution of the WebProcess. Unfortunately the pause()
+        function does not return unless a signal handler is called.
+        This patch introduce an event handler to exit from the paused
+        state when the debugger send the signal SIGCONT. The old code
+        works with older version of GDB (<7.0) but not with newer
+        versions where the behavior of pause() is correct.
+
+        * qt/MainQt.cpp:
+        (sigcontHandler):
+        (main):
+
 2012-05-07  Julien Chaffraix  <jchaffraix@webkit.org>
 

trunk/Source/WebKit2/qt/MainQt.cpp

@@ -29 +29 @@
 #include <stdio.h>
 #if !defined(NDEBUG) && defined(Q_OS_UNIX)
+#include <signal.h>
 #include <unistd.h>
 #endif
@@ -36 +37 @@
 Q_DECL_IMPORT void initializeWebKit2Theme();
 }
+
+#if !defined(NDEBUG) && defined(Q_OS_UNIX)
+static void sigcontHandler(int)
+{
+}
+#endif
 
 static void messageHandler(QtMsgType type, const char* message)
@@ -54 +61 @@
 #if !defined(NDEBUG) && defined(Q_OS_UNIX)
     if (qgetenv("QT_WEBKIT_PAUSE_WEB_PROCESS") == "1" || qgetenv("QT_WEBKIT2_DEBUG") == "1") {
-        fprintf(stderr, "Pausing web process, please attach to PID %d and continue... ", getpid());
+        struct sigaction newAction, oldAction;
+        newAction.sa_handler = sigcontHandler;
+        sigemptyset(&newAction.sa_mask);
+        newAction.sa_flags = 0;
+        sigaction(SIGCONT, &newAction, &oldAction);
+        fprintf(stderr, "Pausing UI process, please attach to PID %d and send signal SIGCONT... ", getpid());
         pause();
+        sigaction(SIGCONT, &oldAction, 0);
         fprintf(stderr, " OK\n");
     }

trunk/Tools/ChangeLog

@@ +1 @@
+2012-05-07  Alexis Menard  <alexis.menard@openbossa.org>
+
+        [Qt] Unbreak debugging of WebKit2.
+        https://bugs.webkit.org/show_bug.cgi?id=85839
+
+        Reviewed by Simon Hausmann.
+
+        When you attach GDB to a running process, it stops it.
+        http://trac.webkit.org/changeset/115958 introduced a pause() 
+        call to wait the debugger to be attached to then continue 
+        the execution of the WebProcess. Unfortunately the pause()
+        function does not return unless a signal handler is called.
+        This patch introduce an event handler to exit from the paused
+        state when the debugger send the signal SIGCONT. The old code
+        works with older version of GDB (<7.0) but not with newer
+        versions where the behavior of pause() is correct.
+
+        * WebKitTestRunner/qt/main.cpp:
+        (sigcontHandler):
+        (main):
+
 2012-05-08  Christophe Dumez  <christophe.dumez@intel.com>
 

trunk/Tools/WebKitTestRunner/qt/main.cpp

@@ -32 +32 @@
 #include <stdio.h>
 #if !defined(NDEBUG) && defined(Q_OS_UNIX)
+#include <signal.h>
 #include <unistd.h>
 #endif
@@ -67 +68 @@
 };
 
+#if !defined(NDEBUG) && defined(Q_OS_UNIX)
+static void sigcontHandler(int)
+{
+}
+#endif
+
 void messageHandler(QtMsgType type, const char* message)
 {
@@ -81 +88 @@
 #if !defined(NDEBUG) && defined(Q_OS_UNIX)
     if (qgetenv("QT_WEBKIT_PAUSE_UI_PROCESS") == "1") {
-        fprintf(stderr, "Pausing UI process, please attach to PID %d and continue... ", getpid());
+        struct sigaction newAction, oldAction;
+        newAction.sa_handler = sigcontHandler;
+        sigemptyset(&newAction.sa_mask);
+        newAction.sa_flags = 0;
+        sigaction(SIGCONT, &newAction, &oldAction);
+        fprintf(stderr, "Pausing UI process, please attach to PID %d and send signal SIGCONT... ", getpid());
         pause();
+        sigaction(SIGCONT, &oldAction, 0);
         fprintf(stderr, " OK\n");
     }