SYS-OSS/FRET-LibAFL
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix llmp CliendId search (#1112)

Browse Source
This commit is contained in:
Andrea Fioraldi 2023-02-28 15:20:24 +01:00 committed by GitHub
parent dc800f0814
commit d36296c654
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libafl/src/bolts/llmp.rs
View File

@ -2642,7 +2642,13 @@ where
// TODO: We could memcpy a range of pending messages, instead of one by one. // TODO: We could memcpy a range of pending messages, instead of one by one.
loop { loop {
let msg = { let msg = {
let client = &mut self.llmp_clients[client_id.0 as usize]; // TODO faster search (e.g. binary search)
let pos = self
.llmp_clients
.iter()
.position(|x| x.id == client_id)
.expect("Fatal error, client ID not found");
let client = &mut self.llmp_clients[pos];
match client.recv()? { match client.recv()? {
None => { None => {
// We're done handling this client // We're done handling this client
@ -2650,7 +2656,7 @@ where
if new_messages { if new_messages {
// set the recv time // set the recv time
// We don't do that in recv() to keep calls to `current_time` to a minimum. // We don't do that in recv() to keep calls to `current_time` to a minimum.
self.llmp_clients[client_id.0 as usize].last_msg_time = current_time(); self.llmp_clients[pos].last_msg_time = current_time();
} }
return Ok(new_messages); return Ok(new_messages);
} }
@ -2717,7 +2723,13 @@ where
// The message is not specifically for use. Let the user handle it, then forward it to the clients, if necessary. // The message is not specifically for use. Let the user handle it, then forward it to the clients, if necessary.
let mut should_forward_msg = true; let mut should_forward_msg = true;
let map = &mut self.llmp_clients[client_id.0 as usize].current_recv_shmem; // TODO faster search (e.g. binary search)
let pos = self
.llmp_clients
.iter()
.position(|x| x.id == client_id)
.expect("Fatal error, client ID not found");
let map = &mut self.llmp_clients[pos].current_recv_shmem;
let msg_buf = (*msg).try_as_slice(map)?; let msg_buf = (*msg).try_as_slice(map)?;
if let LlmpMsgHookResult::Handled = if let LlmpMsgHookResult::Handled =
(on_new_msg)(client_id, (*msg).tag, (*msg).flags, msg_buf)? (on_new_msg)(client_id, (*msg).tag, (*msg).flags, msg_buf)?