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

Use wide columns for r/b too in wide mode

Browse Source 
2 digits are not enough for number of runnable/blocked processes on modern
systems. Changed to 4 digits with given the -w option.

References:
 procps-ng/procps!48
This commit is contained in:
Ivan Skytte Jørgensen 2017-06-08 14:14:50 +02:00 committed by Craig Small
parent 59e378642e
commit 236b956c69
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vmstat.c
View File

@ -241,7 +241,7 @@ static void new_header(void)
const char *header = const char *header =
_("procs -----------memory---------- ---swap-- -----io---- -system-- ------cpu-----"); _("procs -----------memory---------- ---swap-- -----io---- -system-- ------cpu-----");
const char *wide_header = const char *wide_header =
_("procs -----------------------memory---------------------- ---swap-- -----io---- -system-- --------cpu--------"); _("--procs-- -----------------------memory---------------------- ---swap-- -----io---- -system-- --------cpu--------");
const char *timestamp_header = _(" -----timestamp-----"); const char *timestamp_header = _(" -----timestamp-----");
const char format[] = const char format[] =
@ -260,9 +260,9 @@ static void new_header(void)
printf( printf(
w_option ? wide_format : format, w_option ? wide_format : format,
/* Translation Hint: max 2 chars */ /* Translation Hint: max 4 chars */
_("r"), _("r"),
/* Translation Hint: max 2 chars */ /* Translation Hint: max 4 chars */
_("b"), _("b"),
/* Translation Hint: max 6 chars */ /* Translation Hint: max 6 chars */
_("swpd"), _("swpd"),
@ -334,7 +334,7 @@ static void new_format(void)
const char format[] = const char format[] =
"%2lu %2lu %6lu %6lu %6lu %6lu %4u %4u %5u %5u %4u %4u %2u %2u %2u %2u %2u"; "%2lu %2lu %6lu %6lu %6lu %6lu %4u %4u %5u %5u %4u %4u %2u %2u %2u %2u %2u";
const char wide_format[] = const char wide_format[] =
"%2lu %2lu %12lu %12lu %12lu %12lu %4u %4u %5u %5u %4u %4u %3u %3u %3u %3u %3u"; "%4lu %4lu %12lu %12lu %12lu %12lu %4u %4u %5u %5u %4u %4u %3u %3u %3u %3u %3u";
unsigned int tog = 0; /* toggle switch for cleaner code */ unsigned int tog = 0; /* toggle switch for cleaner code */
unsigned int i; unsigned int i;