[SSI] openssi/procps top.c, 1.1.15.2.2.1, 1.1.15.2.2.2 top.h, 1.1.15.2.2.2, 1.1.15.2.2.3
Roger Tsang <[email protected]> Sun, 29 Aug 2010 17:40:07 +0000
| Newsgroups | gmane.linux.cluster.ssic.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/ssic-linux/openssi/procps
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv17900
Modified Files:
Tag: OPENSSI-CENTOS
top.c top.h
Log Message:
- Fix `top` summary NODE column showing dots. top.c:Fieldstab[] needs to be in sync with p_flags. Regression introduced in 8 August 2010 checkin.
- Reorder SCB_NUMx() macros to match p_flags.
- Add OpenSSI 'e' option to `top` help window.
Index: top.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/procps/Attic/top.c,v
retrieving revision 1.1.15.2.2.1
retrieving revision 1.1.15.2.2.2
diff -u -d -r1.1.15.2.2.1 -r1.1.15.2.2.2
--- top.c 8 Aug 2010 03:41:06 -0000 1.1.15.2.2.1
+++ top.c 29 Aug 2010 17:40:04 -0000 1.1.15.2.2.2
@@ -205,7 +205,6 @@
SCB_NUMx(P_NCE, nice)
SCB_NUMx(P_CPN, processor)
SCB_NUM1(P_CPU, pcpu)
-SCB_NUM1(P_NOD, enode)
// also serves P_TM2 !
static int sort_P_TME (const proc_t **P, const proc_t **Q)
{
@@ -250,6 +249,7 @@
}
SCB_NUM1(P_WCH, wchan)
+SCB_NUM1(P_NOD, enode)
SCB_NUM1(P_FLG, flags)
/* ///////////////////////////////// special sort for prochlp() ! */
@@ -1336,9 +1336,9 @@
// '.fmts' plus runtime supplied conversion args!
{ "XxXx", " COMMAND", " %-*.*s", -1, -1, SF(CMD), "Command name/line", L_EITHER },
{ "YyUu", " WCHAN ", " %-9.9s", -1, -1, SF(WCH), "Sleeping in Function", L_stat },
+ { "[{[{", " NODE", " %-5d", -1, -1, SF(NOD), "Execution Node", L_NONE },
// next entry's special: the 0's will be replaced with '.'!
{ "ZzZz", " Flags ", " %08lx", -1, -1, SF(FLG), "Task Flags <sched.h>", L_stat },
- { "[{[{", " NODE", " %-5d", -1, -1, SF(NOD), "Execution Node", L_NONE },
#if 0
{ "..Qq", " A", " %4.4s", 4, SK_no, SF(PID), "Accessed Page count", L_stat },
{ "..Nn", " TRS", " %4.4s", 4, SK_Kb, SF(PID), "Code in memory (kb)", L_stat },
Index: top.h
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/procps/Attic/top.h,v
retrieving revision 1.1.15.2.2.2
retrieving revision 1.1.15.2.2.3
diff -u -d -r1.1.15.2.2.2 -r1.1.15.2.2.3
--- top.h 8 Aug 2010 18:28:07 -0000 1.1.15.2.2.2
+++ top.h 29 Aug 2010 17:40:04 -0000 1.1.15.2.2.3
@@ -424,6 +424,7 @@
" c,i,S . Toggle: '\01c\02' cmd name/line; '\01i\02' idle tasks; '\01S\02' cumulative time\n" \
" x\05,\01y\05 . Toggle highlights: '\01x\02' sort field; '\01y\02' running tasks\n" \
" z\05,\01b\05 . Toggle: '\01z\02' color/mono; '\01b\02' bold/reverse (only if 'x' or 'y')\n" \
+ " e . Show specific node only\n" \
" u . Show specific user only\n" \
" n or # . Set maximum tasks displayed\n" \
"\n" \
------------------------------------------------------------------------------
Sell apps to millions through the Intel(R) Atom(Tm) Developer Program
Be part of this innovative community and reach millions of netbook users
worldwide. Take advantage of special opportunities to increase revenue and
speed time-to-market. Join now, and jumpstart your future.
http://p.sf.net/sfu/intel-atom-d2d