foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-23 15:49:44 -05:00
Code Issues Packages 1 Wiki Activity

chore: resolve clippy errors in windows build (#17215)

Browse source
This commit is contained in:
Geert-Jan Zwiers 2023-01-03 21:04:02 +01:00 committed by Bartek Iwańczuk
parent a012d731ee
commit 43e8b51316
No known key found for this signature in database
GPG key ID: 0C6BCDDC3B3AD750
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
runtime/ops/os/sys_info.rs
View file

@ -302,17 +302,19 @@ pub fn mem_info() -> Option<MemInfo> {
}
pub fn os_uptime() -> u64 {
let mut uptime: u64 = 0;
let uptime: u64;
#[cfg(target_os = "linux")]
{
let mut info = std::mem::MaybeUninit::uninit();
// SAFETY: `info` is a valid pointer to a `libc::sysinfo` struct.
let res = unsafe { libc::sysinfo(info.as_mut_ptr()) };
if res == 0 {
uptime = if res == 0 {
// SAFETY: `sysinfo` initializes the struct.
let info = unsafe { info.assume_init() };
uptime = info.uptime as u64;
info.uptime as u64
} else {
0
}
}
@ -341,8 +343,8 @@ pub fn os_uptime() -> u64 {
0,
)
};
if res == 0 {
uptime = SystemTime::now()
uptime = if res == 0 {
SystemTime::now()
.duration_since(SystemTime::UNIX_EPOCH)
.map(|d| {
(d - Duration::new(
@ -351,15 +353,18 @@ pub fn os_uptime() -> u64 {
))
.as_secs()
})
.unwrap_or_default();
.unwrap_or_default()
} else {
0
}
}
#[cfg(target_family = "windows")]
// SAFETY: windows API usage
unsafe {
// Windows is the only one that returns `uptime` in milisecond precision,
// so we need to get the seconds out of it to be in sync with other envs.
uptime = winapi::um::sysinfoapi::GetTickCount64() as u64 / 1000;
uptime = winapi::um::sysinfoapi::GetTickCount64() / 1000;
}
uptime