mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
script: Unsilence all main thread TaskQueue
errors (#34849)
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:
parent
d252a631d2
commit
fe8a22b72c
48 changed files with 628 additions and 571 deletions
|
@ -306,7 +306,10 @@ impl FakeXRDeviceMethods<crate::DomTypeHolder> for FakeXRDevice {
|
|||
let global = self.global();
|
||||
let p = Promise::new(&global, can_gc);
|
||||
let mut trusted = Some(TrustedPromise::new(p.clone()));
|
||||
let task_source = global.task_manager().dom_manipulation_task_source();
|
||||
let task_source = global
|
||||
.task_manager()
|
||||
.dom_manipulation_task_source()
|
||||
.to_sendable();
|
||||
let (sender, receiver) = ipc::channel(global.time_profiler_chan().clone()).unwrap();
|
||||
|
||||
ROUTER.add_typed_route(
|
||||
|
@ -315,7 +318,7 @@ impl FakeXRDeviceMethods<crate::DomTypeHolder> for FakeXRDevice {
|
|||
let trusted = trusted
|
||||
.take()
|
||||
.expect("disconnect callback called multiple times");
|
||||
let _ = task_source.queue(trusted.resolve_task(()));
|
||||
task_source.queue(trusted.resolve_task(()));
|
||||
}),
|
||||
);
|
||||
self.disconnect(sender);
|
||||
|
|
|
@ -201,14 +201,17 @@ impl XRSession {
|
|||
fn setup_raf_loop(&self, frame_receiver: IpcReceiver<Frame>) {
|
||||
let this = Trusted::new(self);
|
||||
let global = self.global();
|
||||
let task_source = global.task_manager().dom_manipulation_task_source();
|
||||
let task_source = global
|
||||
.task_manager()
|
||||
.dom_manipulation_task_source()
|
||||
.to_sendable();
|
||||
ROUTER.add_typed_route(
|
||||
frame_receiver,
|
||||
Box::new(move |message| {
|
||||
let frame: Frame = message.unwrap();
|
||||
let time = CrossProcessInstant::now();
|
||||
let this = this.clone();
|
||||
let _ = task_source.queue(task!(xr_raf_callback: move || {
|
||||
task_source.queue(task!(xr_raf_callback: move || {
|
||||
this.root().raf_callback(frame, time);
|
||||
}));
|
||||
}),
|
||||
|
@ -224,14 +227,17 @@ impl XRSession {
|
|||
fn attach_event_handler(&self) {
|
||||
let this = Trusted::new(self);
|
||||
let global = self.global();
|
||||
let task_source = global.task_manager().dom_manipulation_task_source();
|
||||
let task_source = global
|
||||
.task_manager()
|
||||
.dom_manipulation_task_source()
|
||||
.to_sendable();
|
||||
let (sender, receiver) = ipc::channel(global.time_profiler_chan().clone()).unwrap();
|
||||
|
||||
ROUTER.add_typed_route(
|
||||
receiver.to_ipc_receiver(),
|
||||
Box::new(move |message| {
|
||||
let this = this.clone();
|
||||
let _ = task_source.queue(task!(xr_event_callback: move || {
|
||||
task_source.queue(task!(xr_event_callback: move || {
|
||||
this.root().event_callback(message.unwrap(), CanGc::note());
|
||||
}));
|
||||
}),
|
||||
|
@ -254,14 +260,16 @@ impl XRSession {
|
|||
return;
|
||||
}
|
||||
|
||||
let task_source = self.global().task_manager().dom_manipulation_task_source();
|
||||
let this = Trusted::new(self);
|
||||
// Queue a task so that it runs after resolve()'s microtasks complete
|
||||
// so that content has a chance to attach a listener for inputsourceschange
|
||||
let _ = task_source.queue(task!(session_initial_inputs: move || {
|
||||
let this = this.root();
|
||||
this.input_sources.add_input_sources(&this, &initial_inputs, CanGc::note());
|
||||
}));
|
||||
self.global()
|
||||
.task_manager()
|
||||
.dom_manipulation_task_source()
|
||||
.queue(task!(session_initial_inputs: move || {
|
||||
let this = this.root();
|
||||
this.input_sources.add_input_sources(&this, &initial_inputs, CanGc::note());
|
||||
}));
|
||||
}
|
||||
|
||||
fn event_callback(&self, event: XREvent, can_gc: CanGc) {
|
||||
|
@ -1036,14 +1044,17 @@ impl XRSessionMethods<crate::DomTypeHolder> for XRSession {
|
|||
|
||||
let this = Trusted::new(self);
|
||||
let global = self.global();
|
||||
let task_source = global.task_manager().dom_manipulation_task_source();
|
||||
let task_source = global
|
||||
.task_manager()
|
||||
.dom_manipulation_task_source()
|
||||
.to_sendable();
|
||||
let (sender, receiver) = ipc::channel(global.time_profiler_chan().clone()).unwrap();
|
||||
|
||||
ROUTER.add_typed_route(
|
||||
receiver.to_ipc_receiver(),
|
||||
Box::new(move |message| {
|
||||
let this = this.clone();
|
||||
let _ = task_source.queue(task!(update_session_framerate: move || {
|
||||
task_source.queue(task!(update_session_framerate: move || {
|
||||
let session = this.root();
|
||||
session.apply_nominal_framerate(message.unwrap(), CanGc::note());
|
||||
if let Some(promise) = session.update_framerate_promise.borrow_mut().take() {
|
||||
|
|
|
@ -118,7 +118,10 @@ impl XRSystemMethods<crate::DomTypeHolder> for XRSystem {
|
|||
let promise = Promise::new(&self.global(), can_gc);
|
||||
let mut trusted = Some(TrustedPromise::new(promise.clone()));
|
||||
let global = self.global();
|
||||
let task_source = global.task_manager().dom_manipulation_task_source();
|
||||
let task_source = global
|
||||
.task_manager()
|
||||
.dom_manipulation_task_source()
|
||||
.to_sendable();
|
||||
let (sender, receiver) = ipc::channel(global.time_profiler_chan().clone()).unwrap();
|
||||
ROUTER.add_typed_route(
|
||||
receiver.to_ipc_receiver(),
|
||||
|
@ -137,9 +140,9 @@ impl XRSystemMethods<crate::DomTypeHolder> for XRSystem {
|
|||
return;
|
||||
};
|
||||
if let Ok(()) = message {
|
||||
let _ = task_source.queue(trusted.resolve_task(true));
|
||||
task_source.queue(trusted.resolve_task(true));
|
||||
} else {
|
||||
let _ = task_source.queue(trusted.resolve_task(false));
|
||||
task_source.queue(trusted.resolve_task(false));
|
||||
};
|
||||
}),
|
||||
);
|
||||
|
@ -234,7 +237,10 @@ impl XRSystemMethods<crate::DomTypeHolder> for XRSystem {
|
|||
|
||||
let mut trusted = Some(TrustedPromise::new(promise.clone()));
|
||||
let this = Trusted::new(self);
|
||||
let task_source = global.task_manager().dom_manipulation_task_source();
|
||||
let task_source = global
|
||||
.task_manager()
|
||||
.dom_manipulation_task_source()
|
||||
.to_sendable();
|
||||
let (sender, receiver) = ipc::channel(global.time_profiler_chan().clone()).unwrap();
|
||||
let (frame_sender, frame_receiver) = ipc_crate::channel().unwrap();
|
||||
let mut frame_receiver = Some(frame_receiver);
|
||||
|
@ -251,7 +257,7 @@ impl XRSystemMethods<crate::DomTypeHolder> for XRSystem {
|
|||
error!("requestSession callback given incorrect payload");
|
||||
return;
|
||||
};
|
||||
let _ = task_source.queue(task!(request_session: move || {
|
||||
task_source.queue(task!(request_session: move || {
|
||||
this.root().session_obtained(message, trusted.root(), mode, frame_receiver);
|
||||
}));
|
||||
}),
|
||||
|
@ -316,7 +322,6 @@ impl XRSystem {
|
|||
xr.upcast::<EventTarget>().fire_bubbling_event(atom!("sessionavailable"), CanGc::note());
|
||||
ScriptThread::set_user_interacting(interacting);
|
||||
})
|
||||
)
|
||||
.unwrap();
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -150,7 +150,10 @@ impl XRTestMethods<crate::DomTypeHolder> for XRTest {
|
|||
let this = Trusted::new(self);
|
||||
let mut trusted = Some(TrustedPromise::new(p.clone()));
|
||||
|
||||
let task_source = global.task_manager().dom_manipulation_task_source();
|
||||
let task_source = global
|
||||
.task_manager()
|
||||
.dom_manipulation_task_source()
|
||||
.to_sendable();
|
||||
let (sender, receiver) = ipc::channel(global.time_profiler_chan().clone()).unwrap();
|
||||
|
||||
ROUTER.add_typed_route(
|
||||
|
@ -163,7 +166,7 @@ impl XRTestMethods<crate::DomTypeHolder> for XRTest {
|
|||
let message =
|
||||
message.expect("SimulateDeviceConnection callback given incorrect payload");
|
||||
|
||||
let _ = task_source.queue(task!(request_session: move || {
|
||||
task_source.queue(task!(request_session: move || {
|
||||
this.root().device_obtained(message, trusted);
|
||||
}));
|
||||
}),
|
||||
|
@ -200,7 +203,10 @@ impl XRTestMethods<crate::DomTypeHolder> for XRTest {
|
|||
devices.clear();
|
||||
|
||||
let mut trusted = Some(TrustedPromise::new(p.clone()));
|
||||
let task_source = global.task_manager().dom_manipulation_task_source();
|
||||
let task_source = global
|
||||
.task_manager()
|
||||
.dom_manipulation_task_source()
|
||||
.to_sendable();
|
||||
|
||||
ROUTER.add_typed_route(
|
||||
receiver.to_ipc_receiver(),
|
||||
|
@ -210,7 +216,7 @@ impl XRTestMethods<crate::DomTypeHolder> for XRTest {
|
|||
let trusted = trusted
|
||||
.take()
|
||||
.expect("DisconnectAllDevices disconnected more devices than expected");
|
||||
let _ = task_source.queue(trusted.resolve_task(()));
|
||||
task_source.queue(trusted.resolve_task(()));
|
||||
}
|
||||
}),
|
||||
);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue