mudhorn/node_exporter
1
0
Fork 0
mirror of https://github.com/prometheus/node_exporter.git synced 2025-02-02 08:42:31 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fix OpenBSD cache memory information (#1542)

Browse source 
This will now use `bcstats.numbufpages` instead of `uvmexp.vnodepages`.

Inspired by OpenBSD's `src/usr.bin/top`

Signed-off-by: Matthieu Guegan <matthieu.guegan@deindeal.ch>
This commit is contained in:
Matthieu Guegan 2019-12-02 13:41:58 +01:00 committed by Johannes 'fish' Ziemke
parent 0d9d7e961a
commit 2cae917bb7
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
collector/meminfo_openbsd.go
View file

@ -23,6 +23,7 @@ import (
/* /*
#include <sys/param.h> #include <sys/param.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/mount.h>
#include <sys/sysctl.h> #include <sys/sysctl.h>
int int
@ -37,22 +38,39 @@ sysctl_uvmexp(struct uvmexp *uvmexp)
return 0; return 0;
} }
int
sysctl_bcstats(struct bcachestats *bcstats)
{
static int bcstats_mib[] = {CTL_VFS, VFS_GENERIC, VFS_BCACHESTAT};
size_t sz = sizeof(struct bcachestats);
if(sysctl(bcstats_mib, 3, bcstats, &sz, NULL, 0) < 0)
return -1;
return 0;
}
*/ */
import "C" import "C"
func (c *meminfoCollector) getMemInfo() (map[string]float64, error) { func (c *meminfoCollector) getMemInfo() (map[string]float64, error) {
var uvmexp C.struct_uvmexp var uvmexp C.struct_uvmexp
var bcstats C.struct_bcachestats
if _, err := C.sysctl_uvmexp(&uvmexp); err != nil { if _, err := C.sysctl_uvmexp(&uvmexp); err != nil {
return nil, fmt.Errorf("sysctl CTL_VM VM_UVMEXP failed: %v", err) return nil, fmt.Errorf("sysctl CTL_VM VM_UVMEXP failed: %v", err)
} }
if _, err := C.sysctl_bcstats(&bcstats); err != nil {
return nil, fmt.Errorf("sysctl CTL_VFS VFS_GENERIC VFS_BCACHESTAT failed: %v", err)
}
ps := float64(uvmexp.pagesize) ps := float64(uvmexp.pagesize)
// see uvm(9) // see uvm(9)
return map[string]float64{ return map[string]float64{
"active_bytes": ps * float64(uvmexp.active), "active_bytes": ps * float64(uvmexp.active),
"cache_bytes": ps * float64(uvmexp.vnodepages), "cache_bytes": ps * float64(bcstats.numbufpages),
"free_bytes": ps * float64(uvmexp.free), "free_bytes": ps * float64(uvmexp.free),
"inactive_bytes": ps * float64(uvmexp.inactive), "inactive_bytes": ps * float64(uvmexp.inactive),
"size_bytes": ps * float64(uvmexp.npages), "size_bytes": ps * float64(uvmexp.npages),