From def3572629f18c1dae4789ff8ddce716078697ed Mon Sep 17 00:00:00 2001 From: Justin Yang Date: Sun, 17 Sep 2023 01:43:13 +0800 Subject: [PATCH] format the code --- cpu/cpu_netbsd.go | 10 +-- cpu/cpu_netbsd_arm64.go | 4 +- disk/disk_netbsd.go | 124 +++++++++++++++++++------------------- disk/disk_netbsd_arm64.go | 52 ++++++++-------- mem/mem_netbsd.go | 2 +- 5 files changed, 96 insertions(+), 96 deletions(-) diff --git a/cpu/cpu_netbsd.go b/cpu/cpu_netbsd.go index 519ffdb25..1f66be342 100644 --- a/cpu/cpu_netbsd.go +++ b/cpu/cpu_netbsd.go @@ -16,9 +16,9 @@ import ( const ( // sys/sysctl.h - ctlKern = 1 // "high kernel": proc, limits - ctlHw = 6 // CTL_HW - kernCpTime = 51 // KERN_CPTIME + ctlKern = 1 // "high kernel": proc, limits + ctlHw = 6 // CTL_HW + kernCpTime = 51 // KERN_CPTIME ) var ClocksPerSec = float64(100) @@ -67,7 +67,7 @@ func TimesWithContext(ctx context.Context, percpu bool) (ret []TimesStat, err er return ret, err } - stats := (*cpuTimes)(unsafe.Pointer(&buf[0])) + stats := (*cpuTimes)(unsafe.Pointer(&buf[0])) ret = append(ret, TimesStat{ CPU: fmt.Sprintf("cpu%d", i), User: float64(stats.User), @@ -96,7 +96,7 @@ func InfoWithContext(ctx context.Context) ([]InfoStat, error) { if err != nil { return nil, err } - _, err = fmt.Sscanf(mhz, "%f", &c.Mhz) + _, err = fmt.Sscanf(mhz, "%f", &c.Mhz) if err != nil { return nil, err } diff --git a/cpu/cpu_netbsd_arm64.go b/cpu/cpu_netbsd_arm64.go index 8d5cfd9eb..57e14528d 100644 --- a/cpu/cpu_netbsd_arm64.go +++ b/cpu/cpu_netbsd_arm64.go @@ -1,9 +1,9 @@ package cpu type cpuTimes struct { - User uint64 + User uint64 Nice uint64 Sys uint64 - Intr uint64 + Intr uint64 Idle uint64 } diff --git a/disk/disk_netbsd.go b/disk/disk_netbsd.go index d737d3142..5976efadb 100644 --- a/disk/disk_netbsd.go +++ b/disk/disk_netbsd.go @@ -5,58 +5,58 @@ package disk import ( "context" - "unsafe" + "unsafe" "github.com/shirou/gopsutil/v3/internal/common" "golang.org/x/sys/unix" ) const ( - // see sys/fstypes.h and `man 5 statvfs` - MNT_RDONLY = 0x00000001 /* read only filesystem */ - MNT_SYNCHRONOUS = 0x00000002 /* file system written synchronously */ - MNT_NOEXEC = 0x00000004 /* can't exec from filesystem */ - MNT_NOSUID = 0x00000008 /* don't honor setuid bits on fs */ - MNT_NODEV = 0x00000010 /* don't interpret special files */ - MNT_ASYNC = 0x00000040 /* file system written asynchronously */ - MNT_NOATIME = 0x04000000 /* Never update access times in fs */ - MNT_SOFTDEP = 0x80000000 /* Use soft dependencies */ + // see sys/fstypes.h and `man 5 statvfs` + MNT_RDONLY = 0x00000001 /* read only filesystem */ + MNT_SYNCHRONOUS = 0x00000002 /* file system written synchronously */ + MNT_NOEXEC = 0x00000004 /* can't exec from filesystem */ + MNT_NOSUID = 0x00000008 /* don't honor setuid bits on fs */ + MNT_NODEV = 0x00000010 /* don't interpret special files */ + MNT_ASYNC = 0x00000040 /* file system written asynchronously */ + MNT_NOATIME = 0x04000000 /* Never update access times in fs */ + MNT_SOFTDEP = 0x80000000 /* Use soft dependencies */ ) func PartitionsWithContext(ctx context.Context, all bool) ([]PartitionStat, error) { var ret []PartitionStat - - flag := uint64(1) // ST_WAIT/MNT_WAIT, see sys/fstypes.h - - // get required buffer size - emptyBufSize := 0 - r, _, err := unix.Syscall( - 483, // SYS___getvfsstat90 syscall - uintptr(unsafe.Pointer(nil)), - uintptr(unsafe.Pointer(&emptyBufSize)), - uintptr(unsafe.Pointer(&flag)), - ) - if err != 0 { - return ret, err - } - mountedFsCount := uint64(r) - - // calculate the buffer size - bufSize := sizeOfStatvfs * mountedFsCount - buf := make([]Statvfs, mountedFsCount) - - // request agian to get desired mount data - _, _, err = unix.Syscall( - 483, // SYS___getvfsstat90 syscall - uintptr(unsafe.Pointer(&buf[0])), - uintptr(unsafe.Pointer(&bufSize)), - uintptr(unsafe.Pointer(&flag)), - ) - if err != 0 { - return ret, err - } - - for _, stat := range buf { + + flag := uint64(1) // ST_WAIT/MNT_WAIT, see sys/fstypes.h + + // get required buffer size + emptyBufSize := 0 + r, _, err := unix.Syscall( + 483, // SYS___getvfsstat90 syscall + uintptr(unsafe.Pointer(nil)), + uintptr(unsafe.Pointer(&emptyBufSize)), + uintptr(unsafe.Pointer(&flag)), + ) + if err != 0 { + return ret, err + } + mountedFsCount := uint64(r) + + // calculate the buffer size + bufSize := sizeOfStatvfs * mountedFsCount + buf := make([]Statvfs, mountedFsCount) + + // request agian to get desired mount data + _, _, err = unix.Syscall( + 483, // SYS___getvfsstat90 syscall + uintptr(unsafe.Pointer(&buf[0])), + uintptr(unsafe.Pointer(&bufSize)), + uintptr(unsafe.Pointer(&flag)), + ) + if err != 0 { + return ret, err + } + + for _, stat := range buf { opts := []string{"rw"} if stat.Flag&MNT_RDONLY != 0 { opts = []string{"rw"} @@ -102,26 +102,26 @@ func IOCountersWithContext(ctx context.Context, names ...string) (map[string]IOC } func UsageWithContext(ctx context.Context, path string) (*UsageStat, error) { - stat := Statvfs{} - flag := uint64(1) // ST_WAIT/MNT_WAIT, see sys/fstypes.h - - _path, e := unix.BytePtrFromString(path) - if e != nil { - return nil, e - } - - _, _, err := unix.Syscall( - 484, // SYS___statvfs190, see sys/syscall.h - uintptr(unsafe.Pointer(_path)), - uintptr(unsafe.Pointer(&stat)), - uintptr(unsafe.Pointer(&flag)), - ) - if err != 0 { - return nil, err - } - - // frsize is the real block size on NetBSD. See discuss here: https://bugzilla.samba.org/show_bug.cgi?id=11810 - bsize := stat.Frsize + stat := Statvfs{} + flag := uint64(1) // ST_WAIT/MNT_WAIT, see sys/fstypes.h + + _path, e := unix.BytePtrFromString(path) + if e != nil { + return nil, e + } + + _, _, err := unix.Syscall( + 484, // SYS___statvfs190, see sys/syscall.h + uintptr(unsafe.Pointer(_path)), + uintptr(unsafe.Pointer(&stat)), + uintptr(unsafe.Pointer(&flag)), + ) + if err != 0 { + return nil, err + } + + // frsize is the real block size on NetBSD. See discuss here: https://bugzilla.samba.org/show_bug.cgi?id=11810 + bsize := stat.Frsize ret := &UsageStat{ Path: path, Fstype: getFsType(stat), diff --git a/disk/disk_netbsd_arm64.go b/disk/disk_netbsd_arm64.go index a2e806226..dfe48f812 100644 --- a/disk/disk_netbsd_arm64.go +++ b/disk/disk_netbsd_arm64.go @@ -12,34 +12,34 @@ const ( type ( Statvfs struct { - Flag uint64 - Bsize uint64 - Frsize uint64 - Iosize uint64 - Blocks uint64 - Bfree uint64 - Bavail uint64 - Bresvd uint64 - Files uint64 - Ffree uint64 - Favail uint64 - Fresvd uint64 - Syncreads uint64 - Syncwrites uint64 - Asyncreads uint64 - Asyncwrites uint64 - Fsidx _Ctype_struct___0 - Fsid uint64 - Namemax uint64 - Owner uint32 - Spare [4]uint64 - Fstypename [32]uint8 - Mntonname [1024]uint8 - Mntfromname [1024]uint8 - Mntfromlabel [1024]uint8 + Flag uint64 + Bsize uint64 + Frsize uint64 + Iosize uint64 + Blocks uint64 + Bfree uint64 + Bavail uint64 + Bresvd uint64 + Files uint64 + Ffree uint64 + Favail uint64 + Fresvd uint64 + Syncreads uint64 + Syncwrites uint64 + Asyncreads uint64 + Asyncwrites uint64 + Fsidx _Ctype_struct___0 + Fsid uint64 + Namemax uint64 + Owner uint32 + Spare [4]uint64 + Fstypename [32]uint8 + Mntonname [1024]uint8 + Mntfromname [1024]uint8 + Mntfromlabel [1024]uint8 } ) type _Ctype_struct___0 struct { - FsidVal [2]int32 + FsidVal [2]int32 } diff --git a/mem/mem_netbsd.go b/mem/mem_netbsd.go index 6e2be3fa1..d1f54ecaf 100644 --- a/mem/mem_netbsd.go +++ b/mem/mem_netbsd.go @@ -47,7 +47,7 @@ func VirtualMemoryWithContext(ctx context.Context) (*VirtualMemoryStat, error) { ret.Used = ret.Total - ret.Available ret.UsedPercent = float64(ret.Used) / float64(ret.Total) * 100.0 - // Get buffers from vm.bufmem sysctl + // Get buffers from vm.bufmem sysctl ret.Buffers, err = unix.SysctlUint64("vm.bufmem") if err != nil { return nil, err