fergalmoran/ladybird
1
0
Fork 0
mirror of https://github.com/fergalmoran/ladybird.git synced 2025-12-25 19:04:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

LibWeb: Make EventLoop, TaskQueue, and Task GC-allocated

Browse Source 
...and use HeapFunction instead of SafeFunction for task steps.

Since there is only one EventLoop per process, it lives as a global
handle in the VM custom data.

This makes it much easier to reason about lifetimes of tasks, task
steps, and random stuff captured by them.
This commit is contained in:
Andreas Kling
2024-04-04 12:06:50 +02:00
parent 5485e2a940
commit 2ef37c0b06
20 changed files with 167 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Userland/Libraries/LibWeb/HTML/EventLoop/TaskQueue.cpp
View File

@@ -1,9 +1,10 @@
/*
* Copyright (c) 2021, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2021-2024, Andreas Kling <kling@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include <LibJS/Heap/MarkedVector.h>
#include <LibWeb/HTML/EventLoop/EventLoop.h>
#include <LibWeb/HTML/EventLoop/TaskQueue.h>
@@ -16,15 +17,23 @@ TaskQueue::TaskQueue(HTML::EventLoop& event_loop)
TaskQueue::~TaskQueue() = default;
void TaskQueue::add(NonnullOwnPtr<Task> task)
void TaskQueue::visit_edges(Visitor& visitor)
{
m_tasks.append(move(task));
m_event_loop.schedule();
Base::visit_edges(visitor);
visitor.visit(m_event_loop);
for (auto& task : m_tasks)
visitor.visit(task);
}
OwnPtr<Task> TaskQueue::take_first_runnable()
void TaskQueue::add(JS::NonnullGCPtr<Task> task)
{
if (m_event_loop.execution_paused())
m_tasks.append(task);
m_event_loop->schedule();
}
JS::GCPtr<Task> TaskQueue::take_first_runnable()
{
if (m_event_loop->execution_paused())
return nullptr;
for (size_t i = 0; i < m_tasks.size(); ++i) {
@@ -36,7 +45,7 @@ OwnPtr<Task> TaskQueue::take_first_runnable()
bool TaskQueue::has_runnable_tasks() const
{
if (m_event_loop.execution_paused())
if (m_event_loop->execution_paused())
return false;
for (auto& task : m_tasks) {
@@ -53,15 +62,15 @@ void TaskQueue::remove_tasks_matching(Function<bool(HTML::Task const&)> filter)
});
}
ErrorOr<Vector<NonnullOwnPtr<Task>>> TaskQueue::take_tasks_matching(Function<bool(HTML::Task const&)> filter)
JS::MarkedVector<JS::NonnullGCPtr<Task>> TaskQueue::take_tasks_matching(Function<bool(HTML::Task const&)> filter)
{
Vector<NonnullOwnPtr<Task>> matching_tasks;
JS::MarkedVector<JS::NonnullGCPtr<Task>> matching_tasks(heap());
for (size_t i = 0; i < m_tasks.size();) {
auto& task = m_tasks.at(i);
if (filter(*task)) {
TRY(matching_tasks.try_append(move(task)));
matching_tasks.append(task);
m_tasks.remove(i);
} else {
++i;