me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Introduce get_information

Browse source
This commit is contained in:
Richard 2022-04-14 11:15:54 -03:00
parent c9ea1f11de
commit 053f352f68
2 changed files with 41 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

36
winit/src/application.rs
View file

@ -582,40 +582,8 @@ pub fn run_command<Message: 'static + std::fmt::Debug + Send, E: Executor>(
},
command::Action::System(action) => match action {
system::Action::QueryInformation(tag) => {
#[cfg(feature = "sysinfo")]
let information = {
use sysinfo::{
ProcessExt, ProcessorExt, System, SystemExt,
};
let mut system = System::new_all();
system.refresh_all();
let cpu = system.global_processor_info();
let memory_used = sysinfo::get_current_pid()
.and_then(|pid| {
system.process(pid).ok_or("Process not found")
})
.and_then(|process| Ok(process.memory()))
.ok();
let information = system::Information {
system_name: system.name(),
system_kernel: system.kernel_version(),
system_version: system.long_os_version(),
cpu_brand: cpu.brand().into(),
cpu_cores: system.physical_core_count(),
memory_total: system.total_memory(),
memory_used,
graphics_adapter: graphics_info.adapter.clone(),
graphics_backend: graphics_info.backend.clone(),
};
Some(information)
};
#[cfg(not(feature = "sysinfo"))]
let information = None;
let information =
crate::system::get_information(graphics_info);
let message = tag(information);

39
winit/src/system.rs
View file

@ -2,6 +2,8 @@
use crate::command::{self, Command};
pub use iced_native::system::*;
use iced_graphics::window;
/// Query for available system information.
///
/// Returns `None` if not using the `sysinfo` feature flag.
@ -12,3 +14,40 @@ pub fn information<Message>(
Box::new(f),
)))
}
#[cfg(feature = "sysinfo")]
pub(crate) fn get_information(
graphics_info: &window::GraphicsInformation,
) -> Option<Information> {
use sysinfo::{ProcessExt, ProcessorExt, System, SystemExt};
let mut system = System::new_all();
system.refresh_all();
let cpu = system.global_processor_info();
let memory_used = sysinfo::get_current_pid()
.and_then(|pid| system.process(pid).ok_or("Process not found"))
.and_then(|process| Ok(process.memory()))
.ok();
let information = Information {
system_name: system.name(),
system_kernel: system.kernel_version(),
system_version: system.long_os_version(),
cpu_brand: cpu.brand().into(),
cpu_cores: system.physical_core_count(),
memory_total: system.total_memory(),
memory_used,
graphics_adapter: graphics_info.adapter.clone(),
graphics_backend: graphics_info.backend.clone(),
};
Some(information)
}
#[cfg(not(feature = "sysinfo"))]
pub(crate) fn get_information(
_graphics_info: &window::GraphicsInformation,
) -> Option<Information> {
None
}