eliott/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2026-05-05 06:32:26 +02: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

30
Userland/Libraries/LibWeb/HTML/EventLoop/Task.h
View File

@@ -1,15 +1,13 @@
/*
* Copyright (c) 2021-2022, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2021-2024, Andreas Kling <kling@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#pragma once
#include <AK/Function.h>
#include <AK/NonnullOwnPtr.h>
#include <AK/RefPtr.h>
#include <LibJS/Heap/Handle.h>
#include <LibJS/Heap/Cell.h>
#include <LibJS/Heap/CellAllocator.h>
#include <LibJS/SafeFunction.h>
#include <LibWeb/Forward.h>
@@ -17,7 +15,10 @@ namespace Web::HTML {
struct UniqueTaskSource;
class Task {
class Task final : public JS::Cell {
JS_CELL(Task, Cell);
JS_DECLARE_ALLOCATOR(Task);
public:
// https://html.spec.whatwg.org/multipage/webappapis.html#generic-task-sources
enum class Source {
@@ -59,11 +60,10 @@ public:
UniqueTaskSourceStart
};
static NonnullOwnPtr<Task> create(Source source, DOM::Document const* document, JS::SafeFunction<void()> steps)
{
return adopt_own(*new Task(source, document, move(steps)));
}
~Task();
static JS::NonnullGCPtr<Task> create(JS::VM&, Source, JS::GCPtr<DOM::Document const>, JS::NonnullGCPtr<JS::HeapFunction<void()>> steps);
virtual ~Task() override;
virtual void finalize() override;
int id() const { return m_id; }
Source source() const { return m_source; }
@@ -74,12 +74,14 @@ public:
bool is_runnable() const;
private:
Task(Source, DOM::Document const*, JS::SafeFunction<void()> steps);
Task(Source, JS::GCPtr<DOM::Document const>, JS::NonnullGCPtr<JS::HeapFunction<void()>> steps);
virtual void visit_edges(Visitor&) override;
int m_id { 0 };
Source m_source { Source::Unspecified };
JS::SafeFunction<void()> m_steps;
JS::Handle<DOM::Document const> m_document;
JS::NonnullGCPtr<JS::HeapFunction<void()>> m_steps;
JS::GCPtr<DOM::Document const> m_document;
};
struct UniqueTaskSource {