LailaTheElf/embassy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3603 from embassy-rs/nrf91-free-bufs

Browse Source 
Free tx buffer on ipc send failure
This commit is contained in:
Ulf Lilleengen 2024-12-04 13:26:44 +00:00 committed by GitHub
commit af02310edc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
embassy-net-nrf91/src/lib.rs
View File

@ -507,6 +507,7 @@ impl StateInner {
if data.is_empty() { if data.is_empty() {
msg.data = ptr::null_mut(); msg.data = ptr::null_mut();
msg.data_len = 0; msg.data_len = 0;
self.send_message_raw(msg)
} else { } else {
assert!(data.len() <= TX_BUF_SIZE); assert!(data.len() <= TX_BUF_SIZE);
let buf_idx = self.find_free_tx_buf().ok_or(NoFreeBufs)?; let buf_idx = self.find_free_tx_buf().ok_or(NoFreeBufs)?;
@ -517,10 +518,15 @@ impl StateInner {
self.tx_buf_used[buf_idx] = true; self.tx_buf_used[buf_idx] = true;
fence(Ordering::SeqCst); // synchronize copy_nonoverlapping (non-volatile) with volatile writes below. fence(Ordering::SeqCst); // synchronize copy_nonoverlapping (non-volatile) with volatile writes below.
if let Err(e) = self.send_message_raw(msg) {
msg.data = ptr::null_mut();
msg.data_len = 0;
self.tx_buf_used[buf_idx] = false;
Err(e)
} else {
Ok(())
}
} }
// TODO free data buf if send_message_raw fails.
self.send_message_raw(msg)
} }
fn send_message_raw(&mut self, msg: &Message) -> Result<(), NoFreeBufs> { fn send_message_raw(&mut self, msg: &Message) -> Result<(), NoFreeBufs> {