Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions mcan/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
Tagging in git follows a pattern: `mcan/<version>`.

## [Unreleased]
- Improve performance of RxDedicatedBuffer::receive_any (#50)

## [0.5.0] - 2024-03-04

Expand Down
17 changes: 6 additions & 11 deletions mcan/src/rx_dedicated_buffers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -124,17 +124,12 @@ impl<'a, P: mcan_core::CanId, M: rx::AnyMessage> DynRxDedicatedBuffer
}

fn receive_any(&mut self) -> nb::Result<Self::Message, Infallible> {
self.memory
.iter()
.enumerate()
.filter(|&(i, _)| self.has_new_data(i))
.map(|(i, m)| (i, m.get()))
.min_by_key(|(_, m)| m.id())
.map(|(i, m)| {
self.mark_buffer_read(i);
m
})
.ok_or(nb::Error::WouldBlock)
let ndat =
(self.ndat1().read().bits() as u64) | ((self.ndat2().read().bits() as u64) << 32);
let idx = ndat.trailing_zeros() as usize;
let m = self.memory.get(idx).ok_or(nb::Error::WouldBlock)?;
self.mark_buffer_read(idx);
Ok(m.get())
}
}

Expand Down