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

Windows compatibility fixes

Browse Source
This commit is contained in:
Bradlee Speice 2019-09-24 00:25:12 -04:00
parent 941c18bf37
commit 28900c330e
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/driver.rs
View File

@ -1,7 +1,6 @@
//! Bindings for the C Media Driver //! Bindings for the C Media Driver
use std::ffi::{CStr, CString}; use std::ffi::{CStr, CString};
use std::os::unix::ffi::OsStrExt;
use std::path::Path; use std::path::Path;
use std::ptr; use std::ptr;
@ -24,8 +23,10 @@ impl DriverContext {
/// Set the Aeron directory path that will be used for storing the files /// Set the Aeron directory path that will be used for storing the files
/// Aeron uses to communicate with clients. /// Aeron uses to communicate with clients.
pub fn set_aeron_dir(mut self, path: &Path) -> Self { pub fn set_aeron_dir(mut self, path: &Path) -> Self {
// UNWRAP: Fails only if the path is non-UTF8
let path_bytes = path.to_str().unwrap().as_bytes();
// UNWRAP: Fails only if there is a null byte in the provided path // UNWRAP: Fails only if there is a null byte in the provided path
let c_string = CString::new(path.as_os_str().as_bytes()).unwrap(); let c_string = CString::new(path_bytes).unwrap();
self.aeron_dir = Some(c_string); self.aeron_dir = Some(c_string);
self self
} }
@ -131,12 +132,19 @@ mod tests {
let context = DriverContext::default().set_aeron_dir(&dir_path); let context = DriverContext::default().set_aeron_dir(&dir_path);
let driver_res = MediaDriver::with_context(context); let driver_res = MediaDriver::with_context(context);
// TODO: Why is the error message behavior different on Windows?
let expected_message = if cfg!(target_os = "windows") {
String::new()
} else {
format!("could not recreate aeron dir {}: ", dir_path.display())
};
assert!(driver_res.is_err()); assert!(driver_res.is_err());
assert_eq!( assert_eq!(
driver_res.unwrap_err(), driver_res.unwrap_err(),
DriverError { DriverError {
code: 0, code: 0,
msg: format!("could not recreate aeron dir {}: ", dir_path.display()) msg: expected_message
} }
); );
} }