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

use HW_MEMSIZE on darwin for mem.total

Browse Source
This commit is contained in:
Doug MacEachern 2006-01-06 18:50:05 +00:00
parent 57fc445f4b
commit 6e74f8455f
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -226,9 +226,11 @@ int sigar_mem_get(sigar_t *sigar, sigar_mem_t *mem)
vm_statistics_data_t vmstat; vm_statistics_data_t vmstat;
kern_return_t status; kern_return_t status;
mach_msg_type_number_t count = sizeof(vmstat) / sizeof(integer_t); mach_msg_type_number_t count = sizeof(vmstat) / sizeof(integer_t);
uint64_t value64;
#else
unsigned long value;
#endif #endif
int mib[2]; int mib[2];
unsigned long value;
size_t len; size_t len;
mib[0] = CTL_HW; mib[0] = CTL_HW;
@ -239,13 +241,19 @@ int sigar_mem_get(sigar_t *sigar, sigar_mem_t *mem)
return errno; return errno;
} }
#ifdef DARWIN
mib[1] = HW_MEMSIZE;
# define MEM_VAL value64
#else
mib[1] = HW_PHYSMEM; mib[1] = HW_PHYSMEM;
len = sizeof(value); # define MEM_VAL value
if (sysctl(mib, NMIB(mib), &value, &len, NULL, 0) < 0) { #endif
len = sizeof(MEM_VAL);
if (sysctl(mib, NMIB(mib), &MEM_VAL, &len, NULL, 0) < 0) {
return errno; return errno;
} }
mem->total = value; mem->total = MEM_VAL;
#ifdef DARWIN #ifdef DARWIN
status = host_statistics(sigar->mach_port, HOST_VM_INFO, status = host_statistics(sigar->mach_port, HOST_VM_INFO,