From ae3e48e1562fc1624f420c0607d4896afb65ed50 Mon Sep 17 00:00:00 2001 From: John Benediktsson Date: Thu, 25 Apr 2013 10:05:57 -0700 Subject: [PATCH] tools.ps: sort-by-pid and print headers. --- basis/tools/ps/macosx/macosx.factor | 5 ++--- basis/tools/ps/ps.factor | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/basis/tools/ps/macosx/macosx.factor b/basis/tools/ps/macosx/macosx.factor index 86e9406b0e..d9db8e9b4f 100644 --- a/basis/tools/ps/macosx/macosx.factor +++ b/basis/tools/ps/macosx/macosx.factor @@ -3,7 +3,7 @@ USING: accessors alien.c-types alien.data alien.syntax arrays assocs byte-arrays classes.struct continuations fry grouping -kernel literals math sequences sorting splitting strings system +kernel literals math sequences splitting strings system system-info.macosx tools.ps unix unix.time unix.types ; QUALIFIED-WITH: alien.c-types c @@ -151,5 +151,4 @@ PRIVATE> M: macosx ps ( -- assoc ) procs [ kp_proc>> p_pid>> 0 > ] filter - [ kp_proc>> [ p_pid>> ] [ ps-arg ] bi ] { } map>assoc - sort-keys ; + [ kp_proc>> [ p_pid>> ] [ ps-arg ] bi ] { } map>assoc ; diff --git a/basis/tools/ps/ps.factor b/basis/tools/ps/ps.factor index b6e41f424e..ce4b808fcf 100644 --- a/basis/tools/ps/ps.factor +++ b/basis/tools/ps/ps.factor @@ -1,6 +1,6 @@ ! Copyright (C) 2012-2013 Doug Coleman, John Benediktsson. ! See http://factorcode.org/license.txt for BSD license. -USING: combinators prettyprint system vocabs ; +USING: combinators prettyprint sequences sorting system vocabs ; IN: tools.ps HOOK: ps os ( -- assoc ) @@ -12,4 +12,4 @@ HOOK: ps os ( -- assoc ) } cond require : ps. ( -- ) - ps simple-table. ; + ps sort-keys { "PID" "CMD" } prefix simple-table. ;