Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Mem.Get for OpenBSD 6.5 #125

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix Mem.Get for OpenBSD 6.5 #125

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 17 additions & 20 deletions sigar_openbsd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,19 @@ package gosigar
#include <sys/sysctl.h>
#include <sys/mount.h>
#include <sys/sched.h>
#include <sys/types.h>
#include <sys/swap.h>
#include <stdlib.h>
typedef int boolean_t;
#include <unistd.h>
#include <uvm/uvm.h>
*/
import "C"

//import "github.com/davecgh/go-spew/spew"

import (
"fmt"
"runtime"
"syscall"
"time"
Expand Down Expand Up @@ -231,24 +235,10 @@ func (self *Uptime) Get() error {
func (self *Mem) Get() error {
n := uintptr(0)

var uvmexp Uvmexp
mib := [2]int32{C.CTL_VM, C.VM_UVMEXP}
n = uintptr(0)
// First we determine how much memory we'll need to pass later on (via `n`)
_, _, errno := syscall.Syscall6(syscall.SYS___SYSCTL, uintptr(unsafe.Pointer(&mib[0])), 2, 0, uintptr(unsafe.Pointer(&n)), 0, 0)
if errno != 0 || n == 0 {
return nil
}

_, _, errno = syscall.Syscall6(syscall.SYS___SYSCTL, uintptr(unsafe.Pointer(&mib[0])), 2, uintptr(unsafe.Pointer(&uvmexp)), uintptr(unsafe.Pointer(&n)), 0, 0)
if errno != 0 || n == 0 {
return nil
}

var bcachestats Bcachestats
mib3 := [3]int32{C.CTL_VFS, C.VFS_GENERIC, C.VFS_BCACHESTAT}
n = uintptr(0)
_, _, errno = syscall.Syscall6(syscall.SYS___SYSCTL, uintptr(unsafe.Pointer(&mib3[0])), 3, 0, uintptr(unsafe.Pointer(&n)), 0, 0)
_, _, errno := syscall.Syscall6(syscall.SYS___SYSCTL, uintptr(unsafe.Pointer(&mib3[0])), 3, 0, uintptr(unsafe.Pointer(&n)), 0, 0)
if errno != 0 || n == 0 {
return nil
}
Expand All @@ -257,12 +247,19 @@ func (self *Mem) Get() error {
return nil
}

self.Total = uint64(uvmexp.npages) << uvmexp.pageshift
self.Used = uint64(uvmexp.npages-uvmexp.free) << uvmexp.pageshift
self.Free = uint64(uvmexp.free) << uvmexp.pageshift
var uvmexp C.struct_uvmexp
size := C.ulong(unsafe.Sizeof(uvmexp))
mib := [2]int32{C.CTL_VM, C.VM_UVMEXP}
if ret := C.sysctl((*C.int)(unsafe.Pointer(&mib[0])), 2, unsafe.Pointer(&uvmexp), &size, nil, 0); ret < 0 {
return fmt.Errorf("Error calling sysctl: %d", ret)
}

self.Total = uint64(uvmexp.npages) << uint(uvmexp.pageshift)
self.Used = uint64(uvmexp.npages-uvmexp.free) << uint(uvmexp.pageshift)
self.Free = uint64(uvmexp.free) << uint(uvmexp.pageshift)

self.ActualFree = self.Free + (uint64(bcachestats.numbufpages) << uvmexp.pageshift)
self.ActualUsed = self.Used - (uint64(bcachestats.numbufpages) << uvmexp.pageshift)
self.ActualFree = self.Free + (uint64(bcachestats.numbufpages) << uint(uvmexp.pageshift))
self.ActualUsed = self.Used - (uint64(bcachestats.numbufpages) << uint(uvmexp.pageshift))

return nil
}
Expand Down