mirror-github-bspeice/aeron-rs
1
0
Fork 0
mirror of https://github.com/bspeice/aeron-rs synced 2024-11-14 03:58:08 -05:00
Code Issues Releases Wiki Activity

Merge #9

Browse Source 
9: Remove `num` from the build r=bspeice a=bspeice

Don't really need it at the moment, especially given that it doesn't function in a `const` context.
bors r+

Co-authored-by: Bradlee Speice <bradlee@speice.io>
This commit is contained in:
bors[bot] 2019-10-08 03:56:01 +00:00 committed by GitHub
commit 2a1d7354be
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
aeron-rs/Cargo.toml
View File

@ -14,7 +14,6 @@ maintenance = { status = "actively-developed" }
[dependencies] [dependencies]
aeron_driver-sys = { path = "../aeron_driver-sys" } aeron_driver-sys = { path = "../aeron_driver-sys" }
memmap = "0.7" memmap = "0.7"
num = "0.2"
[dev-dependencies] [dev-dependencies]
clap = "2.33" clap = "2.33"

2
aeron-rs/src/client/cnc_descriptor.rs
View File

@ -67,7 +67,7 @@ pub struct MetaDataDefinition {
/// Length of the metadata block in a CnC file. Note that it's not equivalent /// Length of the metadata block in a CnC file. Note that it's not equivalent
/// to the actual struct length. /// to the actual struct length.
pub const META_DATA_LENGTH: usize = pub const META_DATA_LENGTH: usize =
bit::align_usize(size_of::<MetaDataDefinition>(), bit::CACHE_LINE_LENGTH * 2); bit::align(size_of::<MetaDataDefinition>(), bit::CACHE_LINE_LENGTH * 2);
/// Version code for the Aeron CnC file format /// Version code for the Aeron CnC file format
pub const CNC_VERSION: i32 = crate::sematic_version_compose(0, 0, 16); pub const CNC_VERSION: i32 = crate::sematic_version_compose(0, 0, 16);

4
aeron-rs/src/client/concurrent/ring_buffer.rs
View File

@ -147,8 +147,8 @@ impl<'a> ManyToOneRingBuffer<'a> {
self.check_msg_length(length)?; self.check_msg_length(length)?;
let record_len = length + record_descriptor::HEADER_LENGTH; let record_len = length + record_descriptor::HEADER_LENGTH;
let required = bit::align(record_len, record_descriptor::ALIGNMENT); let required = bit::align(record_len as usize, record_descriptor::ALIGNMENT as usize);
let record_index = self.claim_capacity(required)?; let record_index = self.claim_capacity(required as IndexT)?;
// UNWRAP: `claim_capacity` performed bounds checking // UNWRAP: `claim_capacity` performed bounds checking
self.buffer self.buffer

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

@ -24,7 +24,6 @@ pub type Result<T> = ::std::result::Result<T, AeronError>;
/// Bit-level utility functions /// Bit-level utility functions
pub mod bit { pub mod bit {
use crate::util::IndexT; use crate::util::IndexT;
use num::PrimInt;
/// Length of the data blocks used by the CPU cache sub-system in bytes /// Length of the data blocks used by the CPU cache sub-system in bytes
pub const CACHE_LINE_LENGTH: usize = 64; pub const CACHE_LINE_LENGTH: usize = 64;
@ -40,7 +39,7 @@ pub mod bit {
idx > 0 && (idx as u32).is_power_of_two() idx > 0 && (idx as u32).is_power_of_two()
} }
/// Align a specific value to the next largest alignment size. /// Align a `usize` value to the next highest multiple.
/// ///
/// ```rust /// ```rust
/// # use aeron_rs::util::bit::align; /// # use aeron_rs::util::bit::align;
@ -50,15 +49,7 @@ pub mod bit {
/// assert_eq!(align(52, 12), 52); /// assert_eq!(align(52, 12), 52);
/// assert_eq!(align(52, 16), 64); /// assert_eq!(align(52, 16), 64);
/// ``` /// ```
pub fn align<T>(val: T, alignment: T) -> T pub const fn align(val: usize, alignment: usize) -> usize {
where
T: PrimInt,
{
(val + (alignment - T::one())) & !(alignment - T::one())
}
/// Align a `usize` value. See `align` for similar functionality on general types.
pub const fn align_usize(val: usize, alignment: usize) -> usize {
(val + (alignment - 1)) & !(alignment - 1) (val + (alignment - 1)) & !(alignment - 1)
} }
} }