**** Merged from LIBGTOP_1_1_2_PATCHES ****
This commit is contained in:
@@ -57,9 +57,13 @@ glibtop_get_mem_s (glibtop *server, glibtop_mem *buf)
|
||||
kstat_named_t *kn;
|
||||
int pagesize = server->machine.pagesize;
|
||||
|
||||
#ifndef KSTAT_DATA_UINT32
|
||||
#define ui32 ul
|
||||
#endif
|
||||
|
||||
memset (buf, 0, sizeof (glibtop_mem));
|
||||
|
||||
buf->total = (u_int64_t)sysconf(_SC_PHYS_PAGES) * pagesize;
|
||||
buf->total = (u_int64_t)sysconf(_SC_PHYS_PAGES) << pagesize << 10;
|
||||
buf->flags = _glibtop_sysdeps_mem_os_sysconf;
|
||||
|
||||
if(!kc)
|
||||
@@ -77,18 +81,18 @@ glibtop_get_mem_s (glibtop *server, glibtop_mem *buf)
|
||||
if(kn)
|
||||
{
|
||||
#ifdef _LP64
|
||||
buf->free = kn->value.ui64 * pagesize;
|
||||
buf->free = kn->value.ui64 << pagesize << 10;
|
||||
#else
|
||||
buf->free = kn->value.ui32 * pagesize;
|
||||
buf->free = kn->value.ui32 << pagesize << 10;
|
||||
#endif
|
||||
buf->used = buf->total - buf->free;
|
||||
}
|
||||
kn = (kstat_named_t *)kstat_data_lookup(ksp, "pageslocked");
|
||||
if(kn)
|
||||
#ifdef _LP64
|
||||
buf->locked = kn->value.ui64 * pagesize;
|
||||
buf->locked = kn->value.ui64 << pagesize;
|
||||
#else
|
||||
buf->locked = kn->value.ui32 * pagesize;
|
||||
buf->locked = kn->value.ui32 << pagesize;
|
||||
#endif
|
||||
buf->flags += _glibtop_sysdeps_mem_os_kstat;
|
||||
}
|
||||
@@ -100,23 +104,23 @@ glibtop_get_mem_s (glibtop *server, glibtop_mem *buf)
|
||||
kn = (kstat_named_t *)kstat_data_lookup(ksp, "pages_anon");
|
||||
if(kn)
|
||||
#ifdef _LP64
|
||||
buf->user = kn->value.ui64 * pagesize;
|
||||
buf->user = kn->value.ui64 << pagesize << 10;
|
||||
#else
|
||||
buf->user = kn->value.ui32 * pagesize;
|
||||
buf->user = kn->value.ui32 << pagesize << 10;
|
||||
#endif
|
||||
kn = (kstat_named_t *)kstat_data_lookup(ksp, "pages_exec");
|
||||
if(kn)
|
||||
#ifdef _LP64
|
||||
buf->shared = kn->value.ui64 * pagesize;
|
||||
buf->shared = kn->value.ui64 << pagesize << 10;
|
||||
#else
|
||||
buf->shared = kn->value.ui32 * pagesize;
|
||||
buf->shared = kn->value.ui32 << pagesize << 10;
|
||||
#endif
|
||||
kn = (kstat_named_t *)kstat_data_lookup(ksp, "pages_vnode");
|
||||
if(kn)
|
||||
#ifdef _LP64
|
||||
buf->buffer = kn->value.ui64 * pagesize;
|
||||
buf->buffer = kn->value.ui64 << pagesize << 10;
|
||||
#else
|
||||
buf->buffer = kn->value.ui32 * pagesize;
|
||||
buf->buffer = kn->value.ui32 << pagesize << 10;
|
||||
#endif
|
||||
buf->flags += _glibtop_sysdeps_mem_bunyip;
|
||||
}
|
||||
|
Reference in New Issue
Block a user