Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog (243978 => 243979)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog 2019-04-08 10:14:28 UTC (rev 243978)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/ChangeLog 2019-04-08 10:14:32 UTC (rev 243979)
@@ -1,3 +1,29 @@
+2019-03-01 Carlos Garcia Campos <[email protected]>
+
+ [ThreadedCompositor] Simply the compositing run loop worker thread
+ https://bugs.webkit.org/show_bug.cgi?id=195208
+
+ Reviewed by Don Olmstead.
+
+ We can remove the WorkQueuePool, since we never really supported more than one thread, and now that single
+ process model non longer exists it doesn't even make sense. We can simply use a RunLoop instead of a WorkQueue
+ so that the implementation is not specific to the generic WorkQueue implementation.
+
+ * Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp:
+ (WebKit::createRunLoop): Helper function to create the RunLoop in a worker thread before m_updateTimer is initialized.
+ (WebKit::CompositingRunLoop::CompositingRunLoop): Use createRunLoop().
+ (WebKit::CompositingRunLoop::~CompositingRunLoop): Stop the worker thread run loop in the next main run loop iteration.
+ (WebKit::CompositingRunLoop::performTask): Use m_runLoop.
+ (WebKit::CompositingRunLoop::performTaskSync): Ditto.
+ (WebKit::WorkQueuePool::singleton): Deleted.
+ (WebKit::WorkQueuePool::dispatch): Deleted.
+ (WebKit::WorkQueuePool::runLoop): Deleted.
+ (WebKit::WorkQueuePool::invalidate): Deleted.
+ (WebKit::WorkQueuePool::WorkQueuePool): Deleted.
+ (WebKit::WorkQueuePool::getOrCreateWorkQueueForContext): Deleted.
+ (): Deleted.
+ * Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h:
+
2019-03-25 Carlos Garcia Campos <[email protected]>
[GTK][WPE] Do not allow changes in active URI before provisional load starts for non-API requests
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp (243978 => 243979)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp 2019-04-08 10:14:28 UTC (rev 243978)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.cpp 2019-04-08 10:14:32 UTC (rev 243979)
@@ -30,8 +30,8 @@
#include <wtf/HashMap.h>
#include <wtf/MainThread.h>
-#include <wtf/NeverDestroyed.h>
-#include <wtf/WorkQueue.h>
+#include <wtf/Threading.h>
+#include <wtf/threads/BinarySemaphore.h>
#if USE(GLIB_EVENT_LOOP)
#include <wtf/glib/RunLoopSourcePriority.h>
@@ -39,74 +39,23 @@
namespace WebKit {
-class WorkQueuePool {
- WTF_MAKE_NONCOPYABLE(WorkQueuePool);
- friend NeverDestroyed<WorkQueuePool>;
-public:
- static WorkQueuePool& singleton()
- {
- ASSERT(RunLoop::isMain());
- static NeverDestroyed<WorkQueuePool> workQueuePool;
- return workQueuePool;
- }
+static RunLoop* createRunLoop()
+{
+ RunLoop* runLoop = nullptr;
+ BinarySemaphore semaphore;
+ Thread::create("org.webkit.ThreadedCompositor", [&] {
+ runLoop = &RunLoop::current();
+ semaphore.signal();
+ runLoop->run();
+ })->detach();
+ semaphore.wait();
- void dispatch(void* context, Function<void ()>&& function)
- {
- ASSERT(RunLoop::isMain());
- getOrCreateWorkQueueForContext(context).dispatch(WTFMove(function));
- }
+ return runLoop;
+}
- RunLoop& runLoop(void* context)
- {
- return getOrCreateWorkQueueForContext(context).runLoop();
- }
-
- void invalidate(void* context)
- {
- auto workQueue = m_workQueueMap.take(context);
- ASSERT(workQueue);
- if (m_workQueueMap.isEmpty()) {
- m_sharedWorkQueue = nullptr;
- m_threadCount = 0;
- } else if (workQueue->hasOneRef())
- m_threadCount--;
- }
-
-private:
- WorkQueuePool()
- {
- // FIXME: This is a sane default limit, but it should be configurable somehow.
- m_threadCountLimit = 1;
- }
-
- WorkQueue& getOrCreateWorkQueueForContext(void* context)
- {
- auto addResult = m_workQueueMap.add(context, nullptr);
- if (addResult.isNewEntry) {
- // FIXME: This is OK for now, and it works for a single-thread limit. But for configurations where more (but not unlimited)
- // threads could be used, one option would be to use a HashSet here and disperse the contexts across the available threads.
- if (m_threadCount >= m_threadCountLimit) {
- ASSERT(m_sharedWorkQueue);
- addResult.iterator->value = m_sharedWorkQueue;
- } else {
- addResult.iterator->value = WorkQueue::create("org.webkit.ThreadedCompositorWorkQueue");
- if (!m_threadCount)
- m_sharedWorkQueue = addResult.iterator->value;
- m_threadCount++;
- }
- }
-
- return *addResult.iterator->value;
- }
-
- HashMap<void*, RefPtr<WorkQueue>> m_workQueueMap;
- RefPtr<WorkQueue> m_sharedWorkQueue;
- unsigned m_threadCount { 0 };
- unsigned m_threadCountLimit;
-};
-
CompositingRunLoop::CompositingRunLoop(Function<void ()>&& updateFunction)
- : m_updateTimer(WorkQueuePool::singleton().runLoop(this), this, &CompositingRunLoop::updateTimerFired)
+ : m_runLoop(createRunLoop())
+ , m_updateTimer(*m_runLoop, this, &CompositingRunLoop::updateTimerFired)
, m_updateFunction(WTFMove(updateFunction))
{
#if USE(GLIB_EVENT_LOOP)
@@ -118,16 +67,19 @@
CompositingRunLoop::~CompositingRunLoop()
{
ASSERT(RunLoop::isMain());
- // Make sure the WorkQueue is deleted after the CompositingRunLoop, because m_updateTimer has a reference
- // of the WorkQueue run loop. Passing this is not a problem because the pointer will only be used as a
- // HashMap key by WorkQueuePool.
- RunLoop::main().dispatch([context = this] { WorkQueuePool::singleton().invalidate(context); });
+ // Make sure the RunLoop is stopped after the CompositingRunLoop, because m_updateTimer has a reference.
+ RunLoop::main().dispatch([runLoop = makeRef(*m_runLoop)] {
+ runLoop->stop();
+ runLoop->dispatch([] {
+ RunLoop::current().stop();
+ });
+ });
}
void CompositingRunLoop::performTask(Function<void ()>&& function)
{
ASSERT(RunLoop::isMain());
- WorkQueuePool::singleton().dispatch(this, WTFMove(function));
+ m_runLoop->dispatch(WTFMove(function));
}
void CompositingRunLoop::performTaskSync(Function<void ()>&& function)
@@ -134,7 +86,7 @@
{
ASSERT(RunLoop::isMain());
LockHolder locker(m_dispatchSyncConditionMutex);
- WorkQueuePool::singleton().dispatch(this, [this, function = WTFMove(function)] {
+ m_runLoop->dispatch([this, function = WTFMove(function)] {
function();
LockHolder locker(m_dispatchSyncConditionMutex);
m_dispatchSyncCondition.notifyOne();
Modified: releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h (243978 => 243979)
--- releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h 2019-04-08 10:14:28 UTC (rev 243978)
+++ releases/WebKitGTK/webkit-2.24/Source/WebKit/Shared/CoordinatedGraphics/threadedcompositor/CompositingRunLoop.h 2019-04-08 10:14:32 UTC (rev 243979)
@@ -71,12 +71,12 @@
void updateTimerFired();
+ RunLoop* m_runLoop { nullptr };
RunLoop::Timer<CompositingRunLoop> m_updateTimer;
Function<void ()> m_updateFunction;
Lock m_dispatchSyncConditionMutex;
Condition m_dispatchSyncCondition;
-
struct {
Lock lock;
CompositionState composition { CompositionState::Idle };
