extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-17 17:41:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bump to latest heim (#1920)

Browse Source 
* Bump to latest heim

* Fix pinning issue
This commit is contained in:
Jonathan Turner
2020-05-31 08:54:33 +12:00
committed by GitHub
parent 4bdf27b173
commit 2dc43775e3
6 changed files with 206 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/nu_plugin_ps/src/nu/mod.rs
View File

@ -18,7 +18,7 @@ impl Plugin for Ps {
}
fn begin_filter(&mut self, callinfo: CallInfo) -> Result<Vec<ReturnValue>, ShellError> {
Ok(block_on(ps(callinfo.name_tag, callinfo.args.has("full")))
Ok(block_on(ps(callinfo.name_tag, callinfo.args.has("full")))?
.into_iter()
.map(ReturnSuccess::value)
.collect())

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

@ -3,6 +3,7 @@ use heim::process::{self as process, Process, ProcessResult};
use heim::units::{information, ratio, Ratio};
use std::usize;
use nu_errors::ShellError;
use nu_protocol::{TaggedDictBuilder, UntaggedValue, Value};
use nu_source::Tag;
@ -27,8 +28,16 @@ async fn usage(process: Process) -> ProcessResult<(process::Process, Ratio, proc
Ok((process, usage_2 - usage_1, memory))
}
pub async fn ps(tag: Tag, full: bool) -> Vec<Value> {
let mut processes = process::processes()
pub async fn ps(tag: Tag, full: bool) -> Result<Vec<Value>, ShellError> {
let processes = process::processes()
.await
.map_err(|_| {
ShellError::labeled_error(
"Unabled to get process list",
"could not load process list",
tag.span,
)
})?
.map_ok(|process| {
// Note that there is no `.await` here,
// as we want to pass the returned future
@ -36,6 +45,7 @@ pub async fn ps(tag: Tag, full: bool) -> Vec<Value> {
usage(process)
})
.try_buffer_unordered(usize::MAX);
futures::pin_mut!(processes);
let mut output = vec![];
while let Some(res) = processes.next().await {
@ -80,5 +90,5 @@ pub async fn ps(tag: Tag, full: bool) -> Vec<Value> {
}
}
output
Ok(output)
}