2265742209

Build Type

github

Committed by GitHub

Commit Message

<a href="https://github.com/google/OpenSK/commit/<a class=hub.com/google/OpenSK/commit/<a class="double-link" href="https://git"><a class=hub.com/google/OpenSK/commit/<a class="double-link" href="https://git"><a class=hub.com/google/OpenSK/commit/<a class="double-link" href="https://git"><a class=hub.com/google/OpenSK/commit/d32f7d881403dd788fbd9310b8ce13c3330f57d3">d32f7d881">&lt;a href=&quot;https://github.com/google/OpenSK/commit/</a><a class="double-link" href="https://github.com/google/OpenSK/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/google/OpenSK/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/google/OpenSK/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/google/OpenSK/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://git">&lt;a class=</a>hub.com/google/OpenSK/commit/d32f7d881403dd788fbd9310b8ce13c3330f57d3">d32f7d881</a><a href="https://github.com/google/OpenSK/commit/d32f7d881403dd788fbd9310b8ce13c3330f57d3">&quot;&gt;&amp;lt;a href=&amp;quot;https://github.com/google/OpenSK/commit/&lt;/a&gt;&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/google/OpenSK/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/google/OpenSK/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/google/OpenSK/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/google/OpenSK/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/google/OpenSK/commit/d32f7d881403dd788fbd9310b8ce13c3330f57d3&quot;&gt;d32f7d881&lt;/a&gt;&lt;a href=&quot;https://github.com/google/OpenSK/commit/d32f7d881403dd788fbd9310b8ce13c3330f57d3&quot;&gt;&amp;quot;&amp;gt;&amp;amp;lt;a href=&amp;amp;quot;https://github.com/google/OpenSK/commit/&amp;lt;/a&amp;gt;&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://github.com/google/OpenSK/commit/&amp;amp;lt;a class=&amp;amp;quot;double-link&amp;amp;quot; href=&amp;amp;quot;htt... (continued)

Pull Request Pull Request #468: Added own timer.

Run Details

33 of 33 new or added lines in 1 file covered. (100.0%)

13835 of 15669 relevant lines covered (88.3%)

551308.71 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

30.3

/src/timer.rs

trait Timer: Sized {
    fn start(milliseconds: u32) -> Self;
    fn has_elapsed(self) -> Option<Self>;
}

use libtock_core::syscalls;

// see: https://github.com/tock/tock/blob/master/doc/syscalls/00000_alarm.md
mod command_nr {
    pub const _IS_DRIVER_AVAILABLE: usize = 0;
    pub const GET_CLOCK_FREQUENCY: usize = 1;
    pub const GET_CLOCK_VALUE: usize = 2;
    pub const _STOP_ALARM: usize = 3;
    pub const _SET_ALARM: usize = 4;
}
const DRIVER_NUMBER: usize = 0x00000;

struct LibtockAlarmTimer {
    end_tick: usize,
}

fn wrapping_add_u24(lhs: usize, rhs: usize) -> usize {
    lhs.wrapping_add(rhs) & 0xffffff
}
fn wrapping_sub_u24(lhs: usize, rhs: usize) -> usize {
    lhs.wrapping_sub(rhs) & 0xffffff
}

impl Timer for LibtockAlarmTimer {
    fn start(milliseconds: u32) -> Self {
        let clock_frequency =
            syscalls::command(DRIVER_NUMBER, command_nr::GET_CLOCK_FREQUENCY, 0, 0).unwrap_or(0);
        let start_tick =
            syscalls::command(DRIVER_NUMBER, command_nr::GET_CLOCK_VALUE, 0, 0).unwrap_or(0);
        // 32 bits inverted divisor for 1/1000 ( ceil((2^32) / 1000) ), so that (x * INV_DIV) >> 32 ≈ x / 1000
        const INV_DIV: u64 = 4294968;
        let delta_tick = ((clock_frequency as u64 * milliseconds as u64 * INV_DIV) >> 32) as usize;
        // this invariant is necessary for the test in has_elapsed to be correct
        assert!(delta_tick < 0x800000);
        let end_tick = wrapping_add_u24(start_tick, delta_tick);
        Self { end_tick }
    }

    fn has_elapsed(self) -> Option<Self> {
        let cur_tick =
            syscalls::command(DRIVER_NUMBER, command_nr::GET_CLOCK_VALUE, 0, 0).unwrap_or(0);

        if wrapping_sub_u24(self.end_tick, cur_tick) < 0x800000 {
            None
        } else {
            Some(self)
        }
    }
}

#[cfg(test)]
mod test {
    use super::*;

    #[test]
    fn test_wrapping_sub_u24() {
        // non-wrapping cases
        assert_eq!(wrapping_sub_u24(0, 0), 0);
        assert_eq!(wrapping_sub_u24(0xffffff, 0), 0xffffff);
        assert_eq!(wrapping_sub_u24(0xffffff, 0xffffff), 0);
        // wrapping cases
        assert_eq!(wrapping_sub_u24(0, 0xffffff), 1);
        assert_eq!(wrapping_sub_u24(0, 1), 0xffffff);
    }
}

1	trait Timer: Sized {
2	fn start(milliseconds: u32) -> Self;
3	fn has_elapsed(self) -> Option<Self>;
4	}
5
6	use libtock_core::syscalls;
7
8	// see: https://github.com/tock/tock/blob/master/doc/syscalls/00000_alarm.md
9	mod command_nr {
10	pub const _IS_DRIVER_AVAILABLE: usize = 0;
11	pub const GET_CLOCK_FREQUENCY: usize = 1;
12	pub const GET_CLOCK_VALUE: usize = 2;
13	pub const _STOP_ALARM: usize = 3;
14	pub const _SET_ALARM: usize = 4;
15	}
16	const DRIVER_NUMBER: usize = 0x00000;
17
18	struct LibtockAlarmTimer {
19	end_tick: usize,
20	}
21
22	fn wrapping_add_u24(lhs: usize, rhs: usize) -> usize {	×
23	lhs.wrapping_add(rhs) & 0xffffff	×
24	}	×
25	fn wrapping_sub_u24(lhs: usize, rhs: usize) -> usize {	5✔
26	lhs.wrapping_sub(rhs) & 0xffffff	5✔
27	}	5✔
28
29	impl Timer for LibtockAlarmTimer {
30	fn start(milliseconds: u32) -> Self {	×
31	let clock_frequency =	×
32	syscalls::command(DRIVER_NUMBER, command_nr::GET_CLOCK_FREQUENCY, 0, 0).unwrap_or(0);	×
33	let start_tick =	×
34	syscalls::command(DRIVER_NUMBER, command_nr::GET_CLOCK_VALUE, 0, 0).unwrap_or(0);	×
35	// 32 bits inverted divisor for 1/1000 ( ceil((2^32) / 1000) ), so that (x * INV_DIV) >> 32 ≈ x / 1000	×
36	const INV_DIV: u64 = 4294968;	×
37	let delta_tick = ((clock_frequency as u64 * milliseconds as u64 * INV_DIV) >> 32) as usize;	×
38	// this invariant is necessary for the test in has_elapsed to be correct
39	assert!(delta_tick < 0x800000);	×
40	let end_tick = wrapping_add_u24(start_tick, delta_tick);	×
41	Self { end_tick }	×
42	}	×
43
44	fn has_elapsed(self) -> Option<Self> {	×
45	let cur_tick =	×
46	syscalls::command(DRIVER_NUMBER, command_nr::GET_CLOCK_VALUE, 0, 0).unwrap_or(0);	×
47		×
48	if wrapping_sub_u24(self.end_tick, cur_tick) < 0x800000 {	×
49	None	×
50	} else {
51	Some(self)	×
52	}
53	}	×
54	}
55
56	#[cfg(test)]
57	mod test {
58	use super::*;
59
60	#[test]
61	fn test_wrapping_sub_u24() {	1✔
62	// non-wrapping cases
63	assert_eq!(wrapping_sub_u24(0, 0), 0);	1✔
64	assert_eq!(wrapping_sub_u24(0xffffff, 0), 0xffffff);	1✔
65	assert_eq!(wrapping_sub_u24(0xffffff, 0xffffff), 0);	1✔
66	// wrapping cases
67	assert_eq!(wrapping_sub_u24(0, 0xffffff), 1);	1✔
68	assert_eq!(wrapping_sub_u24(0, 1), 0xffffff);	1✔
69	}	1✔
70	}

google / OpenSK / 2265742209

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous