Changeset 122542 in webkit

Timestamp:

Jul 12, 2012 10:39:31 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[WK2][EFL] Facilitate debugging of the Web Process
​https://bugs.webkit.org/show_bug.cgi?id=90768

Patch by Christophe Dumez <Christophe Dumez> on 2012-07-12
Reviewed by Kenneth Rohde Christiansen.

Source/WebKit2:

The EFL port now checks if the WEB_PROCESS_CMD_PREFIX
environment variable is set and uses it as prefix
when spawning the Web process if it is. This is used
for debugging purposes with prefixes such as:
"xterm -title renderer -e gdb --args".

• UIProcess/Launcher/ProcessLauncher.h:

(LaunchOptions):

• UIProcess/Launcher/efl/ProcessLauncherEfl.cpp:

(WebKit::ProcessLauncher::launchProcess):

• UIProcess/WebProcessProxy.cpp:

(WebKit::WebProcessProxy::connect):

Tools:

Add a new --webprocess-cmd-prefix argument to
run-webkit-tests script for EFL port. If provided,
the prefix will be prepended to the command used
to spawn the Web process. This can be used for
debugging purposes with prefixes such as:
"xterm -title renderer -e gdb --args".

• Scripts/webkitpy/layout_tests/port/efl.py:

(EflPort.init):
(EflPort.setup_environ_for_server):

• Scripts/webkitpy/layout_tests/run_webkit_tests.py:

(parse_args):

• WebKitTestRunner/efl/TestControllerEfl.cpp:

(WTR::TestController::platformRunUntil): Implement support for
m_noTimeout timeout value.

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h (modified) (2 diffs)
• Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp (modified) (1 diff)
• Source/WebKit2/UIProcess/WebProcessProxy.cpp (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/webkitpy/layout_tests/port/efl.py (modified) (2 diffs)
• Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py (modified) (1 diff)
• Tools/WebKitTestRunner/efl/TestControllerEfl.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-07-12  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [WK2][EFL] Facilitate debugging of the Web Process
+        https://bugs.webkit.org/show_bug.cgi?id=90768
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        The EFL port now checks if the WEB_PROCESS_CMD_PREFIX
+        environment variable is set and uses it as prefix
+        when spawning the Web process if it is. This is used
+        for debugging purposes with prefixes such as:
+        "xterm -title renderer -e gdb --args".
+
+        * UIProcess/Launcher/ProcessLauncher.h:
+        (LaunchOptions):
+        * UIProcess/Launcher/efl/ProcessLauncherEfl.cpp:
+        (WebKit::ProcessLauncher::launchProcess):
+        * UIProcess/WebProcessProxy.cpp:
+        (WebKit::WebProcessProxy::connect):
+
 2012-07-12  Timothy Hatcher  <timothy@apple.com>
 

trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.h

@@ -32 +32 @@
 #include <wtf/Threading.h>
 
+#ifndef NDEBUG
+#include <wtf/text/WTFString.h>
+#endif
+
 namespace WebKit {
 
@@ -54 +58 @@
         cpu_type_t architecture;
         bool executableHeap;
+#endif
+#ifndef NDEBUG
+        String processCmdPrefix;
 #endif
     };

trunk/Source/WebKit2/UIProcess/Launcher/efl/ProcessLauncherEfl.cpp

@@ -71 +71 @@
         }
         String fullPath = executablePath + "/" + processName;
-        execl(fullPath.utf8().data(), processName.utf8().data(), socket.utf8().data(), static_cast<char*>(0));
+#ifndef NDEBUG
+        if (m_launchOptions.processCmdPrefix.isEmpty())
+#endif
+            execl(fullPath.utf8().data(), processName.utf8().data(), socket.utf8().data(), static_cast<char*>(0));
+#ifndef NDEBUG
+        else {
+            String cmd = makeString(m_launchOptions.processCmdPrefix, ' ', fullPath, ' ', socket);
+            if (system(cmd.utf8().data()) == -1) {
+                ASSERT_NOT_REACHED();
+                return;
+            }
+        }
+#endif
     } else if (pid > 0) { // parent process;
         close(sockets[0]);

trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp

@@ -111 +111 @@
         launchOptions.executableHeap = false;
 #endif
+#ifndef NDEBUG
+        const char* webProcessCmdPrefix = getenv("WEB_PROCESS_CMD_PREFIX");
+        if (webProcessCmdPrefix && *webProcessCmdPrefix)
+            launchOptions.processCmdPrefix = String::fromUTF8(webProcessCmdPrefix);
+#endif
         m_processLauncher = ProcessLauncher::create(this, launchOptions);
     }

trunk/Tools/ChangeLog

@@ +1 @@
+2012-07-12  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [WK2][EFL] Facilitate debugging of the Web Process
+        https://bugs.webkit.org/show_bug.cgi?id=90768
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Add a new --webprocess-cmd-prefix argument to
+        run-webkit-tests script for EFL port. If provided,
+        the prefix will be prepended to the command used
+        to spawn the Web process. This can be used for
+        debugging purposes with prefixes such as:
+        "xterm -title renderer -e gdb --args".
+
+        * Scripts/webkitpy/layout_tests/port/efl.py:
+        (EflPort.__init__):
+        (EflPort.setup_environ_for_server):
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+        (parse_args):
+        * WebKitTestRunner/efl/TestControllerEfl.cpp:
+        (WTR::TestController::platformRunUntil): Implement support for
+        m_noTimeout timeout value.
+
 2012-07-12  Adam Barth  <abarth@webkit.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/port/efl.py

@@ -46 +46 @@
 
         self.set_option_default('wrapper', self._jhbuild_wrapper_path)
+        self.webprocess_cmd_prefix = self.get_option('webprocess_cmd_prefix')
 
     def _port_flag_for_scripts(self):
@@ -57 +58 @@
         env['TEST_RUNNER_INJECTED_BUNDLE_FILENAME'] = self._build_path('lib', 'libTestRunnerInjectedBundle.so')
         env['TEST_RUNNER_PLUGIN_PATH'] = self._build_path('lib')
+        if self.webprocess_cmd_prefix:
+            env['WEB_PROCESS_CMD_PREFIX'] = self.webprocess_cmd_prefix
         return env
 

trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py

@@ -253 +253 @@
         optparse.make_option("--adb-args", type="string",
             help="Arguments parsed to Android adb, to select device, etc."),
+    ]))
+
+    option_group_definitions.append(("EFL-specific Options", [
+        optparse.make_option("--webprocess-cmd-prefix", type="string",
+            default=False, help="Prefix used when spawning the Web process (Debug mode only)"),
     ]))
 

trunk/Tools/WebKitTestRunner/efl/TestControllerEfl.cpp

@@ -52 +52 @@
 }
 
-void TestController::platformRunUntil(bool&, double timeout)
+void TestController::platformRunUntil(bool& condition, double timeout)
 {
+    if (timeout == m_noTimeout) {
+        // Never timeout if we are debugging or not meant to timeout.
+        while (!condition) {
+            ecore_main_loop_iterate();
+            sleep(1);
+        }
+        return;
+    }
     timer = ecore_timer_loop_add(timeout, timerFired, 0);
     ecore_main_loop_begin();