emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

top: show fewer decimal places for memory (by default)

Browse Source 
After much reflection I've come to the conclusion that
displaying 3 decimal places (usually) when memory data
had been scaled is no longer optimal with today's ever
increasing amounts. And given that not all task memory
fields are the same widths, inconsistencies can easily
arise as illustrated and discussed in the issue below.

Instead of unilaterally reducing the number of decimal
places, this commit will sneak in such a change via an
existing configure option that was very likely unused.

The former 'disable-wide-memory' option has now become
'enable-wide-memory', which can be used if the current
behavior (3 decimal places) is preferred. Without that
option, whenever memory is scaled beyond KiB, just one
decimal place will be shown in Summary and Task areas.

And Task area field width will no longer be changed by
this revised configure option. Instead, all such field
widths will now be fixed at the former maximum values.

Reference(s):
https://gitlab.com/procps-ng/procps/issues/50

[ this patch has been adapted from the master branch ]

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2017-03-13 03:00:00 -05:00 committed by Craig Small
parent 7468e229e8
commit f318be467b
4 changed files with 23 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -10,6 +10,7 @@ procps-ng-NEXT
* top: add config file support for XDG specification * top: add config file support for XDG specification
* pgrep: warn about 15+ char name only if -f not used * pgrep: warn about 15+ char name only if -f not used
* pkill: Return 0 only if we can kill process Debian #852758 * pkill: Return 0 only if we can kill process Debian #852758
* top: show fewer memory decimal places (configurable)
procps-ng-3.3.12 procps-ng-3.3.12
---------------- ----------------

8
configure.ac
View File

