Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-26 23:58:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Split devtools network event logic for creating/retrieving network event actors (#38409)

Browse source 
`DevtoolsInstance::find_network_event_actor` silently creates a new
actor if there is not one already known for a given ID. This is
confusing; this PR separates logic for handling network requests (create
a new actor) and network responses (retrieve an existing actor).

Fixes: (https://github.com/servo/servo/issues/37841)

---------

Signed-off-by: uthmaniv <uthmanyahayababa@gmail.com>
This commit is contained in:
Usman Yahaya Baba 2025-08-20 04:13:54 +09:00 • committed by GitHub
parent f1a9ceed4f
commit f2294db95b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

36
components/devtools/lib.rs
View file

@ -13,7 +13,6 @@
use std::borrow::ToOwned; use std::borrow::ToOwned;
use std::collections::HashMap; use std::collections::HashMap;
use std::collections::hash_map::Entry::{Occupied, Vacant};
use std::io::Read; use std::io::Read;
use std::net::{Shutdown, TcpListener, TcpStream}; use std::net::{Shutdown, TcpListener, TcpStream};
use std::sync::{Arc, Mutex}; use std::sync::{Arc, Mutex};
@ -511,7 +510,10 @@ impl DevtoolsInstance {
.watcher .watcher
.clone(); .clone();
let netevent_actor_name = self.find_network_event_actor(request_id, watcher_name); let netevent_actor_name = match self.actor_requests.get(&request_id) {
Some(name) => name.clone(),
None => self.create_network_event_actor(request_id, watcher_name),
};
handle_network_event( handle_network_event(
Arc::clone(&self.actors), Arc::clone(&self.actors),
@ -521,25 +523,19 @@ impl DevtoolsInstance {
) )
} }
// Find the name of NetworkEventActor corresponding to request_id /// Create a new NetworkEventActor for a given request ID and watcher name.
// Create a new one if it does not exist, add it to the actor_requests hashmap fn create_network_event_actor(&mut self, request_id: String, watcher_name: String) -> String {
fn find_network_event_actor(&mut self, request_id: String, watcher_name: String) -> String {
let mut actors = self.actors.lock().unwrap(); let mut actors = self.actors.lock().unwrap();
match self.actor_requests.entry(request_id) { let resource_id = self.next_resource_id;
Occupied(name) => { self.next_resource_id += 1;
// TODO: Delete from map like Firefox does?
name.into_mut().clone() let actor_name = actors.new_name("netevent");
}, let actor = NetworkEventActor::new(actor_name.clone(), resource_id, watcher_name);
Vacant(entry) => {
let resource_id = self.next_resource_id; self.actor_requests.insert(request_id, actor_name.clone());
self.next_resource_id += 1; actors.register(Box::new(actor));
let actor_name = actors.new_name("netevent");
let actor = NetworkEventActor::new(actor_name.clone(), resource_id, watcher_name); actor_name
entry.insert(actor_name.clone());
actors.register(Box::new(actor));
actor_name
},
}
} }
fn handle_create_source_actor( fn handle_create_source_actor(