Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-29 10:10:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove lock around tokio-rt handle (#36762)

Browse source 
It seems sub-optimal to to sequentialise execution by grabbing a lock,
each time we want to spawn a task onto the tokio runtime. We don't need
the lock either, so it makes sense to just remove it, which also
simplifies a bunch of the using code.

Testing: Covered by existing tests

Signed-off-by: Jonathan Schwender <schwenderjonathan@gmail.com>
This commit is contained in:
Jonathan Schwender 2025-04-30 09:09:38 +02:00 • committed by GitHub
parent 955149b194
commit c46402e222
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 37 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

33
components/net/websocket_loader.rs
View file

@ -418,24 +418,21 @@ fn connect(
tls_config.alpn_protocols = vec!["http/1.1".to_string().into()];
let resource_event_sender2 = resource_event_sender.clone();
match HANDLE.lock().unwrap().as_mut() {
Some(handle) => handle.spawn(
start_websocket(
http_state,
req_url.clone(),
resource_event_sender,
protocols,
client,
tls_config,
dom_action_receiver,
)
.map_err(move |e| {
warn!("Failed to establish a WebSocket connection: {:?}", e);
let _ = resource_event_sender2.send(WebSocketNetworkEvent::Fail);
}),
),
None => return Err("No runtime available".to_string()),
};
HANDLE.spawn(
start_websocket(
http_state,
req_url.clone(),
resource_event_sender,
protocols,
client,
tls_config,
dom_action_receiver,
)
.map_err(move |e| {
warn!("Failed to establish a WebSocket connection: {:?}", e);
let _ = resource_event_sender2.send(WebSocketNetworkEvent::Fail);
}),
);
Ok(())
}