mirror of
https://github.com/servo/servo.git
synced 2025-07-23 23:33:43 +01:00
script: Eliminate code duplication in the task queue (#34798)
Instead of creating a type for each `TaskSource` variety have each `TaskSource` hold the same kind of sender (this was inconsistent before, but each sender was effectively the same trait object), a pipeline, and a `TaskSourceName`. This elminates the need to reimplement the same queuing code for every task source. In addition, have workers hold their own `TaskManager`. This allows just exposing the manager on the `GlobalScope`. Currently the `TaskCanceller` is different, but this will also be eliminated in a followup change. This is a the first step toward having a shared set of `Sender`s on `GlobalScope`. Signed-off-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
parent
deb819f233
commit
77cfca65c4
67 changed files with 432 additions and 1200 deletions
174
components/script/task_source.rs
Normal file
174
components/script/task_source.rs
Normal file
|
@ -0,0 +1,174 @@
|
|||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||||
|
||||
use std::fmt;
|
||||
use std::result::Result;
|
||||
|
||||
use base::id::PipelineId;
|
||||
use malloc_size_of_derive::MallocSizeOf;
|
||||
use servo_atoms::Atom;
|
||||
|
||||
use crate::dom::bindings::inheritance::Castable;
|
||||
use crate::dom::bindings::refcounted::Trusted;
|
||||
use crate::dom::event::{EventBubbles, EventCancelable, EventTask, SimpleEventTask};
|
||||
use crate::dom::eventtarget::EventTarget;
|
||||
use crate::dom::types::GlobalScope;
|
||||
use crate::dom::window::Window;
|
||||
use crate::script_runtime::{CommonScriptMsg, ScriptChan, ScriptThreadEventCategory};
|
||||
use crate::task::{TaskCanceller, TaskOnce};
|
||||
|
||||
/// The names of all task sources, used to differentiate TaskCancellers. Note: When adding a task
|
||||
/// source, update this enum. Note: The HistoryTraversalTaskSource is not part of this, because it
|
||||
/// doesn't implement TaskSource.
|
||||
///
|
||||
/// Note: When adding or removing a [`TaskSourceName`], be sure to also update the return value of
|
||||
/// [`TaskSourceName::all`].
|
||||
#[derive(Clone, Copy, Debug, Eq, Hash, JSTraceable, MallocSizeOf, PartialEq)]
|
||||
pub enum TaskSourceName {
|
||||
DOMManipulation,
|
||||
FileReading,
|
||||
HistoryTraversal,
|
||||
Networking,
|
||||
PerformanceTimeline,
|
||||
PortMessage,
|
||||
UserInteraction,
|
||||
RemoteEvent,
|
||||
/// <https://html.spec.whatwg.org/multipage/#rendering-task-source>
|
||||
Rendering,
|
||||
MediaElement,
|
||||
WebSocket,
|
||||
Timer,
|
||||
/// <https://www.w3.org/TR/gamepad/#dfn-gamepad-task-source>
|
||||
Gamepad,
|
||||
}
|
||||
|
||||
impl From<TaskSourceName> for ScriptThreadEventCategory {
|
||||
fn from(value: TaskSourceName) -> Self {
|
||||
match value {
|
||||
TaskSourceName::DOMManipulation => ScriptThreadEventCategory::ScriptEvent,
|
||||
TaskSourceName::FileReading => ScriptThreadEventCategory::FileRead,
|
||||
TaskSourceName::HistoryTraversal => ScriptThreadEventCategory::HistoryEvent,
|
||||
TaskSourceName::Networking => ScriptThreadEventCategory::NetworkEvent,
|
||||
TaskSourceName::PerformanceTimeline => {
|
||||
ScriptThreadEventCategory::PerformanceTimelineTask
|
||||
},
|
||||
TaskSourceName::PortMessage => ScriptThreadEventCategory::PortMessage,
|
||||
TaskSourceName::UserInteraction => ScriptThreadEventCategory::InputEvent,
|
||||
TaskSourceName::RemoteEvent => ScriptThreadEventCategory::NetworkEvent,
|
||||
TaskSourceName::Rendering => ScriptThreadEventCategory::Rendering,
|
||||
TaskSourceName::MediaElement => ScriptThreadEventCategory::ScriptEvent,
|
||||
TaskSourceName::WebSocket => ScriptThreadEventCategory::WebSocketEvent,
|
||||
TaskSourceName::Timer => ScriptThreadEventCategory::TimerEvent,
|
||||
TaskSourceName::Gamepad => ScriptThreadEventCategory::InputEvent,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl TaskSourceName {
|
||||
pub fn all() -> &'static [TaskSourceName] {
|
||||
&[
|
||||
TaskSourceName::DOMManipulation,
|
||||
TaskSourceName::FileReading,
|
||||
TaskSourceName::HistoryTraversal,
|
||||
TaskSourceName::Networking,
|
||||
TaskSourceName::PerformanceTimeline,
|
||||
TaskSourceName::PortMessage,
|
||||
TaskSourceName::UserInteraction,
|
||||
TaskSourceName::RemoteEvent,
|
||||
TaskSourceName::Rendering,
|
||||
TaskSourceName::MediaElement,
|
||||
TaskSourceName::WebSocket,
|
||||
TaskSourceName::Timer,
|
||||
TaskSourceName::Gamepad,
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(JSTraceable, MallocSizeOf)]
|
||||
pub(crate) struct TaskSource {
|
||||
#[ignore_malloc_size_of = "Need to push MallocSizeOf down into the ScriptChan trait implementations"]
|
||||
pub sender: Box<dyn ScriptChan + Send + 'static>,
|
||||
#[no_trace]
|
||||
pub pipeline_id: PipelineId,
|
||||
pub name: TaskSourceName,
|
||||
}
|
||||
|
||||
impl TaskSource {
|
||||
pub(crate) fn queue_with_canceller<T>(
|
||||
&self,
|
||||
task: T,
|
||||
canceller: &TaskCanceller,
|
||||
) -> Result<(), ()>
|
||||
where
|
||||
T: TaskOnce + 'static,
|
||||
{
|
||||
let msg = CommonScriptMsg::Task(
|
||||
self.name.into(),
|
||||
Box::new(canceller.wrap_task(task)),
|
||||
Some(self.pipeline_id),
|
||||
self.name,
|
||||
);
|
||||
self.sender.send(msg).map_err(|_| ())
|
||||
}
|
||||
|
||||
pub(crate) fn queue<T>(&self, task: T, global: &GlobalScope) -> Result<(), ()>
|
||||
where
|
||||
T: TaskOnce + 'static,
|
||||
{
|
||||
let canceller = global.task_canceller(self.name);
|
||||
self.queue_with_canceller(task, &canceller)
|
||||
}
|
||||
|
||||
/// This queues a task that will not be cancelled when its associated global scope gets destroyed.
|
||||
pub(crate) fn queue_unconditionally<T>(&self, task: T) -> Result<(), ()>
|
||||
where
|
||||
T: TaskOnce + 'static,
|
||||
{
|
||||
self.sender.send(CommonScriptMsg::Task(
|
||||
self.name.into(),
|
||||
Box::new(task),
|
||||
Some(self.pipeline_id),
|
||||
self.name,
|
||||
))
|
||||
}
|
||||
|
||||
pub(crate) fn queue_simple_event(&self, target: &EventTarget, name: Atom, window: &Window) {
|
||||
let target = Trusted::new(target);
|
||||
let _ = self.queue(SimpleEventTask { target, name }, window.upcast());
|
||||
}
|
||||
|
||||
pub(crate) fn queue_event(
|
||||
&self,
|
||||
target: &EventTarget,
|
||||
name: Atom,
|
||||
bubbles: EventBubbles,
|
||||
cancelable: EventCancelable,
|
||||
window: &Window,
|
||||
) {
|
||||
let target = Trusted::new(target);
|
||||
let task = EventTask {
|
||||
target,
|
||||
name,
|
||||
bubbles,
|
||||
cancelable,
|
||||
};
|
||||
let _ = self.queue(task, window.upcast());
|
||||
}
|
||||
}
|
||||
|
||||
impl Clone for TaskSource {
|
||||
fn clone(&self) -> Self {
|
||||
Self {
|
||||
sender: self.sender.as_boxed(),
|
||||
pipeline_id: self.pipeline_id,
|
||||
name: self.name,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl fmt::Debug for TaskSource {
|
||||
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
|
||||
write!(f, "{:?}(...)", self.name)
|
||||
}
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue