From ced859f395513d59fcb1e9a9f8a2ba8ad39f4500 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Thu, 12 Mar 2009 21:16:41 +0100
Subject: [PATCH] Add a header to node lists and print more data
This prints the total memory/disk and also adds a header.
---
src/Cluster.hs | 6 +++++-
src/Node.hs | 5 +++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/Cluster.hs b/src/Cluster.hs
index 5de0d8866..d26d8ebf9 100644
--- a/src/Cluster.hs
+++ b/src/Cluster.hs
@@ -569,7 +569,11 @@ printNodes ktn nl =
snl' = map (\ n -> ((fromJust $ lookup (Node.idx n) ktn), n)) snl
m_name = maximum . (map length) . fst . unzip $ snl'
helper = Node.list m_name
- in unlines $ map (uncurry helper) snl'
+ header = printf "%2s %-*s %5s %5s %5s %5s %5s %3s %3s %7s %7s"
+ "N1" m_name "Name" "t_mem" "f_mem" "r_mem"
+ "t_dsk" "f_dsk"
+ "pri" "sec" "p_fmem" "p_fdsk"
+ in unlines $ (header:map (uncurry helper) snl')
-- | Compute the mem and disk covariance.
compDetailedCV :: NodeList -> (Double, Double, Double, Double)
diff --git a/src/Node.hs b/src/Node.hs
index 8bb781d73..160136610 100644
--- a/src/Node.hs
+++ b/src/Node.hs
@@ -212,8 +212,9 @@ list mname n t =
dp = p_dsk t
fn = failN1 t
in
- printf " %c %-*s %5d %5d %5d %3d %3d %.5f %.5f"
+ printf " %c %-*s %5.0f %5d %5d %5.0f %5d %3d %3d %.5f %.5f"
(if fn then '*' else ' ')
- mname n (f_mem t) (r_mem t) ((f_dsk t) `div` 1024)
+ mname n (t_mem t) (f_mem t) (r_mem t)
+ ((t_dsk t) / 1024) ((f_dsk t) `div` 1024)
(length pl) (length sl)
mp dp
--
GitLab