Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

script: Unsilence all main thread TaskQueue errors (#34849)

Browse source 
No longer hide errors while queueing tasks on the main thread. This
requires creating two types of `TaskSource`s: one for the main thread
and one that can be sent to other threads. This makes queueing a bit
more efficient on the main thread and more importantly, no longer hides
task queue errors.

Fixes #25688.

Signed-off-by: Martin Robinson <mrobinson@igalia.com>
Co-authored-by: Mukilan Thiyagarajan <mukilan@igalia.com>
This commit is contained in:
Martin Robinson 2025-01-07 04:36:39 +01:00 • committed by GitHub
parent d252a631d2
commit fe8a22b72c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
48 changed files with 628 additions and 571 deletions
Download patch file Download diff file Expand all files Collapse all files

32
components/script/task_manager.rs
View file

@ -4,6 +4,7 @@
use core::cell::RefCell;
use core::sync::atomic::Ordering;
use std::cell::Ref;
use std::collections::HashMap;
use base::id::PipelineId;
@ -64,13 +65,16 @@ impl TaskCancellers {
macro_rules! task_source_functions {
($self:ident, $task_source:ident, $task_source_name:ident) => {
pub(crate) fn $task_source(&$self) -> TaskSource {
$self.task_source_for_task_source_name(TaskSourceName::$task_source_name)
TaskSource {
task_manager: $self,
name: TaskSourceName::$task_source_name,
}
}
};
}
#[derive(JSTraceable, MallocSizeOf)]
pub struct TaskManager {
pub(crate) struct TaskManager {
#[ignore_malloc_size_of = "We need to push the measurement of this down into the ScriptChan trait"]
sender: RefCell<Option<Box<dyn ScriptChan + Send>>>,
#[no_trace]
@ -97,22 +101,16 @@ impl TaskManager {
}
}
fn task_source_for_task_source_name(&self, name: TaskSourceName) -> TaskSource {
let Some(sender) = self
.sender
.borrow()
.as_ref()
.map(|sender| sender.as_boxed())
else {
unreachable!("Tried to enqueue task for DedicatedWorker while not handling a message.")
};
pub(crate) fn pipeline_id(&self) -> PipelineId {
self.pipeline_id
}
TaskSource {
sender,
pipeline_id: self.pipeline_id,
name,
canceller: self.cancellers.get(name),
}
pub(crate) fn sender(&self) -> Ref<Option<Box<dyn ScriptChan + Send + 'static>>> {
self.sender.borrow()
}
pub(crate) fn canceller(&self, name: TaskSourceName) -> TaskCanceller {
self.cancellers.get(name)
}
/// Update the sender for this [`TaskSource`]. This is used by dedicated workers, which only have a