mirror-github-bspeice/aeron-rs
1
0
Fork 0
mirror of https://github.com/bspeice/aeron-rs synced 2024-12-21 21:38:09 -05:00
Code Issues Releases Wiki Activity

Fix driver termination

Browse Source 
Turns out when you attempt to write 0 bytes... you write 0 bytes.
This commit is contained in:
Bradlee Speice 2019-11-07 21:06:11 -05:00
parent 88985418e0
commit 4884108e04
4 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
aeron-rs/src/command/flyweight.rs
View File

@ -17,15 +17,16 @@ impl<A> Flyweight<A, Unchecked>
where where
A: AtomicBuffer, A: AtomicBuffer,
{ {
#[allow(clippy::new_ret_no_self)]
pub fn new<S>(buffer: A, offset: IndexT) -> Result<Flyweight<A, S>> pub fn new<S>(buffer: A, offset: IndexT) -> Result<Flyweight<A, S>>
where where
S: Sized S: Sized,
{ {
buffer.overlay::<S>(offset)?; buffer.overlay::<S>(offset)?;
Ok(Flyweight { Ok(Flyweight {
buffer, buffer,
base_offset: offset, base_offset: offset,
_phantom: PhantomData _phantom: PhantomData,
}) })
} }
} }

4
aeron-rs/src/command/terminate_driver.rs
View File

@ -65,4 +65,8 @@ where
} }
self self
} }
pub fn length(&self) -> IndexT {
size_of::<Self>() as IndexT + self.token_length()
}
} }

13
aeron-rs/src/driver_proxy.rs
View File

@ -33,18 +33,15 @@ where
self.client_id self.client_id
} }
pub fn terminate_driver(&mut self, _token_buffer: Option<&[u8]>) -> Result<()> { pub fn terminate_driver(&mut self, token_buffer: Option<&[u8]>) -> Result<()> {
let _client_id = self.client_id; let client_id = self.client_id;
self.write_command_to_driver(|buffer: &mut [u8], _length: &mut IndexT| { self.write_command_to_driver(|buffer: &mut [u8], length: &mut IndexT| {
// UNWRAP: Buffer from `write_command` guaranteed to be long enough for `TerminateDriverDefn` // UNWRAP: Buffer from `write_command` guaranteed to be long enough for `TerminateDriverDefn`
let _request = Flyweight::new::<TerminateDriverDefn>(buffer, 0).unwrap(); let mut request = Flyweight::new::<TerminateDriverDefn>(buffer, 0).unwrap();
// FIXME: Uncommenting this causes termination to not succeed
/*
request.put_client_id(client_id).put_correlation_id(-1); request.put_client_id(client_id).put_correlation_id(-1);
token_buffer.map(|b| request.put_token_buffer(b)); token_buffer.map(|b| request.put_token_buffer(b));
*length = request.token_length(); *length = request.length();
*/
ClientCommand::TerminateDriver ClientCommand::TerminateDriver
}) })

20
aeron-rs/tests/cnc_terminate.rs
View File

@ -3,6 +3,7 @@ use aeron_rs::cnc_descriptor;
use aeron_rs::cnc_descriptor::MetaDataDefinition; use aeron_rs::cnc_descriptor::MetaDataDefinition;
use aeron_rs::concurrent::ringbuffer::ManyToOneRingBuffer; use aeron_rs::concurrent::ringbuffer::ManyToOneRingBuffer;
use aeron_rs::concurrent::AtomicBuffer; use aeron_rs::concurrent::AtomicBuffer;
use aeron_rs::driver_proxy::DriverProxy;
use aeron_rs::util::IndexT; use aeron_rs::util::IndexT;
use memmap::MmapOptions; use memmap::MmapOptions;
use std::ffi::{c_void, CString}; use std::ffi::{c_void, CString};
@ -115,24 +116,11 @@ fn cnc_terminate() {
.to_driver_buffer_length; .to_driver_buffer_length;
let buffer_end = cnc_metadata_len + buffer_len as usize; let buffer_end = cnc_metadata_len + buffer_len as usize;
let mut ring_buffer = ManyToOneRingBuffer::new(&mut mmap[cnc_metadata_len..buffer_end]) let ring_buffer = ManyToOneRingBuffer::new(&mut mmap[cnc_metadata_len..buffer_end])
.expect("Improperly sized buffer"); .expect("Improperly sized buffer");
// 20 bytes: Client ID (8), correlation ID (8), token length (4) let mut driver_proxy = DriverProxy::new(ring_buffer);
let mut terminate_bytes = vec![0u8; 20]; driver_proxy.terminate_driver(None).unwrap();
let client_id = ring_buffer.next_correlation_id();
terminate_bytes.put_i64_ordered(0, client_id).unwrap();
terminate_bytes.put_i64_ordered(8, -1).unwrap();
let term_id: i32 = 0x0E;
ring_buffer
.write(
term_id,
&terminate_bytes,
0,
terminate_bytes.len() as IndexT,
)
.unwrap();
// Wait for the driver to finish // Wait for the driver to finish
// TODO: Timeout, and then set `RUNNING` manually // TODO: Timeout, and then set `RUNNING` manually