oak-team/oak-gpui
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #150 from zed-industries/fix-rpc-deadlock

Browse Source 
Fix deadlock when handling incoming RPC messages
This commit is contained in:
Nathan Sobo
2021-09-17 17:26:15 -06:00
committed by GitHub
parent ae9251a783 9a9c8aec3f
commit 9ec3af66b1
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zed/src/rpc.rs
+8 -4
View File
@@ -371,11 +371,11 @@ impl Client {
if let Some(extract_entity_id) =
state.entity_id_extractors.get(&message.payload_type_id())
{
let payload_type_id = message.payload_type_id();
let entity_id = (extract_entity_id)(message.as_ref());
if let Some(handler) = state
.model_handlers
.get_mut(&(message.payload_type_id(), entity_id))
{
let handler_key = (payload_type_id, entity_id);
if let Some(mut handler) = state.model_handlers.remove(&handler_key) {
drop(state); // Avoid deadlocks if the handler interacts with rpc::Client
let start_time = Instant::now();
log::info!("RPC client message {}", message.payload_type_name());
(handler)(message, &mut cx);
@@ -383,6 +383,10 @@ impl Client {
"RPC message handled. duration:{:?}",
start_time.elapsed()
);
this.state
.write()
.model_handlers
.insert(handler_key, handler);
} else {
log::info!("unhandled message {}", message.payload_type_name());
}