astatin3/unshell
1
0
Fork 0
mirror of https://github.com/Astatin3/unshell.git synced 2026-06-08 22:38:01 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove hook-path micro-optimizations

Browse Source
This commit is contained in:
Michael Mikovsky
2026-04-26 01:34:51 -06:00
parent 7a9e338d68
commit 01faebc44b
2 changed files with 21 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/protocol/tree/endpoint/hooks.rs
+15 -23
View File
@@ -50,30 +50,22 @@ impl ProtocolEndpoint {
message: DataMessage,
) -> Result<EndpointOutcome, EndpointError> {
let hook_id = header.hook_id.expect("validated");
let host_key = HookKey::new(self.path.clone(), hook_id);
let key = if let Some(key) = self
.hooks
.resolve_active_key_for_host(&host_key, &header.src_path)
let key = if let Some(key) =
self.hooks
.resolve_active_key(&self.path, hook_id, &header.src_path)
{
key
} else if self.hooks.pending(&host_key).is_some_and(|pending| {
pending.caller_src_path == header.src_path
&& pending.procedure_id == message.procedure_id
}) {
let local_ended = self
.hooks
.activate_pending_with_peer_end(&host_key, message.end_hook)
.expect("pending hook was checked above");
if message.end_hook && local_ended {
self.hooks.remove_active(&host_key);
}
return Ok(EndpointOutcome::Local(LocalEvent::Data {
header,
message,
hook_key: host_key,
}));
} else {
return Ok(EndpointOutcome::Dropped);
let pending_key = HookKey::new(self.path.clone(), hook_id);
if self.hooks.pending(&pending_key).is_some_and(|pending| {
pending.caller_src_path == header.src_path
&& pending.procedure_id == message.procedure_id
}) {
self.hooks.activate_pending(&pending_key);
pending_key
} else {
return Ok(EndpointOutcome::Dropped);
}
};
let Some(active) = self.hooks.active(&key) else {
@@ -109,10 +101,9 @@ impl ProtocolEndpoint {
message: FaultMessage,
) -> Result<EndpointOutcome, EndpointError> {
let hook_id = header.hook_id.expect("validated");
let pending_key = HookKey::new(self.path.clone(), hook_id);
if let Some(key) = self
.hooks
.resolve_active_key_for_host(&pending_key, &header.src_path)
.resolve_active_key(&self.path, hook_id, &header.src_path)
{
self.hooks.remove_active(&key);
return Ok(EndpointOutcome::Local(LocalEvent::Fault {
@@ -122,6 +113,7 @@ impl ProtocolEndpoint {
}));
}
let pending_key = HookKey::new(self.path.clone(), hook_id);
if self
.hooks
.pending(&pending_key)