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

free: handle "cached" value too

Browse Source 
function                                             old     new   delta
free_main                                            356     481    +125

Signed-off-by: Guillermo Rodriguez <guille.rodriguez@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Guillermo Rodriguez 2015-01-05 18:34:53 +01:00 committed by Denys Vlasenko
parent da9212667c
commit 75a1403f26
1 changed files with 46 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
procps/free.c
View File

@ -44,11 +44,28 @@ static unsigned long long scale(unsigned long d)
return ((unsigned long long)d * G.mem_unit) >> G_unit_steps; return ((unsigned long long)d * G.mem_unit) >> G_unit_steps;
} }
static unsigned long parse_cached_kb(void)
{
char buf[60]; /* actual lines we expect are ~30 chars or less */
FILE *fp;
unsigned long cached = 0;
fp = xfopen_for_read("/proc/meminfo");
while (fgets(buf, sizeof(buf), fp) != NULL) {
if (sscanf(buf, "Cached: %lu %*s\n", &cached) == 1)
break;
}
if (ENABLE_FEATURE_CLEAN_UP)
fclose(fp);
return cached;
}
int free_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int free_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int free_main(int argc UNUSED_PARAM, char **argv IF_NOT_DESKTOP(UNUSED_PARAM)) int free_main(int argc UNUSED_PARAM, char **argv IF_NOT_DESKTOP(UNUSED_PARAM))
{ {
struct sysinfo info; struct sysinfo info;
unsigned long long cached;
INIT_G(); INIT_G();
@ -73,49 +90,47 @@ int free_main(int argc UNUSED_PARAM, char **argv IF_NOT_DESKTOP(UNUSED_PARAM))
} }
} }
#endif #endif
printf(" %11s%11s%11s%11s%11s%11s\n"
sysinfo(&info); "Mem: ",
/* Kernels prior to 2.4.x will return info.mem_unit==0, so cope... */
G.mem_unit = (info.mem_unit ? info.mem_unit : 1);
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", "cached" /* 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.
*/
); );
#define FIELDS_5 "%13llu%13llu%13llu%13llu%13llu\n" sysinfo(&info);
#define FIELDS_3 (FIELDS_5 + 2*6) /* Kernels prior to 2.4.x will return info.mem_unit==0, so cope... */
#define FIELDS_2 (FIELDS_5 + 3*6) G.mem_unit = (info.mem_unit ? info.mem_unit : 1);
/* Extract cached from /proc/meminfo and convert to mem_units */
cached = ((unsigned long long) parse_cached_kb() * 1024) / G.mem_unit;
printf("Mem: "); #define FIELDS_6 "%11llu%11llu%11llu%11llu%11llu%11llu\n"
printf(FIELDS_5, #define FIELDS_3 (FIELDS_6 + 3*6)
scale(info.totalram), #define FIELDS_2 (FIELDS_6 + 4*6)
scale(info.totalram - info.freeram),
scale(info.freeram), printf(FIELDS_6,
scale(info.sharedram), scale(info.totalram), //total
scale(info.bufferram) scale(info.totalram - info.freeram), //used
scale(info.freeram), //free
scale(info.sharedram), //shared
scale(info.bufferram), //buffers
scale(cached) //cached
); );
/* Show alternate, more meaningful busy/free numbers by counting /* Show alternate, more meaningful busy/free numbers by counting
* buffer cache as free memory (make it "-/+ buffers/cache" * buffer cache as free memory. */
* if/when we add support for "cached" column): */ printf("-/+ buffers/cache:");
printf("-/+ buffers: "); cached += info.freeram;
cached += info.bufferram;
printf(FIELDS_2, printf(FIELDS_2,
scale(info.totalram - info.freeram - info.bufferram), scale(info.totalram - cached), //used
scale(info.freeram + info.bufferram) scale(cached) //free
); );
#if BB_MMU #if BB_MMU
printf("Swap:"); printf("Swap: ");
printf(FIELDS_3, printf(FIELDS_3,
scale(info.totalswap), scale(info.totalswap), //total
scale(info.totalswap - info.freeswap), scale(info.totalswap - info.freeswap), //used
scale(info.freeswap) scale(info.freeswap) //free
); );
#endif #endif
return EXIT_SUCCESS; return EXIT_SUCCESS;