Skip to content

drivers: fix overflow in ClockDevice.sleep_ms #1088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mattnite merged 3 commits into from
Oct 14, 2026
Merged

drivers: fix overflow in ClockDevice.sleep_ms #1088

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77c2b2f
drivers: fix overflow in ClockDevice.sleep_ms
matpala Oct 13, 2026
31d2609
drivers: test the first sleep_ms value that overflowed
matpala Oct 13, 2026
cfb96b2
drivers: drop the AVR note from the sleep_ms comment
matpala Oct 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion drivers/src/base/ClockDevice.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,9 @@ pub fn make_timeout(td: ClockDevice, timeout: mdf.time.Duration) Timeout {
}

pub fn sleep_ms(td: ClockDevice, time_ms: u32) void {
td.sleep_us(time_ms * 1000);
// 1000 = 1024 - 16 - 8, in u64 so that it doesn't overflow.
const ms: u64 = time_ms;
td.sleep_us((ms << 10) - (ms << 4) - (ms << 3));
}

pub fn sleep_us(td: ClockDevice, time_us: u64) void {
Expand Down Expand Up @@ -145,3 +147,14 @@ test TestDevice {
td.sleep_ms(1000);
try std.testing.expectEqual(1_000_000, ttd.get_total_sleep_time());
}

test sleep_ms {
var ttd = TestDevice.init();
const td = ttd.clock_device();

for ([_]u32{ 0, 1, 4_294_967, 4_294_968, std.math.maxInt(u32) }) |time_ms| {
ttd.reset_sleep_time();
td.sleep_ms(time_ms);
try std.testing.expectEqual(@as(u64, time_ms) * 1000, ttd.get_total_sleep_time());
}
}
Loading