srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

ksupport: fix an exception safety issue. 

Raising from inside a recv! will never send an acknowledgement.
This commit is contained in:
whitequark 2017-03-03 06:31:37 +00:00
parent f121ca20fe
commit 30ac42de3f
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
artiq/firmware/ksupport/lib.rs
View File

@ -318,17 +318,31 @@ extern fn dma_playback(timestamp: i64, name: CSlice<u8>) {
send(&DmaPlaybackRequest(name)); send(&DmaPlaybackRequest(name));
let succeeded = recv!(&DmaPlaybackReply(data) => unsafe { let succeeded = recv!(&DmaPlaybackReply(data) => unsafe {
// Here, we take advantage of the fact that DmaPlaybackReply always refers match data {
// to an entire heap allocation, which is 4-byte-aligned. Some(bytes) => {
let data = match data { Some(bytes) => bytes, None => return false }; // Here, we take advantage of the fact that DmaPlaybackReply always refers
csr::rtio_dma::base_address_write(data.as_ptr() as u64); // to an entire heap allocation, which is 4-byte-aligned.
csr::rtio_dma::base_address_write(bytes.as_ptr() as u64);
csr::rtio_dma::time_offset_write(timestamp as u64);
csr::rtio_dma::time_offset_write(timestamp as u64); rtio_arb_dma();
rtio_arb_dma(); csr::rtio_dma::enable_write(1);
csr::rtio_dma::enable_write(1); while csr::rtio_dma::enable_read() != 0 {}
while csr::rtio_dma::enable_read() != 0 {} rtio_arb_regular();
rtio_arb_regular();
true
}
None => false
}
});
if !succeeded {
println!("DMA trace called {:?} not found", name);
raise!("DMAError",
"DMA trace not found");
}
unsafe {
let status = csr::rtio_dma::error_status_read(); let status = csr::rtio_dma::error_status_read();
let timestamp = csr::rtio_dma::error_timestamp_read(); let timestamp = csr::rtio_dma::error_timestamp_read();
let channel = csr::rtio_dma::error_channel_read(); let channel = csr::rtio_dma::error_channel_read();
@ -356,14 +370,6 @@ extern fn dma_playback(timestamp: i64, name: CSlice<u8>) {
"RTIO busy on channel {0}", "RTIO busy on channel {0}",
channel as i64, 0, 0) channel as i64, 0, 0)
} }
true
});
if !succeeded {
println!("DMA trace called {:?} not found", name);
raise!("DMAError",
"DMA trace not found");
} }
} }