3c01854575
This was caused by a misuse of the `global_cpu_info` function, which does not contain a valid `cpu_brand` field. To fix this, we now get the first cpu and return it's brand instead. Fixes #2794
43 lines
1.3 KiB
Rust
43 lines
1.3 KiB
Rust
//! Access the native system.
|
|
use crate::graphics::compositor;
|
|
use crate::runtime::system::{Action, Information};
|
|
use crate::runtime::{self, Task};
|
|
|
|
/// Query for available system information.
|
|
pub fn fetch_information() -> Task<Information> {
|
|
runtime::task::oneshot(|channel| {
|
|
runtime::Action::System(Action::QueryInformation(channel))
|
|
})
|
|
}
|
|
|
|
pub(crate) fn information(
|
|
graphics_info: compositor::Information,
|
|
) -> Information {
|
|
use sysinfo::{Process, System};
|
|
let mut system = System::new_all();
|
|
system.refresh_all();
|
|
|
|
let cpu_brand = system
|
|
.cpus()
|
|
.first()
|
|
.map(|cpu| cpu.brand().to_string())
|
|
.unwrap_or_default();
|
|
|
|
let memory_used = sysinfo::get_current_pid()
|
|
.and_then(|pid| system.process(pid).ok_or("Process not found"))
|
|
.map(Process::memory)
|
|
.ok();
|
|
|
|
Information {
|
|
system_name: System::name(),
|
|
system_kernel: System::kernel_version(),
|
|
system_version: System::long_os_version(),
|
|
system_short_version: System::os_version(),
|
|
cpu_brand,
|
|
cpu_cores: system.physical_core_count(),
|
|
memory_total: system.total_memory(),
|
|
memory_used,
|
|
graphics_adapter: graphics_info.adapter,
|
|
graphics_backend: graphics_info.backend,
|
|
}
|
|
}
|