bughz
/
sigar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use vmstat util for freebsd mem.free

This commit is contained in:
Doug MacEachern 2007-08-04 19:02:27 +00:00
parent e35bc28775
commit c8bbb6a75d
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/os/darwin/darwin_sigar.c
View File

@ -340,15 +340,15 @@ static int sigar_vmstat(sigar_t *sigar, struct vmmeter *vmstat)
int sigar_mem_get(sigar_t *sigar, sigar_mem_t *mem) int sigar_mem_get(sigar_t *sigar, sigar_mem_t *mem)
{ {
#ifdef DARWIN #ifdef DARWIN
int status;
vm_statistics_data_t vmstat; vm_statistics_data_t vmstat;
uint64_t mem_total; uint64_t mem_total;
#else #else
unsigned long mem_total; unsigned long mem_total;
int mem_free; struct vmmeter vmstat;
#endif #endif
int mib[2]; int mib[2];
size_t len; size_t len;
int status;
mib[0] = CTL_HW; mib[0] = CTL_HW;
@ -377,14 +377,8 @@ int sigar_mem_get(sigar_t *sigar, sigar_mem_t *mem)
mem->free = vmstat.free_count * sigar->pagesize; mem->free = vmstat.free_count * sigar->pagesize;
#elif defined(__FreeBSD__) #elif defined(__FreeBSD__)
len = sizeof(mem_free); if ((status = sigar_vmstat(sigar, &vmstat)) == SIGAR_OK) {
if (sysctlbyname("vm.stats.vm.v_free_count", mem->free = vmstat.v_free_count;
&mem_free, &len, NULL, 0) == -1)
{
mem->free = 0; /*XXX*/
}
else {
mem->free = mem_free;
mem->free *= sigar->pagesize; mem->free *= sigar->pagesize;
} }
#else #else