extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-07-01 07:00:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix an assortment of issues

Browse Source
This commit is contained in:
Jonathan Turner
2019-12-24 14:26:47 +13:00
parent be7550822c
commit e7fb15be59
7 changed files with 51 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
crates/nu_plugin_ps/src/main.rs
View File

@ -3,7 +3,7 @@ use futures::executor::block_on;
use futures_util::{StreamExt, TryStreamExt};
use heim::process::{self as process, Process, ProcessResult};
use heim::units::{ratio, Ratio};
use heim::units::{information, ratio, Ratio};
use std::usize;
use nu_errors::ShellError;
@ -22,12 +22,14 @@ impl Ps {
}
}
async fn usage(process: Process) -> ProcessResult<(process::Process, Ratio)> {
async fn usage(process: Process) -> ProcessResult<(process::Process, Ratio, process::Memory)> {
let usage_1 = process.cpu_usage().await?;
futures_timer::Delay::new(Duration::from_millis(100)).await;
let usage_2 = process.cpu_usage().await?;
Ok((process, usage_2 - usage_1))
let memory = process.memory().await?;
Ok((process, usage_2 - usage_1, memory))
}
async fn ps(tag: Tag) -> Vec<Value> {
@ -43,7 +45,7 @@ async fn ps(tag: Tag) -> Vec<Value> {
let mut output = vec![];
while let Some(res) = processes.next().await {
if let Ok((process, usage)) = res {
if let Ok((process, usage, memory)) = res {
let mut dict = TaggedDictBuilder::new(&tag);
dict.insert_untagged("pid", UntaggedValue::int(process.pid()));
if let Ok(name) = process.name().await {
@ -53,6 +55,14 @@ async fn ps(tag: Tag) -> Vec<Value> {
dict.insert_untagged("status", UntaggedValue::string(format!("{:?}", status)));
}
dict.insert_untagged("cpu", UntaggedValue::decimal(usage.get::<ratio::percent>()));
dict.insert_untagged(
"mem",
UntaggedValue::bytes(memory.rss().get::<information::byte>()),
);
dict.insert_untagged(
"virtual",
UntaggedValue::bytes(memory.vms().get::<information::byte>()),
);
output.push(dict.into_value());
}
}