mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-03 15:22:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Don't hold the lock while yielding back to the executor in Client

Browse source
This commit is contained in:
Antonio Scandurra 2022-11-01 19:16:02 +01:00
parent d6d1e20f07
commit 0b79950510
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
crates/client/src/client.rs
View file

@ -835,11 +835,14 @@ impl Client {
continue;
};
if let Some(handler) = state.message_handlers.get(&payload_type_id).cloned()
{
drop(state); // Avoid deadlocks if the handler interacts with rpc::Client
let future = handler(model, message, &this, cx.clone());
let handler = state.message_handlers.get(&payload_type_id).cloned();
// Dropping the state prevents deadlocks if the handler interacts with rpc::Client.
// It also ensures we don't hold the lock while yielding back to the executor, as
// that might cause the executor thread driving this future to block indefinitely.
drop(state);
if let Some(handler) = handler {
let future = handler(model, message, &this, cx.clone());
let client_id = this.id;
log::debug!(
"rpc message received. client_id:{}, message_id:{}, sender_id:{:?}, type:{}",