emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

free: more compatible output. +16 bytes. Closes bug 2383.

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-08-12 01:56:44 +02:00
parent 733f26f407
commit 7bfbbd434a
1 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
procps/free.c
View File

@ -53,29 +53,41 @@ int free_main(int argc UNUSED_PARAM, char **argv IF_NOT_DESKTOP(UNUSED_PARAM))
info.bufferram *= mem_unit; info.bufferram *= mem_unit;
} }
printf(" %13s%13s%13s%13s%13s\n", printf(" %13s%13s%13s%13s%13s\n",
"total", "total",
"used", "used",
"free", "free",
"shared", "buffers" /* swap and total don't have these columns */ "shared", "buffers" /* swap and total don't have these columns */
/* procps version 3.2.8 also shows "cached" column, but
* sysinfo() does not provide this value, need to parse
* /proc/meminfo instead and get "Cached: NNN kB" from there.
*/
); );
printf("%6s%13lu%13lu%13lu%13lu%13lu\n", "Mem:", #define FIELDS_5 "%13lu%13lu%13lu%13lu%13lu\n"
#define FIELDS_3 (FIELDS_5 + 2*5)
#define FIELDS_2 (FIELDS_5 + 3*5)
printf("Mem: ");
printf(FIELDS_5,
info.totalram, info.totalram,
info.totalram - info.freeram, info.totalram - info.freeram,
info.freeram, info.freeram,
info.sharedram, info.bufferram info.sharedram, info.bufferram
); );
/* Show alternate, more meaningful busy/free numbers by counting
* buffer cache as free memory (make it "-/+ buffers/cache"
* if/when we add support for "cached" column): */
printf("-/+ buffers: ");
printf(FIELDS_2,
info.totalram - info.freeram - info.bufferram,
info.freeram + info.bufferram
);
#if BB_MMU #if BB_MMU
printf("%6s%13lu%13lu%13lu\n", "Swap:", printf("Swap:");
printf(FIELDS_3,
info.totalswap, info.totalswap,
info.totalswap - info.freeswap, info.totalswap - info.freeswap,
info.freeswap info.freeswap
); );
printf("%6s%13lu%13lu%13lu\n", "Total:",
info.totalram + info.totalswap,
(info.totalram - info.freeram) + (info.totalswap - info.freeswap),
info.freeram + info.freeswap
);
#endif #endif
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }