NotAShelf/microfetch
1
1
Fork 0
mirror of https://github.com/NotAShelf/microfetch.git synced 2024-11-01 14:51:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

perf: use nix::sys::utsname::uname for less syscalls (#2)

Browse source 
Instead of reading multiple files to get the `sysname`, `release`, and
`machine` name, use the `nix::sys::utsname::uname` function which sends a
single uname syscall instead. This increases performance and portability.

From my observations, there are ~10 less syscalls.
This commit is contained in:
Ryan 2024-08-05 16:08:25 +08:00 committed by GitHub
parent 17152f9d14
commit 13903539b7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -4,7 +4,7 @@ version = "0.3.3"
edition = "2021" edition = "2021"
[dependencies] [dependencies]
nix = {version = "0.29", features = ["fs", "hostname"]} nix = { version = "0.29", features = ["fs", "hostname", "feature"] }
color-eyre = { version = "0.6", default-features = false } color-eyre = { version = "0.6", default-features = false }
[profile.dev] [profile.dev]

33
src/release.rs
View file

@ -1,30 +1,15 @@
use color_eyre::Result; use color_eyre::Result;
use std::fs::{self, read_to_string}; use std::fs::read_to_string;
use std::io; use std::io;
// Try to detect OS type as accurately as possible and without depending on uname. pub fn get_system_info() -> nix::Result<String> {
// /etc/os-release should generally imply Linux, and /etc/bsd-release would imply BSD system. let utsname = nix::sys::utsname::uname()?;
fn detect_os() -> Result<&'static str, io::Error> { Ok(format!(
if fs::metadata("/etc/os-release").is_ok() || fs::metadata("/usr/lib/os-release").is_ok() { "{} {} ({})",
Ok("Linux") utsname.sysname().to_str().unwrap_or("Unknown"),
} else if fs::metadata("/etc/rc.conf").is_ok() || fs::metadata("/etc/bsd-release").is_ok() { utsname.release().to_str().unwrap_or("Unknown"),
Ok("BSD") utsname.machine().to_str().unwrap_or("Unknown")
} else { ))
Ok("Unknown")
}
}
pub fn get_system_info() -> Result<String, io::Error> {
let system = detect_os()?;
let kernel_release = read_to_string("/proc/sys/kernel/osrelease")?;
let kernel_release = kernel_release.trim();
let architecture = read_to_string("/proc/sys/kernel/arch")?;
let architecture = architecture.trim();
let result = format!("{system} {kernel_release} ({architecture})");
Ok(result)
} }
pub fn get_os_pretty_name() -> Result<String, io::Error> { pub fn get_os_pretty_name() -> Result<String, io::Error> {