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

start freebsd swap.page_{in,out} impl

Browse Source
This commit is contained in:
Doug MacEachern 2007-08-04 18:39:49 +00:00
parent 93f4553c1e
commit 28c04122c7
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -244,7 +244,7 @@ char *sigar_os_error_string(sigar_t *sigar, int err)
} }
} }
#ifdef DARWIN #if defined(DARWIN)
static int sigar_vmstat(sigar_t *sigar, vm_statistics_data_t *vmstat) static int sigar_vmstat(sigar_t *sigar, vm_statistics_data_t *vmstat)
{ {
kern_return_t status; kern_return_t status;
@ -260,6 +260,17 @@ static int sigar_vmstat(sigar_t *sigar, vm_statistics_data_t *vmstat)
return errno; return errno;
} }
} }
#elif defined(__FreeBSD__)
static int sigar_vmstat(sigar_t *sigar, struct vmmeter *vmstat)
{
int status;
status = kread(sigar, vmstat, sizeof(*vmstat),
sigar->koffsets[KOFFSET_VMMETER]);
/* XXX sysctlbyname("vm.stats.vm.*", ...) */
return status;
}
#endif #endif
int sigar_mem_get(sigar_t *sigar, sigar_mem_t *mem) int sigar_mem_get(sigar_t *sigar, sigar_mem_t *mem)
@ -411,13 +422,13 @@ static int getswapinfo_sysctl(struct kvm_swap *swap_ary,
int sigar_swap_get(sigar_t *sigar, sigar_swap_t *swap) int sigar_swap_get(sigar_t *sigar, sigar_swap_t *swap)
{ {
int status;
#if defined(DARWIN) #if defined(DARWIN)
DIR *dirp; DIR *dirp;
struct dirent *ent; struct dirent *ent;
char swapfile[SSTRLEN(VM_DIR) + SSTRLEN("/") + SSTRLEN(SWAPFILE) + 12]; char swapfile[SSTRLEN(VM_DIR) + SSTRLEN("/") + SSTRLEN(SWAPFILE) + 12];
struct stat swapstat; struct stat swapstat;
struct statfs vmfs; struct statfs vmfs;
int status;
vm_statistics_data_t vmstat; vm_statistics_data_t vmstat;
swap->used = swap->total = swap->free = 0; swap->used = swap->total = swap->free = 0;
@ -473,6 +484,7 @@ int sigar_swap_get(sigar_t *sigar, sigar_swap_t *swap)
swap->page_out = vmstat.pageouts; swap->page_out = vmstat.pageouts;
#elif defined(__FreeBSD__) #elif defined(__FreeBSD__)
struct kvm_swap kswap[1]; struct kvm_swap kswap[1];
struct vmmeter vmstat;
if (getswapinfo_sysctl(kswap, 1) != SIGAR_OK) { if (getswapinfo_sysctl(kswap, 1) != SIGAR_OK) {
if (!sigar->kmem) { if (!sigar->kmem) {
@ -495,7 +507,13 @@ int sigar_swap_get(sigar_t *sigar, sigar_swap_t *swap)
swap->used = kswap[0].ksw_used * sigar->pagesize; swap->used = kswap[0].ksw_used * sigar->pagesize;
swap->free = swap->total - swap->used; swap->free = swap->total - swap->used;
swap->page_in = swap->page_out = -1; if ((status = sigar_vmstat(sigar, &vmstat)) == SIGAR_OK) {
swap->page_in = vmstat.v_swapin + vmstat.v_vnodein;
swap->page_out = vmstat.v_swapout + vmstat.v_vnodeout;
}
else {
swap->page_in = swap->page_out = -1;
}
#else #else
/*XXX OpenBSD*/ /*XXX OpenBSD*/
#endif #endif