@ -223,11 +223,11 @@ if test "x$enable_wide_percent" = xyes; then
fi fi
AC_ARG_ENABLE([wide-memory], AC_ARG_ENABLE([wide-memory],
AS_HELP_STRING([--disable-wide-memory], [disable extra precision under memory fields for top]), AS_HELP_STRING([--enable-wide-memory], [provide extra precision under memory fields for top]),
[], [enable_wide_memory=yes] [], [enable_wide_memory=no]
) )
if test "x$enable_wide_memory" = xno; then if test "x$enable_wide_memory" = xyes; then
AC_DEFINE(NOBOOST_MEMS, 1, [disable extra precision under memory fields for top]) AC_DEFINE(BOOST_MEMORY, 1, [provide extra precision under memory fields for top])
fi fi
AC_ARG_ENABLE([modern-top], AC_ARG_ENABLE([modern-top],

44
top/top.c
View File

@ -1341,11 +1341,11 @@ static inline const char *make_str (const char *str, int width, int justr, int c
* We'll interpret 'num' as a kibibytes quantity and try to * We'll interpret 'num' as a kibibytes quantity and try to
* format it to reach 'target' while also fitting 'width'. */ * format it to reach 'target' while also fitting 'width'. */
static const char *scale_mem (int target, long num, int width, int justr) { static const char *scale_mem (int target, long num, int width, int justr) {
#ifndef NOBOOST_MEMS
// SK_Kb SK_Mb SK_Gb SK_Tb SK_Pb SK_Eb // SK_Kb SK_Mb SK_Gb SK_Tb SK_Pb SK_Eb
#ifdef BOOST_MEMORY
static const char *fmttab[] = { "%.0f", "%#.1f%c", "%#.3f%c", "%#.3f%c", "%#.3f%c", NULL }; static const char *fmttab[] = { "%.0f", "%#.1f%c", "%#.3f%c", "%#.3f%c", "%#.3f%c", NULL };
#else #else
static const char *fmttab[] = { "%.0f", "%.0f%c", "%.0f%c", "%.0f%c", "%.0f%c", NULL }; static const char *fmttab[] = { "%.0f", "%.1f%c", "%.1f%c", "%.1f%c", "%.1f%c", NULL };
#endif #endif
static char buf[SMLBUFSIZ]; static char buf[SMLBUFSIZ];
float scaled_num; float scaled_num;
@ -1527,21 +1527,12 @@ static struct {
#else #else
{ 4, -1, A_right, -1, PIDS_MEM_RES }, // ul_int EU_MEM, { 4, -1, A_right, -1, PIDS_MEM_RES }, // ul_int EU_MEM,
#endif #endif
#ifndef NOBOOST_MEMS
{ 7, SK_Kb, A_right, -1, PIDS_MEM_VIRT }, // ul_int EU_VRT { 7, SK_Kb, A_right, -1, PIDS_MEM_VIRT }, // ul_int EU_VRT
{ 6, SK_Kb, A_right, -1, PIDS_VM_SWAP }, // ul_int EU_SWP { 6, SK_Kb, A_right, -1, PIDS_VM_SWAP }, // ul_int EU_SWP
{ 6, SK_Kb, A_right, -1, PIDS_MEM_RES }, // ul_int EU_RES { 6, SK_Kb, A_right, -1, PIDS_MEM_RES }, // ul_int EU_RES
{ 6, SK_Kb, A_right, -1, PIDS_MEM_CODE }, // ul_int EU_COD { 6, SK_Kb, A_right, -1, PIDS_MEM_CODE }, // ul_int EU_COD
{ 7, SK_Kb, A_right, -1, PIDS_MEM_DATA }, // ul_int EU_DAT { 7, SK_Kb, A_right, -1, PIDS_MEM_DATA }, // ul_int EU_DAT
{ 6, SK_Kb, A_right, -1, PIDS_MEM_SHR }, // ul_int EU_SHR { 6, SK_Kb, A_right, -1, PIDS_MEM_SHR }, // ul_int EU_SHR
#else
{ 5, SK_Kb, A_right, -1, PIDS_MEM_VIRT }, // ul_int EU_VRT
{ 4, SK_Kb, A_right, -1, PIDS_VM_SWAP }, // ul_int EU_SWP
{ 4, SK_Kb, A_right, -1, PIDS_MEM_RES }, // ul_int EU_RES
{ 4, SK_Kb, A_right, -1, PIDS_MEM_CODE }, // ul_int EU_COD
{ 5, SK_Kb, A_right, -1, PIDS_MEM_DATA }, // ul_int EU_DAT
{ 4, SK_Kb, A_right, -1, PIDS_MEM_SHR }, // ul_int EU_SHR
#endif
{ 4, -1, A_right, -1, PIDS_FLT_MAJ }, // ul_int EU_FL1 { 4, -1, A_right, -1, PIDS_FLT_MAJ }, // ul_int EU_FL1
{ 4, -1, A_right, -1, PIDS_FLT_MIN }, // ul_int EU_FL2 { 4, -1, A_right, -1, PIDS_FLT_MIN }, // ul_int EU_FL2
{ 4, -1, A_right, -1, PIDS_noop }, // ul_int EU_DRT ( always 0 w/ since 2.6 ) { 4, -1, A_right, -1, PIDS_noop }, // ul_int EU_DRT ( always 0 w/ since 2.6 )
@ -1558,11 +1549,7 @@ static struct {
{ -1, -1, A_left, -1, PIDS_ENVIRON }, // str EU_ENV { -1, -1, A_left, -1, PIDS_ENVIRON }, // str EU_ENV
{ 3, -1, A_right, -1, PIDS_FLT_MAJ_DELTA }, // s_int EU_FV1 { 3, -1, A_right, -1, PIDS_FLT_MAJ_DELTA }, // s_int EU_FV1
{ 3, -1, A_right, -1, PIDS_FLT_MIN_DELTA }, // s_int EU_FV2 { 3, -1, A_right, -1, PIDS_FLT_MIN_DELTA }, // s_int EU_FV2
#ifndef NOBOOST_MEMS
{ 6, SK_Kb, A_right, -1, PIDS_VM_USED }, // ul_int EU_USE { 6, SK_Kb, A_right, -1, PIDS_VM_USED }, // ul_int EU_USE
#else
{ 4, SK_Kb, A_right, -1, PIDS_VM_USED }, // ul_int EU_USE
#endif
{ 10, -1, A_right, -1, PIDS_NS_IPC }, // ul_int EU_NS1 { 10, -1, A_right, -1, PIDS_NS_IPC }, // ul_int EU_NS1
{ 10, -1, A_right, -1, PIDS_NS_MNT }, // ul_int EU_NS2 { 10, -1, A_right, -1, PIDS_NS_MNT }, // ul_int EU_NS2
{ 10, -1, A_right, -1, PIDS_NS_NET }, // ul_int EU_NS3 { 10, -1, A_right, -1, PIDS_NS_NET }, // ul_int EU_NS3
@ -1570,17 +1557,10 @@ static struct {
{ 10, -1, A_right, -1, PIDS_NS_USER }, // ul_int EU_NS5 { 10, -1, A_right, -1, PIDS_NS_USER }, // ul_int EU_NS5
{ 10, -1, A_right, -1, PIDS_NS_UTS }, // ul_int EU_NS6 { 10, -1, A_right, -1, PIDS_NS_UTS }, // ul_int EU_NS6
{ 8, -1, A_left, -1, PIDS_LXCNAME }, // str EU_LXC { 8, -1, A_left, -1, PIDS_LXCNAME }, // str EU_LXC
#ifndef NOBOOST_MEMS
{ 6, SK_Kb, A_right, -1, PIDS_VM_RSS_ANON }, // ul_int EU_RZA { 6, SK_Kb, A_right, -1, PIDS_VM_RSS_ANON }, // ul_int EU_RZA
{ 6, SK_Kb, A_right, -1, PIDS_VM_RSS_FILE }, // ul_int EU_RZF { 6, SK_Kb, A_right, -1, PIDS_VM_RSS_FILE }, // ul_int EU_RZF
{ 6, SK_Kb, A_right, -1, PIDS_VM_RSS_LOCKED }, // ul_int EU_RZL { 6, SK_Kb, A_right, -1, PIDS_VM_RSS_LOCKED }, // ul_int EU_RZL
{ 6, SK_Kb, A_right, -1, PIDS_VM_RSS_SHARED }, // ul_int EU_RZS { 6, SK_Kb, A_right, -1, PIDS_VM_RSS_SHARED }, // ul_int EU_RZS
#else
{ 4, SK_Kb, A_right, -1, PIDS_VM_RSS_ANON }, // ul_int EU_RZA
{ 4, SK_Kb, A_right, -1, PIDS_VM_RSS_FILE }, // ul_int EU_RZF
{ 4, SK_Kb, A_right, -1, PIDS_VM_RSS_LOCKED }, // ul_int EU_RZL
{ 4, SK_Kb, A_right, -1, PIDS_VM_RSS_SHARED }, // ul_int EU_RZS
#endif
{ -1, -1, A_left, -1, PIDS_CGNAME }, // str EU_CGN { -1, -1, A_left, -1, PIDS_CGNAME }, // str EU_CGN
#define eu_LAST EU_CGN #define eu_LAST EU_CGN
// xtra Fieldstab 'pseudo pflag' entries for the newlib interface . . . . . . . // xtra Fieldstab 'pseudo pflag' entries for the newlib interface . . . . . . .
@ -4761,12 +4741,20 @@ numa_nope:
const char *fmts; const char *fmts;
const char *label; const char *label;
} scaletab[] = { } scaletab[] = {
{ 1, "%1.0f ", NULL }, // kibibytes { 1, "%.0f ", NULL }, // kibibytes
{ 1024.0, "%#4.3f ", NULL }, // mebibytes #ifdef BOOST_MEMORY
{ 1024.0*1024, "%#4.3f ", NULL }, // gibibytes { 1024.0, "%#.3f ", NULL }, // mebibytes
{ 1024.0*1024*1024, "%#4.3f ", NULL }, // tebibytes { 1024.0*1024, "%#.3f ", NULL }, // gibibytes
{ 1024.0*1024*1024*1024, "%#4.3f ", NULL }, // pebibytes { 1024.0*1024*1024, "%#.3f ", NULL }, // tebibytes
{ 1024.0*1024*1024*1024*1024, "%#4.3f ", NULL } // exbibytes { 1024.0*1024*1024*1024, "%#.3f ", NULL }, // pebibytes
{ 1024.0*1024*1024*1024*1024, "%#.3f ", NULL } // exbibytes
#else
{ 1024.0, "%#.1f ", NULL }, // mebibytes
{ 1024.0*1024, "%#.1f ", NULL }, // gibibytes
{ 1024.0*1024*1024, "%#.1f ", NULL }, // tebibytes
{ 1024.0*1024*1024*1024, "%#.1f ", NULL }, // pebibytes
{ 1024.0*1024*1024*1024*1024, "%#.1f ", NULL } // exbibytes
#endif
}; };
struct { // 0123456789 struct { // 0123456789
// snprintf contents of each buf (after SK_Kb): 'nnnn.nnn 0' // snprintf contents of each buf (after SK_Kb): 'nnnn.nnn 0'

4
top/top.h
View File

@ -21,8 +21,8 @@
#define _Itop #define _Itop
/* Defines represented in configure.ac ----------------------------- */ /* Defines represented in configure.ac ----------------------------- */
//#define BOOST_PERCNT /* enable extra precision for two % fields */ //#define BOOST_MEMORY /* enable extra precision for mem fields */
//#define NOBOOST_MEMS /* disable extra precision for mem fields */ //#define BOOST_PERCNT /* enable extra precision for 2 % fields */
//#define ORIG_TOPDEFS /* with no rcfile retain original defaults */ //#define ORIG_TOPDEFS /* with no rcfile retain original defaults */
//#define SIGNALS_LESS /* favor reduced signal load over response */ //#define SIGNALS_LESS /* favor reduced signal load over response */