From b6a10e04e7a1c2d09252d1f96c6f020ddf0dad72 Mon Sep 17 00:00:00 2001 From: Justin Yang Date: Sat, 9 Sep 2023 20:32:59 +0800 Subject: [PATCH] disk: Implement Usage for NetBSD --- disk/disk_netbsd.go | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/disk/disk_netbsd.go b/disk/disk_netbsd.go index 062d7739..32f4319d 100644 --- a/disk/disk_netbsd.go +++ b/disk/disk_netbsd.go @@ -111,32 +111,40 @@ func parseDiskstats(buf []byte) (Diskstats, error) { } func UsageWithContext(ctx context.Context, path string) (*UsageStat, error) { - stat := unix.Statfs_t{} - err := unix.Statfs(path, &stat) - if err != nil { - return nil, err - } - bsize := stat.F_bsize + stat := Statvfs{} + flag := uint64(1) // ST_WAIT/MNT_WAIT, see sys/fstypes.h + // request agian to get desired mount data + ret, _, err = unix.Syscall6( + 485, // SYS___fstatvfs190, see sys/syscall.h + uintptr(unsafe.Pointer(&path)), + uintptr(unsafe.Pointer(&stat)), + uintptr(unsafe.Pointer(&flag)), + ) + if err != nil { + return ret, err + } + + bsize := stat.Bsize ret := &UsageStat{ Path: path, Fstype: getFsType(stat), - Total: (uint64(stat.F_blocks) * uint64(bsize)), - Free: (uint64(stat.F_bavail) * uint64(bsize)), - InodesTotal: (uint64(stat.F_files)), - InodesFree: (uint64(stat.F_ffree)), + Total: (uint64(stat.Blocks) * uint64(bsize)), + Free: (uint64(stat.Bavail) * uint64(bsize)), + InodesTotal: (uint64(stat.Files)), + InodesFree: (uint64(stat.Ffree)), } ret.InodesUsed = (ret.InodesTotal - ret.InodesFree) ret.InodesUsedPercent = (float64(ret.InodesUsed) / float64(ret.InodesTotal)) * 100.0 - ret.Used = (uint64(stat.F_blocks) - uint64(stat.F_bfree)) * uint64(bsize) + ret.Used = (uint64(stat.Blocks) - uint64(stat.Bfree)) * uint64(bsize) ret.UsedPercent = (float64(ret.Used) / float64(ret.Total)) * 100.0 return ret, nil } -func getFsType(stat unix.Statfs_t) string { - return common.ByteToString(stat.F_fstypename[:]) +func getFsType(stat Statvfs) string { + return common.ByteToString(stat.Fstypename[:]) } func SerialNumberWithContext(ctx context.Context, name string) (string, error) {