Title: [184703] trunk
Revision
184703
Author
[email protected]
Date
2015-05-20 22:55:21 -0700 (Wed, 20 May 2015)

Log Message

[GTK] Move MainThreadGtk, RunLoopGtk, WorkQueueGtk under Source/WTF/wtf/glib/
https://bugs.webkit.org/show_bug.cgi?id=145117

Reviewed by Csaba Osztrogonác.

Source/WTF:

Move the MainThreadGtk, RunLoopGtk and WorkQueueGtk implementation files from
Source/WTF/wtf/gtk/ to Source/WTF/wtf/glib/. These implementations are not
GTK-specific and only depend on GLib, so they are renamed as well.

There are other such implementations under Source/WTF/wtf/gobject/ (GObject
is just a subset of GLib) that will be moved under the new directory in
future patches.

* wtf/PlatformGTK.cmake:
* wtf/glib/MainThreadGLib.cpp: Renamed from Source/WTF/wtf/gtk/MainThreadGtk.cpp.
(WTF::initializeMainThreadPlatform):
(WTF::scheduleDispatchFunctionsOnMainThread):
* wtf/glib/RunLoopGLib.cpp: Renamed from Source/WTF/wtf/gtk/RunLoopGtk.cpp.
(WTF::RunLoop::RunLoop):
(WTF::RunLoop::~RunLoop):
(WTF::RunLoop::run):
(WTF::RunLoop::stop):
(WTF::RunLoop::wakeUp):
(WTF::RunLoop::TimerBase::TimerBase):
(WTF::RunLoop::TimerBase::~TimerBase):
(WTF::RunLoop::TimerBase::start):
(WTF::RunLoop::TimerBase::stop):
(WTF::RunLoop::TimerBase::isActive):
* wtf/glib/WorkQueueGLib.cpp: Renamed from Source/WTF/wtf/gtk/WorkQueueGtk.cpp.
(WTF::WorkQueue::platformInitialize):
(WTF::WorkQueue::platformInvalidate):
(WTF::WorkQueue::registerSocketEventHandler):
(WTF::WorkQueue::unregisterSocketEventHandler):
(WTF::WorkQueue::dispatch):
(WTF::WorkQueue::dispatchAfter):

Tools:

Rename the WorkQueueGtk.cpp file to WorkQueueGLib.cpp, and move it under
Tools/TestWebKitAPI/Tests/WTF/glib/.

* TestWebKitAPI/PlatformGTK.cmake:
* TestWebKitAPI/Tests/WTF/glib/WorkQueueGLib.cpp: Renamed from Tools/TestWebKitAPI/Tests/WTF/gtk/WorkQueueGtk.cpp.
(TestWebKitAPI::TEST):

Modified Paths

Added Paths

Removed Paths

  • trunk/Source/WTF/wtf/gtk/
  • trunk/Tools/TestWebKitAPI/Tests/WTF/gtk/

Diff

Modified: trunk/Source/WTF/ChangeLog (184702 => 184703)


--- trunk/Source/WTF/ChangeLog	2015-05-21 05:52:18 UTC (rev 184702)
+++ trunk/Source/WTF/ChangeLog	2015-05-21 05:55:21 UTC (rev 184703)
@@ -1,3 +1,41 @@
+2015-05-20  Zan Dobersek  <[email protected]>
+
+        [GTK] Move MainThreadGtk, RunLoopGtk, WorkQueueGtk under Source/WTF/wtf/glib/
+        https://bugs.webkit.org/show_bug.cgi?id=145117
+
+        Reviewed by Csaba Osztrogonác.
+
+        Move the MainThreadGtk, RunLoopGtk and WorkQueueGtk implementation files from
+        Source/WTF/wtf/gtk/ to Source/WTF/wtf/glib/. These implementations are not
+        GTK-specific and only depend on GLib, so they are renamed as well.
+
+        There are other such implementations under Source/WTF/wtf/gobject/ (GObject
+        is just a subset of GLib) that will be moved under the new directory in
+        future patches.
+
+        * wtf/PlatformGTK.cmake:
+        * wtf/glib/MainThreadGLib.cpp: Renamed from Source/WTF/wtf/gtk/MainThreadGtk.cpp.
+        (WTF::initializeMainThreadPlatform):
+        (WTF::scheduleDispatchFunctionsOnMainThread):
+        * wtf/glib/RunLoopGLib.cpp: Renamed from Source/WTF/wtf/gtk/RunLoopGtk.cpp.
+        (WTF::RunLoop::RunLoop):
+        (WTF::RunLoop::~RunLoop):
+        (WTF::RunLoop::run):
+        (WTF::RunLoop::stop):
+        (WTF::RunLoop::wakeUp):
+        (WTF::RunLoop::TimerBase::TimerBase):
+        (WTF::RunLoop::TimerBase::~TimerBase):
+        (WTF::RunLoop::TimerBase::start):
+        (WTF::RunLoop::TimerBase::stop):
+        (WTF::RunLoop::TimerBase::isActive):
+        * wtf/glib/WorkQueueGLib.cpp: Renamed from Source/WTF/wtf/gtk/WorkQueueGtk.cpp.
+        (WTF::WorkQueue::platformInitialize):
+        (WTF::WorkQueue::platformInvalidate):
+        (WTF::WorkQueue::registerSocketEventHandler):
+        (WTF::WorkQueue::unregisterSocketEventHandler):
+        (WTF::WorkQueue::dispatch):
+        (WTF::WorkQueue::dispatchAfter):
+
 2015-05-19  Andreas Kling  <[email protected]>
 
         Give StringView a utf8() API.

Modified: trunk/Source/WTF/wtf/PlatformGTK.cmake (184702 => 184703)


--- trunk/Source/WTF/wtf/PlatformGTK.cmake	2015-05-21 05:52:18 UTC (rev 184702)
+++ trunk/Source/WTF/wtf/PlatformGTK.cmake	2015-05-21 05:55:21 UTC (rev 184703)
@@ -2,14 +2,14 @@
 set(WTF_OUTPUT_NAME WTFGTK)
 
 list(APPEND WTF_SOURCES
+    glib/MainThreadGLib.cpp
+    glib/RunLoopGLib.cpp
+    glib/WorkQueueGLib.cpp
+
     gobject/GMainLoopSource.cpp
     gobject/GRefPtr.cpp
     gobject/GThreadSafeMainLoopSource.cpp
     gobject/GlibUtilities.cpp
-
-    gtk/MainThreadGtk.cpp
-    gtk/RunLoopGtk.cpp
-    gtk/WorkQueueGtk.cpp
 )
 
 list(APPEND WTF_LIBRARIES

Added: trunk/Source/WTF/wtf/glib/MainThreadGLib.cpp (0 => 184703)


--- trunk/Source/WTF/wtf/glib/MainThreadGLib.cpp	                        (rev 0)
+++ trunk/Source/WTF/wtf/glib/MainThreadGLib.cpp	2015-05-21 05:55:21 UTC (rev 184703)
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2007 Justin Haygood ([email protected])
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
+ *     its contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "MainThread.h"
+
+#include <wtf/gobject/GMainLoopSource.h>
+
+namespace WTF {
+
+void initializeMainThreadPlatform()
+{
+}
+
+void scheduleDispatchFunctionsOnMainThread()
+{
+    GMainLoopSource::scheduleAndDeleteOnDestroy("[WebKit] dispatchFunctionsFromMainThread", std::function<void()>(dispatchFunctionsFromMainThread));
+}
+
+} // namespace WTF

Added: trunk/Source/WTF/wtf/glib/RunLoopGLib.cpp (0 => 184703)


--- trunk/Source/WTF/wtf/glib/RunLoopGLib.cpp	                        (rev 0)
+++ trunk/Source/WTF/wtf/glib/RunLoopGLib.cpp	2015-05-21 05:55:21 UTC (rev 184703)
@@ -0,0 +1,127 @@
+/*
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Portions Copyright (c) 2010 Motorola Mobility, Inc.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "RunLoop.h"
+
+#include <glib.h>
+#include <wtf/MainThread.h>
+
+namespace WTF {
+
+RunLoop::RunLoop()
+{
+    m_mainContext = g_main_context_get_thread_default();
+    if (!m_mainContext)
+        m_mainContext = isMainThread() ? g_main_context_default() : adoptGRef(g_main_context_new());
+    ASSERT(m_mainContext);
+
+    GRefPtr<GMainLoop> innermostLoop = adoptGRef(g_main_loop_new(m_mainContext.get(), FALSE));
+    ASSERT(innermostLoop);
+    m_mainLoops.append(innermostLoop);
+}
+
+RunLoop::~RunLoop()
+{
+    for (int i = m_mainLoops.size() - 1; i >= 0; --i) {
+        if (!g_main_loop_is_running(m_mainLoops[i].get()))
+            continue;
+        g_main_loop_quit(m_mainLoops[i].get());
+    }
+}
+
+void RunLoop::run()
+{
+    RunLoop& runLoop = RunLoop::current();
+    GMainContext* mainContext = runLoop.m_mainContext.get();
+
+    // The innermost main loop should always be there.
+    ASSERT(!runLoop.m_mainLoops.isEmpty());
+
+    GMainLoop* innermostLoop = runLoop.m_mainLoops[0].get();
+    if (!g_main_loop_is_running(innermostLoop)) {
+        g_main_context_push_thread_default(mainContext);
+        g_main_loop_run(innermostLoop);
+        g_main_context_pop_thread_default(mainContext);
+        return;
+    }
+
+    // Create and run a nested loop if the innermost one was already running.
+    GMainLoop* nestedMainLoop = g_main_loop_new(mainContext, FALSE);
+    runLoop.m_mainLoops.append(adoptGRef(nestedMainLoop));
+
+    g_main_context_push_thread_default(mainContext);
+    g_main_loop_run(nestedMainLoop);
+    g_main_context_pop_thread_default(mainContext);
+
+    runLoop.m_mainLoops.removeLast();
+}
+
+void RunLoop::stop()
+{
+    // The innermost main loop should always be there.
+    ASSERT(!m_mainLoops.isEmpty());
+    GRefPtr<GMainLoop> lastMainLoop = m_mainLoops.last();
+    if (g_main_loop_is_running(lastMainLoop.get()))
+        g_main_loop_quit(lastMainLoop.get());
+}
+
+void RunLoop::wakeUp()
+{
+    RefPtr<RunLoop> runLoop(this);
+    GMainLoopSource::scheduleAndDeleteOnDestroy("[WebKit] RunLoop work", std::function<void()>([runLoop] {
+        runLoop->performWork();
+    }), G_PRIORITY_DEFAULT, nullptr, m_mainContext.get());
+    g_main_context_wakeup(m_mainContext.get());
+}
+
+RunLoop::TimerBase::TimerBase(RunLoop& runLoop)
+    : m_runLoop(runLoop)
+{
+}
+
+RunLoop::TimerBase::~TimerBase()
+{
+    stop();
+}
+
+void RunLoop::TimerBase::start(double fireInterval, bool repeat)
+{
+    m_timerSource.scheduleAfterDelay("[WebKit] RunLoop::Timer", std::function<bool ()>([this, repeat] { fired(); return repeat; }),
+        std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::duration<double>(fireInterval)), G_PRIORITY_DEFAULT, nullptr, m_runLoop.m_mainContext.get());
+}
+
+void RunLoop::TimerBase::stop()
+{
+    m_timerSource.cancel();
+}
+
+bool RunLoop::TimerBase::isActive() const
+{
+    return m_timerSource.isScheduled();
+}
+
+} // namespace WTF

Added: trunk/Source/WTF/wtf/glib/WorkQueueGLib.cpp (0 => 184703)


--- trunk/Source/WTF/wtf/glib/WorkQueueGLib.cpp	                        (rev 0)
+++ trunk/Source/WTF/wtf/glib/WorkQueueGLib.cpp	2015-05-21 05:55:21 UTC (rev 184703)
@@ -0,0 +1,128 @@
+/*
+ * Copyright (C) 2011 Igalia S.L.
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Portions Copyright (c) 2010 Motorola Mobility, Inc.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "WorkQueue.h"
+
+#include <gio/gio.h>
+#include <string.h>
+
+namespace WTF {
+
+static const size_t kVisualStudioThreadNameLimit = 31;
+
+void WorkQueue::platformInitialize(const char* name, Type, QOS)
+{
+    m_eventContext = adoptGRef(g_main_context_new());
+    ASSERT(m_eventContext);
+    m_eventLoop = adoptGRef(g_main_loop_new(m_eventContext.get(), FALSE));
+    ASSERT(m_eventLoop);
+
+    // This name can be com.apple.WebKit.ProcessLauncher or com.apple.CoreIPC.ReceiveQueue.
+    // We are using those names for the thread name, but both are longer than 31 characters,
+    // which is the limit of Visual Studio for thread names.
+    // When log is enabled createThread() will assert instead of truncate the name, so we need
+    // to make sure we don't use a name longer than 31 characters.
+    const char* threadName = g_strrstr(name, ".");
+    if (threadName)
+        threadName++;
+    else
+        threadName = name;
+    if (strlen(threadName) > kVisualStudioThreadNameLimit)
+        threadName += strlen(threadName) - kVisualStudioThreadNameLimit;
+
+    GRefPtr<GMainLoop> eventLoop(m_eventLoop.get());
+    m_workQueueThread = createThread(threadName, [eventLoop] {
+        g_main_context_push_thread_default(g_main_loop_get_context(eventLoop.get()));
+        g_main_loop_run(eventLoop.get());
+    });
+}
+
+void WorkQueue::platformInvalidate()
+{
+    if (m_workQueueThread) {
+        detachThread(m_workQueueThread);
+        m_workQueueThread = 0;
+    }
+
+    if (m_eventLoop) {
+        if (g_main_loop_is_running(m_eventLoop.get()))
+            g_main_loop_quit(m_eventLoop.get());
+        else {
+            // The thread hasn't started yet, so schedule a main loop quit to ensure the thread finishes.
+            GMainLoop* eventLoop = m_eventLoop.get();
+            GMainLoopSource::scheduleAndDeleteOnDestroy("[WebKit] WorkQueue quit main loop", [eventLoop] { g_main_loop_quit(eventLoop); },
+                G_PRIORITY_HIGH, nullptr, m_eventContext.get());
+        }
+        m_eventLoop = nullptr;
+    }
+
+    m_eventContext = nullptr;
+}
+
+void WorkQueue::registerSocketEventHandler(int fileDescriptor, std::function<void ()> function, std::function<void ()> closeFunction)
+{
+    GRefPtr<GSocket> socket = adoptGRef(g_socket_new_from_fd(fileDescriptor, 0));
+    ref();
+    m_socketEventSource.schedule("[WebKit] WorkQueue::SocketEventHandler", [function, closeFunction](GIOCondition condition) {
+            if (condition & G_IO_HUP || condition & G_IO_ERR || condition & G_IO_NVAL) {
+                closeFunction();
+                return GMainLoopSource::Stop;
+            }
+
+            if (condition & G_IO_IN) {
+                function();
+                return GMainLoopSource::Continue;
+            }
+
+            ASSERT_NOT_REACHED();
+            return GMainLoopSource::Stop;
+        }, socket.get(), G_IO_IN,
+        [this] { deref(); },
+        m_eventContext.get());
+}
+
+void WorkQueue::unregisterSocketEventHandler(int)
+{
+    m_socketEventSource.cancel();
+}
+
+void WorkQueue::dispatch(std::function<void ()> function)
+{
+    ref();
+    GMainLoopSource::scheduleAndDeleteOnDestroy("[WebKit] WorkQueue::dispatch", WTF::move(function), G_PRIORITY_DEFAULT,
+        [this] { deref(); }, m_eventContext.get());
+}
+
+void WorkQueue::dispatchAfter(std::chrono::nanoseconds duration, std::function<void ()> function)
+{
+    ref();
+    GMainLoopSource::scheduleAfterDelayAndDeleteOnDestroy("[WebKit] WorkQueue::dispatchAfter", WTF::move(function),
+        std::chrono::duration_cast<std::chrono::milliseconds>(duration), G_PRIORITY_DEFAULT, [this] { deref(); }, m_eventContext.get());
+}
+
+}

Modified: trunk/Tools/ChangeLog (184702 => 184703)


--- trunk/Tools/ChangeLog	2015-05-21 05:52:18 UTC (rev 184702)
+++ trunk/Tools/ChangeLog	2015-05-21 05:55:21 UTC (rev 184703)
@@ -1,3 +1,17 @@
+2015-05-20  Zan Dobersek  <[email protected]>
+
+        [GTK] Move MainThreadGtk, RunLoopGtk, WorkQueueGtk under Source/WTF/wtf/glib/
+        https://bugs.webkit.org/show_bug.cgi?id=145117
+
+        Reviewed by Csaba Osztrogonác.
+
+        Rename the WorkQueueGtk.cpp file to WorkQueueGLib.cpp, and move it under
+        Tools/TestWebKitAPI/Tests/WTF/glib/.
+
+        * TestWebKitAPI/PlatformGTK.cmake:
+        * TestWebKitAPI/Tests/WTF/glib/WorkQueueGLib.cpp: Renamed from Tools/TestWebKitAPI/Tests/WTF/gtk/WorkQueueGtk.cpp.
+        (TestWebKitAPI::TEST):
+
 2015-05-20  KwangHyuk Kim  <[email protected]>
 
         [EFL] fix efreet error

Modified: trunk/Tools/TestWebKitAPI/PlatformGTK.cmake (184702 => 184703)


--- trunk/Tools/TestWebKitAPI/PlatformGTK.cmake	2015-05-21 05:52:18 UTC (rev 184702)
+++ trunk/Tools/TestWebKitAPI/PlatformGTK.cmake	2015-05-21 05:55:21 UTC (rev 184703)
@@ -135,7 +135,7 @@
 set_target_properties(TestWebCore PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}/WebCore)
 
 list(APPEND TestWTF_SOURCES
+    ${TESTWEBKITAPI_DIR}/Tests/WTF/glib/WorkQueueGLib.cpp
     ${TESTWEBKITAPI_DIR}/Tests/WTF/gobject/GMainLoopSource.cpp
     ${TESTWEBKITAPI_DIR}/Tests/WTF/gobject/GUniquePtr.cpp
-    ${TESTWEBKITAPI_DIR}/Tests/WTF/gtk/WorkQueueGtk.cpp
 )

Added: trunk/Tools/TestWebKitAPI/Tests/WTF/glib/WorkQueueGLib.cpp (0 => 184703)


--- trunk/Tools/TestWebKitAPI/Tests/WTF/glib/WorkQueueGLib.cpp	                        (rev 0)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/glib/WorkQueueGLib.cpp	2015-05-21 05:55:21 UTC (rev 184703)
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2015 Igalia S.L.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#include "Test.h"
+#include <gio/gio.h>
+#include <thread>
+#include <wtf/WorkQueue.h>
+#include <wtf/gobject/GRefPtr.h>
+#include <wtf/gobject/GUniquePtr.h>
+
+namespace TestWebKitAPI {
+
+TEST(WTF_WorkQueue, AsyncIO)
+{
+    struct TestingContext {
+        Mutex m_lock;
+        ThreadCondition m_testCompleted;
+        GMainContext* m_mainContext;
+    } context;
+
+    auto queue = WorkQueue::create("com.apple.WebKit.Test.AsyncIO");
+    context.m_mainContext = g_main_context_default();
+    EXPECT_FALSE(g_main_context_get_thread_default());
+
+    GUniquePtr<char> currentDirectory(g_get_current_dir());
+    GRefPtr<GFile> file = adoptGRef(g_file_new_for_path(currentDirectory.get()));
+
+    MutexLocker locker(context.m_lock);
+    queue->dispatch([&](void) {
+        EXPECT_TRUE(g_main_context_get_thread_default());
+        EXPECT_TRUE(g_main_context_get_thread_default() != context.m_mainContext);
+        context.m_mainContext = g_main_context_get_thread_default();
+        g_file_query_info_async(file.get(), G_FILE_ATTRIBUTE_STANDARD_SIZE, G_FILE_QUERY_INFO_NONE, G_PRIORITY_DEFAULT, nullptr,
+            [](GObject*, GAsyncResult*, gpointer userData) {
+                TestingContext* context = static_cast<TestingContext*>(userData);
+                MutexLocker locker(context->m_lock);
+                EXPECT_EQ(g_main_context_get_thread_default(), context->m_mainContext);
+                context->m_testCompleted.signal();
+            }, &context);
+    });
+
+    context.m_testCompleted.wait(context.m_lock);
+}
+
+} // namespace TestWebKitAPI
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to