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

free: remove -/+ buffers/cache

Browse Source 
With introduction of the 'available' column
and with the latest changes in the 'used' evaluation
the -/+ buffers/cache line became redundant.
The first value duplicates the 'used'
column and the second value has a more accurate
brother called 'available'.
This commit is contained in:
Jaromir Capik 2014-07-29 21:31:46 +02:00
parent 5a0b972ca0
commit f47001c9e9
1 changed files with 3 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
free.c
View File

@ -49,12 +49,11 @@
#define FREE_HUMANREADABLE (1 << 1) #define FREE_HUMANREADABLE (1 << 1)
#define FREE_LOHI (1 << 2) #define FREE_LOHI (1 << 2)
#define FREE_OLDFMT (1 << 3) #define FREE_WIDE (1 << 3)
#define FREE_TOTAL (1 << 4) #define FREE_TOTAL (1 << 4)
#define FREE_SI (1 << 5) #define FREE_SI (1 << 5)
#define FREE_REPEAT (1 << 6) #define FREE_REPEAT (1 << 6)
#define FREE_REPEATCOUNT (1 << 7) #define FREE_REPEATCOUNT (1 << 7)
#define FREE_WIDE (1 << 8)
struct commandline_arguments { struct commandline_arguments {
int exponent; /* demanded in kilos, magas... */ int exponent; /* demanded in kilos, magas... */
@ -82,7 +81,6 @@ static void __attribute__ ((__noreturn__))
fputs(_(" -h, --human show human-readable output\n"), out); fputs(_(" -h, --human show human-readable output\n"), out);
fputs(_(" --si use powers of 1000 not 1024\n"), out); fputs(_(" --si use powers of 1000 not 1024\n"), out);
fputs(_(" -l, --lohi show detailed low and high memory statistics\n"), out); fputs(_(" -l, --lohi show detailed low and high memory statistics\n"), out);
fputs(_(" -o, --old use old format (without -/+buffers/cache line)\n"), out);
fputs(_(" -t, --total show total for RAM + swap\n"), out); fputs(_(" -t, --total show total for RAM + swap\n"), out);
fputs(_(" -s N, --seconds N repeat printing every N seconds\n"), out); fputs(_(" -s N, --seconds N repeat printing every N seconds\n"), out);
fputs(_(" -c N, --count N repeat printing N times, then exit\n"), out); fputs(_(" -c N, --count N repeat printing N times, then exit\n"), out);
@ -211,7 +209,6 @@ int main(int argc, char **argv)
{ "human", no_argument, NULL, 'h' }, { "human", no_argument, NULL, 'h' },
{ "si", no_argument, NULL, SI_OPTION }, { "si", no_argument, NULL, SI_OPTION },
{ "lohi", no_argument, NULL, 'l' }, { "lohi", no_argument, NULL, 'l' },
{ "old", no_argument, NULL, 'o' },
{ "total", no_argument, NULL, 't' }, { "total", no_argument, NULL, 't' },
{ "seconds", required_argument, NULL, 's' }, { "seconds", required_argument, NULL, 's' },
{ "count", required_argument, NULL, 'c' }, { "count", required_argument, NULL, 'c' },
@ -221,7 +218,7 @@ int main(int argc, char **argv)
{ NULL, 0, NULL, 0 } { NULL, 0, NULL, 0 }
}; };
/* defaults to old format */ /* defaults */
args.exponent = 0; args.exponent = 0;
args.repeat_interval = 1000000; args.repeat_interval = 1000000;
args.repeat_counter = 0; args.repeat_counter = 0;
@ -234,7 +231,7 @@ int main(int argc, char **argv)
textdomain(PACKAGE); textdomain(PACKAGE);
atexit(close_stdout); atexit(close_stdout);
while ((c = getopt_long(argc, argv, "bkmghlotc:ws:V", longopts, NULL)) != -1) while ((c = getopt_long(argc, argv, "bkmghltc:ws:V", longopts, NULL)) != -1)
switch (c) { switch (c) {
case 'b': case 'b':
args.exponent = 1; args.exponent = 1;
@ -260,9 +257,6 @@ int main(int argc, char **argv)
case 'l': case 'l':
flags |= FREE_LOHI; flags |= FREE_LOHI;
break; break;
case 'o':
flags |= FREE_OLDFMT;
break;
case 't': case 't':
flags |= FREE_TOTAL; flags |= FREE_TOTAL;
break; break;
@ -341,15 +335,6 @@ int main(int argc, char **argv)
printf("\n"); printf("\n");
} }
if (!(flags & FREE_OLDFMT)) {
unsigned KLONG buffers_plus_cached = kb_main_buffers + kb_main_cached;
printf(_("-/+ buffers/cache:"));
printf(" %10s",
scale_size(kb_main_used - buffers_plus_cached, flags, args));
printf(" %10s",
scale_size(kb_main_free + buffers_plus_cached, flags, args));
printf("\n");
}
printf("%-7s", _("Swap:")); printf("%-7s", _("Swap:"));
printf(" %10s", scale_size(kb_swap_total, flags, args)); printf(" %10s", scale_size(kb_swap_total, flags, args));
printf(" %10s", scale_size(kb_swap_used, flags, args)); printf(" %10s", scale_size(kb_swap_used, flags, args));