Merge pull request #325 from jonathandturner/fix_ps_again

Fix ps again
This commit is contained in:
Jonathan Turner 2019-08-21 20:15:34 +12:00 committed by GitHub
commit 9c61d6d590
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -2,7 +2,8 @@ use crate::commands::WholeStreamCommand;
use crate::errors::ShellError;
use crate::object::process::process_dict;
use crate::prelude::*;
use sysinfo::SystemExt;
#[allow(unused)]
use sysinfo::{RefreshKind, SystemExt};
pub struct PS;
@ -25,7 +26,20 @@ impl WholeStreamCommand for PS {
}
fn ps(args: CommandArgs, _registry: &CommandRegistry) -> Result<OutputStream, ShellError> {
let system = sysinfo::System::new();
let system;
#[cfg(linux)]
{
system = sysinfo::System::new();
}
#[cfg(not(linux))]
{
let mut sy = sysinfo::System::new_with_specifics(RefreshKind::new().with_processes());
sy.refresh_processes();
system = sy;
}
let list = system.get_process_list();
let list = list