#include <time.h>
typedef unsigned long long ullong;
-typedef unsigned long ulong;
enum { proc_file_size = 4096 };
// but allows us to allocate only once (at first sample)
// per proc file, and reuse buffer for each sample
if (!pf->file)
- pf->file = (char*)xmalloc(proc_file_size);
+ pf->file = xmalloc(proc_file_size);
readfile_z(pf->file, proc_file_size, pf->name);
}
return pf->file;
static void scale(ullong ul)
{
- char *fmt;
char buf[5];
- char c;
- unsigned v,idx = 0;
- ul *= 10;
- if (ul > 9999*10) { // do not scale if 9999 or less
- while (ul >= 10000) {
- ul /= 1024;
- idx++;
- }
- }
- v = ul; // ullong divisions are expensive, avoid them
-
- fmt = " 123456789";
- if (!idx) { // 9999 or less: use 1234 format
- c = buf[0] = " 123456789"[v/10000];
- if (c!=' ') fmt = "0123456789";
- c = buf[1] = fmt[v/1000%10];
- if (c!=' ') fmt = "0123456789";
- buf[2] = fmt[v/100%10];
- buf[3] = "0123456789"[v/10%10];
- } else {
- if (v>=10*10) { // scaled value is >=10: use 123M format
- c = buf[0] = " 123456789"[v/1000];
- if (c!=' ') fmt = "0123456789";
- buf[1] = fmt[v/100%10];
- buf[2] = "0123456789"[v/10%10];
- } else { // scaled value is <10: use 1.2M format
- buf[0] = "0123456789"[v/10];
- buf[1] = '.';
- buf[2] = "0123456789"[v%10];
- }
- // see http://en.wikipedia.org/wiki/Tera
- buf[3] = " kMGTPEZY"[idx];
- }
- buf[4] = '\0';
+ smart_ulltoa5(ul, buf);
put(buf);
}
}
m_free += m_bufs + m_cached + m_slab;
- switch(s->opt) {
+ switch (s->opt) {
case 'f':
scale(m_free << 10); break;
default: