Attachment 357737 Details for Bug 192855 – Patch for landing

[patch] Patch for landing

bug-192855-20181220012320.patch (text/plain), 4.66 KB, created by Adrian Perez on 2018-12-19 15:23:21 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Adrian Perez

Created: 2018-12-19 15:23:21 PST

Size: 4.66 KB

patch

obsolete

>Subversion Revision: 239396
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 29fb744c6d9cea64afaac21ff95a910e33bd7f4f..33d46aa1e48d407d0b7c44689d94d4877eb30667 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-12-19  Adrian Perez de Castro  <aperez@igalia.com>
>+
>+        [GTK][WPE] Unify TestController::platformRunUntil() and honor condition flag
>+        https://bugs.webkit.org/show_bug.cgi?id=192855
>+
>+        Reviewed by Michael Catanzaro.
>+
>+        * WebKitTestRunner/gtk/TestControllerGtk.cpp:
>+        (WTR::TestController::notifyDone): Use the WPE implementation.
>+        (WTR::TestController::platformRunUntil): Use the WPE implementation.
>+        * WebKitTestRunner/wpe/TestControllerWPE.cpp:
>+        (WTR::TestController::platformRunUntil): Honor the condition flag.
>+
> 2018-12-19  Megan Gardner  <megan_gardner@apple.com>
> 
>         Allow clients to set the navigator platform
>diff --git a/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp b/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp
>index 4f2e8c43a53b0fd98103152990254bd4ee68c352..aa33d3996f7f9a146e56105e94030d54164d10fe 100644
>--- a/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp
>+++ b/Tools/WebKitTestRunner/gtk/TestControllerGtk.cpp
>@@ -37,27 +37,8 @@
> 
> namespace WTR {
> 
>-static GSource* timeoutSource()
>-{
>-    static GRefPtr<GSource> source = nullptr;
>-    if (!source) {
>-        source = adoptGRef(g_timeout_source_new(0));
>-        g_source_set_ready_time(source.get(), -1);
>-        g_source_set_name(source.get(), "[WTR] Test timeout source");
>-        g_source_set_callback(source.get(), [](gpointer userData) -> gboolean {
>-            g_source_set_ready_time(static_cast<GSource*>(userData), -1);
>-            fprintf(stderr, "FAIL: TestControllerRunLoop timed out.\n");
>-            RunLoop::main().stop();
>-            return G_SOURCE_REMOVE;
>-        }, source.get(), nullptr);
>-        g_source_attach(source.get(), nullptr);
>-    }
>-    return source.get();
>-}
>-
> void TestController::notifyDone()
> {
>-    g_source_set_ready_time(timeoutSource(), -1);
>     RunLoop::main().stop();
> }
> 
>@@ -74,17 +55,31 @@ void TestController::platformDestroy()
> {
> }
> 
>-void TestController::platformRunUntil(bool&, WTF::Seconds timeout)
>+void TestController::platformRunUntil(bool& done, WTF::Seconds timeout)
> {
>-    if (timeout > 0_s) {
>-        // FIXME: This conversion is now repeated in several places, it should be moved to a common place in WTF and used everywhere.
>-        gint64 currentTime = g_get_monotonic_time();
>-        gint64 targetTime = currentTime + std::min<gint64>(G_MAXINT64 - currentTime, timeout.microsecondsAs<int64_t>());
>-        ASSERT(targetTime >= currentTime);
>-        g_source_set_ready_time(timeoutSource(), targetTime);
>-    } else
>-        g_source_set_ready_time(timeoutSource(), -1);
>-    RunLoop::main().run();
>+    struct TimeoutTimer {
>+        TimeoutTimer()
>+            : timer(RunLoop::main(), this, &TimeoutTimer::fired)
>+        { }
>+
>+        void fired()
>+        {
>+            timedOut = true;
>+            RunLoop::main().stop();
>+        }
>+
>+        RunLoop::Timer<TimeoutTimer> timer;
>+        bool timedOut { false };
>+    } timeoutTimer;
>+
>+    timeoutTimer.timer.setPriority(G_PRIORITY_DEFAULT_IDLE);
>+    if (timeout >= 0_s)
>+        timeoutTimer.timer.startOneShot(timeout);
>+
>+    while (!done && !timeoutTimer.timedOut)
>+        RunLoop::main().run();
>+
>+    timeoutTimer.timer.stop();
> }
> 
> static char* getEnvironmentVariableAsUTF8String(const char* variableName)
>diff --git a/Tools/WebKitTestRunner/wpe/TestControllerWPE.cpp b/Tools/WebKitTestRunner/wpe/TestControllerWPE.cpp
>index fe30d3de8552575a86fee6a4587b45354b18ed5c..cb2a99ec9c81c5a5ad3bddc0fed2a4467ae839f5 100644
>--- a/Tools/WebKitTestRunner/wpe/TestControllerWPE.cpp
>+++ b/Tools/WebKitTestRunner/wpe/TestControllerWPE.cpp
>@@ -58,22 +58,29 @@ void TestController::platformInitializeContext()
> {
> }
> 
>-void TestController::platformRunUntil(bool& condition, WTF::Seconds timeout)
>+void TestController::platformRunUntil(bool& done, WTF::Seconds timeout)
> {
>     struct TimeoutTimer {
>         TimeoutTimer()
>             : timer(RunLoop::main(), this, &TimeoutTimer::fired)
>         { }
> 
>-        void fired() { RunLoop::main().stop(); }
>+        void fired()
>+        {
>+            timedOut = true;
>+            RunLoop::main().stop();
>+        }
>+
>         RunLoop::Timer<TimeoutTimer> timer;
>+        bool timedOut { false };
>     } timeoutTimer;
> 
>     timeoutTimer.timer.setPriority(G_PRIORITY_DEFAULT_IDLE);
>     if (timeout >= 0_s)
>         timeoutTimer.timer.startOneShot(timeout);
> 
>-    RunLoop::main().run();
>+    while (!done && !timeoutTimer.timedOut)
>+        RunLoop::main().run();
> 
>     timeoutTimer.timer.stop();
> }

Actions: View | Formatted Diff | Diff

Attachments on bug 192855: 357683 | 357712 | 357737