rust/spacepackets
5
1
Fork 0
Code Issues Pull Requests Projects Releases 27 Wiki Activity

Merge branch 'add_cuc_time_impl' into all_features

Browse Source
This commit is contained in:
Robin Müller 2022-12-21 09:37:54 +01:00
commit 0968d60c05
1 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/time/cuc.rs
View File

@ -64,10 +64,20 @@ pub fn fractional_part_from_subsec_ns(
if ns > sec_as_ns { if ns > sec_as_ns {
panic!("passed nanosecond value larger than 1 second"); panic!("passed nanosecond value larger than 1 second");
} }
let resolution = fractional_res_to_div(res) as u64;
// Use integer division because this can reduce code size of really small systems.
// First determine the nanoseconds for the smallest segment given the resolution. // First determine the nanoseconds for the smallest segment given the resolution.
// Then divide by that to find out the fractional part. An integer division floors // Then divide by that to find out the fractional part. For the calculation of the smallest
// which is what we want here. // fraction, we perform a ceiling division. This is because if we would use the default
let fractional_part = ns / (sec_as_ns / fractional_res_to_div(res) as u64); // flooring division, we would divide by a smaller value, thereby allowing the calculation to
// invalid fractional parts which are too large. For the division of the nanoseconds by the
// smallest fraction, a flooring division is correct.
// The multiplication with 100000 is necessary to avoid precision loss during integer division.
// TODO: Floating point division might actually be faster option, but requires additional
// code on small embedded systems..
let fractional_part = ns * 100000 / ((sec_as_ns * 100000 + resolution) / resolution);
// Floating point division.
//let fractional_part = (ns as f64 / ((sec_as_ns as f64) / resolution as f64)).floor() as u32;
Some(FractionalPart(res, fractional_part as u32)) Some(FractionalPart(res, fractional_part as u32))
} }
@ -914,4 +924,25 @@ mod tests {
let res = stamp.update_from_now(); let res = stamp.update_from_now();
assert!(res.is_ok()); assert!(res.is_ok());
} }
#[test]
fn assert_largest_fractions() {
let fractions = fractional_part_from_subsec_ns(FractionalResolution::SixtyNs, 10u64.pow(9) - 1).unwrap();
// The value can not be larger than representable by 3 bytes
// Assert that the maximum resolution can be reached
assert_eq!(fractions.1, 2_u32.pow(3 * 8) - 2);
}
// extern crate test;
// use test::Bencher;
//
// #[bench]
// fn speed_test(b: &mut Bencher) {
// let ns = 10_u32.pow(9) - 1;
// let sec_as_ns = ns + 1;
// let resolution = 2_u32.pow(3 * 8) - 1;
// b.iter(|| {
// ns * 100000 / ((sec_as_ns * 100000 + resolution) / resolution)
// });
// }
} }