aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/webgpu/gpu.rs
diff options
context:
space:
mode:
authorMartin Robinson <mrobinson@igalia.com>2025-01-04 09:41:50 +0100
committerGitHub <noreply@github.com>2025-01-04 08:41:50 +0000
commitb2eda71952f32c0e486c72ed881f472e59ad37c0 (patch)
tree281ac2c157d39859ebf9122d178d9c349f492a87 /components/script/dom/webgpu/gpu.rs
parent75a22cfe2eb6c4822d5cda98e84cc88c1e4ce941 (diff)
downloadservo-b2eda71952f32c0e486c72ed881f472e59ad37c0.tar.gz
servo-b2eda71952f32c0e486c72ed881f472e59ad37c0.zip
script: Move `TaskManager` to `GlobalScope` (#34827)
This is a simplification of the internal `TaskQueue` API that moves the `TaskManager` to the `GlobalScope` itself. In addition, the handling of cancellers is moved to the `TaskManager` as well. This means that no arguments other than the `task` are necessary for queueing tasks, which makes the API a lot easier to use and cleaner. `TaskSource` now also keeps a copy of the canceller with it, so that they always know the proper way to cancel any tasks queued on them. There is one complication here. The event loop `sender` for dedicated workers is constantly changing as it is set to `None` when not handling messages. This is because this sender keeps a handle to the main thread's `Worker` object, preventing garbage collection while any messages are still in flight or being handled. This change allows setting the `sender` on the `TaskManager` to `None` to allow proper garbabge collection. Signed-off-by: Martin Robinson <mrobinson@igalia.com>
Diffstat (limited to 'components/script/dom/webgpu/gpu.rs')
-rw-r--r--components/script/dom/webgpu/gpu.rs13
1 files changed, 3 insertions, 10 deletions
diff --git a/components/script/dom/webgpu/gpu.rs b/components/script/dom/webgpu/gpu.rs
index ba4ce6be221..8b1a2dd46a8 100644
--- a/components/script/dom/webgpu/gpu.rs
+++ b/components/script/dom/webgpu/gpu.rs
@@ -25,7 +25,6 @@ use crate::dom::promise::Promise;
use crate::dom::webgpu::gpuadapter::GPUAdapter;
use crate::realms::InRealm;
use crate::script_runtime::CanGc;
-use crate::task_source::TaskSourceName;
#[dom_struct]
#[allow(clippy::upper_case_acronyms)]
@@ -73,9 +72,6 @@ pub fn response_async<T: AsyncWGPUListener + DomObject + 'static>(
.global()
.task_manager()
.dom_manipulation_task_source();
- let canceller = receiver
- .global()
- .task_canceller(TaskSourceName::DOMManipulation);
let mut trusted: Option<TrustedPromise> = Some(TrustedPromise::new(promise.clone()));
let trusted_receiver = Trusted::new(receiver);
ROUTER.add_typed_route(
@@ -92,12 +88,9 @@ pub fn response_async<T: AsyncWGPUListener + DomObject + 'static>(
trusted,
receiver: trusted_receiver.clone(),
};
- let result = task_source.queue_with_canceller(
- task!(process_webgpu_task: move|| {
- context.response(message.unwrap(), CanGc::note());
- }),
- &canceller,
- );
+ let result = task_source.queue(task!(process_webgpu_task: move|| {
+ context.response(message.unwrap(), CanGc::note());
+ }));
if let Err(err) = result {
error!("Failed to queue GPU listener-task: {:?}", err);
}