Fix memory stats on Darwin, CGO

This commit is contained in:
Johan Walles 2016-02-21 21:45:20 +01:00 committed by Johan Walles
parent 27093ae2d2
commit d109284df3
1 changed files with 13 additions and 7 deletions

View File

@ -9,6 +9,7 @@ package mem
import "C" import "C"
import ( import (
"encoding/binary"
"fmt" "fmt"
"syscall" "syscall"
"unsafe" "unsafe"
@ -28,19 +29,24 @@ func VirtualMemory() (*VirtualMemoryStat, error) {
return nil, fmt.Errorf("host_statistics error=%d", status) return nil, fmt.Errorf("host_statistics error=%d", status)
} }
totalCount := vmstat.wire_count + pageSize := uint64(syscall.Getpagesize())
vmstat.active_count +
vmstat.inactive_count + totalString, err := syscall.Sysctl("hw.memsize")
vmstat.free_count if err != nil {
return nil, err
}
// syscall.sysctl() helpfully removes the last byte of the result if it's 0 :/
totalString += "\x00"
total := uint64(binary.LittleEndian.Uint64([]byte(totalString)))
totalCount := C.natural_t(total / pageSize)
availableCount := vmstat.inactive_count + vmstat.free_count availableCount := vmstat.inactive_count + vmstat.free_count
usedPercent := 100 * float64(totalCount-availableCount) / float64(totalCount) usedPercent := 100 * float64(totalCount-availableCount) / float64(totalCount)
usedCount := totalCount - vmstat.free_count usedCount := totalCount - availableCount
pageSize := uint64(syscall.Getpagesize())
return &VirtualMemoryStat{ return &VirtualMemoryStat{
Total: pageSize * uint64(totalCount), Total: total,
Available: pageSize * uint64(availableCount), Available: pageSize * uint64(availableCount),
Used: pageSize * uint64(usedCount), Used: pageSize * uint64(usedCount),
UsedPercent: usedPercent, UsedPercent: usedPercent,