From 77cfca65c441ff1f8b54a507c9802e7ae6893e62 Mon Sep 17 00:00:00 2001 From: Martin Robinson Date: Wed, 1 Jan 2025 14:50:52 +0100 Subject: 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 --- components/script/task_source/websocket.rs | 37 ------------------------------ 1 file changed, 37 deletions(-) delete mode 100644 components/script/task_source/websocket.rs (limited to 'components/script/task_source/websocket.rs') diff --git a/components/script/task_source/websocket.rs b/components/script/task_source/websocket.rs deleted file mode 100644 index 2ae11f99eb8..00000000000 --- a/components/script/task_source/websocket.rs +++ /dev/null @@ -1,37 +0,0 @@ -/* 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 base::id::PipelineId; - -use crate::script_runtime::{CommonScriptMsg, ScriptChan, ScriptThreadEventCategory}; -use crate::task::{TaskCanceller, TaskOnce}; -use crate::task_source::{TaskSource, TaskSourceName}; - -#[derive(JSTraceable)] -pub struct WebsocketTaskSource( - pub Box, - #[no_trace] pub PipelineId, -); - -impl Clone for WebsocketTaskSource { - fn clone(&self) -> WebsocketTaskSource { - WebsocketTaskSource(self.0.as_boxed(), self.1) - } -} - -impl TaskSource for WebsocketTaskSource { - const NAME: TaskSourceName = TaskSourceName::Websocket; - - fn queue_with_canceller(&self, task: T, canceller: &TaskCanceller) -> Result<(), ()> - where - T: TaskOnce + 'static, - { - self.0.send(CommonScriptMsg::Task( - ScriptThreadEventCategory::NetworkEvent, - Box::new(canceller.wrap_task(task)), - Some(self.1), - WebsocketTaskSource::NAME, - )) - } -} -- cgit v1.2.3