extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-12-26 08:59:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix the ps command's virtual mem (#3007)

Browse Source
This commit is contained in:
Jonathan Turner 2021-02-05 18:57:49 +13:00 committed by GitHub
parent 3083346884
commit 67aaf4cb2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
crates/nu_plugin_ps/src/ps.rs
View File

@ -17,40 +17,42 @@ pub async fn ps(tag: Tag, long: bool) -> Result<Vec<Value>, ShellError> {
sys.refresh_all(); sys.refresh_all();
let duration = std::time::Duration::from_millis(500); let duration = std::time::Duration::from_millis(500);
std::thread::sleep(duration); std::thread::sleep(duration);
sys.refresh_all();
let mut output = vec![]; let mut output = vec![];
let result = sys.get_processes(); let result: Vec<_> = sys.get_processes().iter().map(|x| *x.0).collect();
for (pid, process) in result.iter() { for pid in result.into_iter() {
sys.refresh_process(pid);
if let Some(result) = sys.get_process(pid) {
let mut dict = TaggedDictBuilder::new(&tag); let mut dict = TaggedDictBuilder::new(&tag);
dict.insert_untagged("pid", UntaggedValue::int(*pid)); dict.insert_untagged("pid", UntaggedValue::int(pid));
dict.insert_untagged("name", UntaggedValue::string(process.name())); dict.insert_untagged("name", UntaggedValue::string(result.name()));
dict.insert_untagged( dict.insert_untagged(
"status", "status",
UntaggedValue::string(format!("{:?}", process.status())), UntaggedValue::string(format!("{:?}", result.status())),
); );
dict.insert_untagged( dict.insert_untagged(
"cpu", "cpu",
UntaggedValue::decimal_from_float(process.cpu_usage() as f64, tag.span), UntaggedValue::decimal_from_float(result.cpu_usage() as f64, tag.span),
); );
dict.insert_untagged("mem", UntaggedValue::filesize(process.memory() * 1000)); dict.insert_untagged("mem", UntaggedValue::filesize(result.memory() * 1000));
dict.insert_untagged( dict.insert_untagged(
"virtual", "virtual",
UntaggedValue::filesize(process.virtual_memory() * 1000), UntaggedValue::filesize(result.virtual_memory() * 1000),
); );
if long { if long {
if let Some(parent) = process.parent() { if let Some(parent) = result.parent() {
dict.insert_untagged("parent", UntaggedValue::int(parent)); dict.insert_untagged("parent", UntaggedValue::int(parent));
} }
dict.insert_untagged("exe", UntaggedValue::filepath(process.exe())); dict.insert_untagged("exe", UntaggedValue::filepath(result.exe()));
dict.insert_untagged("command", UntaggedValue::string(process.cmd().join(" "))); dict.insert_untagged("command", UntaggedValue::string(result.cmd().join(" ")));
} }
output.push(dict.into_value()); output.push(dict.into_value());
} }
}
Ok(output) Ok(output)
} }