Changeset 230624 in webkit

Timestamp:

Apr 13, 2018 12:26:59 AM (6 years ago)

Author:

Carlos Garcia Campos

Message:

[GLIB] Tests WTF_RefPtr.ReleaseInNonMainThread and WTF_RefPtr.ReleaseInNonMainThreadDestroyInMainThread are crashing since they were added
​https://bugs.webkit.org/show_bug.cgi?id=184531

Reviewed by Michael Catanzaro.

It's not a bug in WebKit, but in the tests. The problem is that those tests are using RunLoop::main() but main
run loop hasn't been initialized. ReleaseInNonMainThread doesn't really need to initialize the main run loop if
we change Util::run() to always use RunLop::current() instead of RunLoop::main(). But
ReleaseInNonMainThreadDestroyInMainThread ends up scheduling a task to the main thread, and the generic
implementation fo that uses RunLoop::main(), so we need to initialize the main loop in this case.

• TestWebKitAPI/Tests/WTF/RefPtr.cpp:

(TestWebKitAPI::TEST): Call RunLoop::initializeMainRunLoop().

• TestWebKitAPI/glib/UtilitiesGLib.cpp:

(TestWebKitAPI::Util::run): Use RunLop::current() to stop the current run loop.
(TestWebKitAPI::Util::sleep): Ditto.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WTF/RefPtr.cpp (modified) (2 diffs)
• TestWebKitAPI/glib/UtilitiesGLib.cpp (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-04-13  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GLIB] Tests WTF_RefPtr.ReleaseInNonMainThread and WTF_RefPtr.ReleaseInNonMainThreadDestroyInMainThread are crashing since they were added
+        https://bugs.webkit.org/show_bug.cgi?id=184531
+
+        Reviewed by Michael Catanzaro.
+
+        It's not a bug in WebKit, but in the tests. The problem is that those tests are using RunLoop::main() but main
+        run loop hasn't been initialized. ReleaseInNonMainThread doesn't really need to initialize the main run loop if
+        we change Util::run() to always use RunLop::current() instead of RunLoop::main(). But
+        ReleaseInNonMainThreadDestroyInMainThread ends up scheduling a task to the main thread, and the generic
+        implementation fo that uses RunLoop::main(), so we need to initialize the main loop in this case.
+
+        * TestWebKitAPI/Tests/WTF/RefPtr.cpp:
+        (TestWebKitAPI::TEST): Call RunLoop::initializeMainRunLoop().
+        * TestWebKitAPI/glib/UtilitiesGLib.cpp:
+        (TestWebKitAPI::Util::run): Use RunLop::current() to stop the current run loop.
+        (TestWebKitAPI::Util::sleep): Ditto.
+
 2018-04-12  Zalan Bujtas  <zalan@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WTF/RefPtr.cpp

@@ -34 +34 @@
 #include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
+#include <wtf/RunLoop.h>
 #include <wtf/ThreadSafeRefCounted.h>
 #include <wtf/Threading.h>
@@ -578 +579 @@
 TEST(WTF_RefPtr, ReleaseInNonMainThreadDestroyInMainThread)
 {
+    RunLoop::initializeMainRunLoop();
     done = false;
     Thread::create("", [object = MainThreadSafeRefCountedObject::create()] { });

trunk/Tools/TestWebKitAPI/glib/UtilitiesGLib.cpp

@@ -38 +38 @@
         bool* done = static_cast<bool*>(userData);
         if (*done)
-            RunLoop::main().stop();
+            RunLoop::current().stop();
 
         return !*done;
@@ -59 +59 @@
         return G_SOURCE_REMOVE;
     }, nullptr);
-    RunLoop::main().stop();
+    RunLoop::current().stop();
 }