Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-21 23:29:34 +00:00
Code Issues Projects Releases Wiki Activity

free: code shrink

Browse Source 
function                                             old     new   delta
free_main                                            330     302     -28

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2010-02-21 05:39:59 +01:00
parent 153fcaa6c1
commit bef5711dab
1 changed files with 48 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
procps/free.c
View File

@ -15,54 +15,67 @@ int free_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int free_main(int argc UNUSED_PARAM, char **argv) int free_main(int argc UNUSED_PARAM, char **argv)
{ {
struct sysinfo info; struct sysinfo info;
unsigned mem_unit;
#if ENABLE_DESKTOP
if (argv[1] && argv[1][0] == '-')
bb_show_usage();
#endif
sysinfo(&info); sysinfo(&info);
/* Kernels prior to 2.4.x will return info.mem_unit==0, so cope... */ /* Kernels prior to 2.4.x will return info.mem_unit==0, so cope... */
if (info.mem_unit == 0) { mem_unit = 1;
info.mem_unit=1; if (info.mem_unit != 0) {
mem_unit = info.mem_unit;
} }
if (info.mem_unit == 1) {
info.mem_unit=1024;
/* TODO: Make all this stuff not overflow when mem >= 4 Gib */ /* Convert values to kbytes */
info.totalram/=info.mem_unit; if (mem_unit == 1) {
info.freeram/=info.mem_unit; info.totalram >>= 10;
info.freeram >>= 10;
#if BB_MMU #if BB_MMU
info.totalswap/=info.mem_unit; info.totalswap >>= 10;
info.freeswap/=info.mem_unit; info.freeswap >>= 10;
#endif #endif
info.sharedram/=info.mem_unit; info.sharedram >>= 10;
info.bufferram/=info.mem_unit; info.bufferram >>= 10;
} else { } else {
info.mem_unit/=1024; mem_unit >>= 10;
/* TODO: Make all this stuff not overflow when mem >= 4 Gib */ /* TODO: Make all this stuff not overflow when mem >= 4 Tb */
info.totalram*=info.mem_unit; info.totalram *= mem_unit;
info.freeram*=info.mem_unit; info.freeram *= mem_unit;
#if BB_MMU #if BB_MMU
info.totalswap*=info.mem_unit; info.totalswap *= mem_unit;
info.freeswap*=info.mem_unit; info.freeswap *= mem_unit;
#endif #endif
info.sharedram*=info.mem_unit; info.sharedram *= mem_unit;
info.bufferram*=info.mem_unit; info.bufferram *= mem_unit;
} }
if (argv[1] && argv[1][0] == '-') printf(" %13s%13s%13s%13s%13s\n",
bb_show_usage(); "total",
"used",
printf("%6s%13s%13s%13s%13s%13s\n", "", "total", "used", "free", "free",
"shared", "buffers"); "shared", "buffers" /* swap and total don't have these columns */
);
printf("%6s%13ld%13ld%13ld%13ld%13ld\n", "Mem:", info.totalram, printf("%6s%13lu%13lu%13lu%13lu%13lu\n", "Mem:",
info.totalram-info.freeram, info.freeram, info.totalram,
info.sharedram, info.bufferram); info.totalram - info.freeram,
info.freeram,
info.sharedram, info.bufferram
);
#if BB_MMU #if BB_MMU
printf("%6s%13ld%13ld%13ld\n", "Swap:", info.totalswap, printf("%6s%13lu%13lu%13lu\n", "Swap:",
info.totalswap-info.freeswap, info.freeswap); info.totalswap,
info.totalswap - info.freeswap,
printf("%6s%13ld%13ld%13ld\n", "Total:", info.totalram+info.totalswap, info.freeswap
);
printf("%6s%13lu%13lu%13lu\n", "Total:",
info.totalram + info.totalswap,
(info.totalram - info.freeram) + (info.totalswap - info.freeswap), (info.totalram - info.freeram) + (info.totalswap - info.freeswap),
info.freeram+info.freeswap); info.freeram + info.freeswap
);
#endif #endif
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }