Skip to content

devtools: Rename WorkerActor variables and add register method #43963

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mukilan merged 1 commit into from
Apr 6, 2026
Merged

devtools: Rename WorkerActor variables and add register method #43963

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/devtools/actors/console.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ impl ConsoleActor {
.script_chan(),
Root::DedicatedWorker(worker_name) => registry
.find::<WorkerActor>(worker_name)
.script_chan
.script_sender
.clone(),
}
}
Expand Down
10 changes: 5 additions & 5 deletions components/devtools/actors/root.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,12 +248,12 @@ impl Actor for RootActor {
.borrow()
.iter()
.map(|worker_name| {
let worker = registry.find::<WorkerActor>(worker_name);
let url = worker.url.to_string();
let worker_actor = registry.find::<WorkerActor>(worker_name);
let url = worker_actor.url.to_string();
// Find correct scope url in the service worker
let scope = url.clone();
ServiceWorkerRegistrationMsg {
actor: worker.name(),
actor: worker_actor.name(),
scope,
url: url.clone(),
registration_state: "".to_string(),
Expand All @@ -263,11 +263,11 @@ impl Actor for RootActor {
installing_worker: None,
waiting_worker: None,
active_worker: Some(ServiceWorkerInfo {
actor: worker.name(),
actor: worker_actor.name(),
url,
state: 4, // activated
state_text: "activated".to_string(),
id: worker.worker_id.to_string(),
id: worker_actor.worker_id.to_string(),
fetch: false,
traits: HashMap::new(),
}),
Expand Down
32 changes: 29 additions & 3 deletions components/devtools/actors/worker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ pub(crate) struct WorkerActor {
pub worker_id: WorkerId,
pub url: ServoUrl,
pub type_: WorkerType,
pub script_chan: GenericSender<DevtoolScriptControlMsg>,
pub script_sender: GenericSender<DevtoolScriptControlMsg>,
pub streams: AtomicRefCell<FxHashSet<StreamId>>,
}

Expand All @@ -44,6 +44,32 @@ impl ResourceAvailable for WorkerActor {
}
}

impl WorkerActor {
pub fn register(
registry: &ActorRegistry,
console_name: String,
thread_name: String,
worker_id: WorkerId,
url: ServoUrl,
worker_type: WorkerType,
script_sender: GenericSender<DevtoolScriptControlMsg>,
) -> String {
let name = registry.new_name::<Self>();
let actor = Self {
name: name.clone(),
console_name,
thread_name,
worker_id,
url,
type_: worker_type,
script_sender,
streams: Default::default(),
};
registry.register::<Self>(actor);
name
}
}

impl Actor for WorkerActor {
fn name(&self) -> String {
self.name.clone()
Expand All @@ -67,7 +93,7 @@ impl Actor for WorkerActor {
request.write_json_packet(&msg)?;
self.streams.borrow_mut().insert(stream_id);
// FIXME: fix messages to not require forging a pipeline for worker messages
self.script_chan
self.script_sender
.send(WantsLiveNotifications(TEST_PIPELINE_ID, true))
.unwrap();
},
Expand Down Expand Up @@ -109,7 +135,7 @@ impl Actor for WorkerActor {
fn cleanup(&self, stream_id: StreamId) {
self.streams.borrow_mut().remove(&stream_id);
if self.streams.borrow().is_empty() {
self.script_chan
self.script_sender
.send(WantsLiveNotifications(TEST_PIPELINE_ID, false))
.unwrap();
}
Expand Down
23 changes: 10 additions & 13 deletions components/devtools/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,29 +482,26 @@ impl DevtoolsInstance {
} else {
WorkerType::Dedicated
};
let worker_name = self.registry.new_name::<WorkerActor>();
let worker = WorkerActor {
name: worker_name.clone(),
console_name: console_name.clone(),
let worker_name = WorkerActor::register(
&self.registry,
console_name.clone(),
thread_name,
worker_id: id,
url: page_info.url,
type_: worker_type,
script_chan: script_sender,
streams: Default::default(),
};
id,
page_info.url,
worker_type,
script_sender,
);
let root_actor = self.registry.find::<RootActor>("root");
if page_info.is_service_worker {
root_actor
.service_workers
.borrow_mut()
.push(worker.name.clone());
.push(worker_name.clone());
} else {
root_actor.workers.borrow_mut().push(worker.name.clone());
root_actor.workers.borrow_mut().push(worker_name.clone());
}

self.actor_workers.insert(id, worker_name.clone());
self.registry.register(worker);

Root::DedicatedWorker(worker_name)
} else {
Expand Down
Loading