Merge branch 'master' of github.com:shirou/gopsutil

disk/disk_freebsd_386.go

@@ -0,0 +1,108 @@
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs types_freebsd.go
+
+package disk
+
+const (
+	sizeofPtr        = 0x4
+	sizeofShort      = 0x2
+	sizeofInt        = 0x4
+	sizeofLong       = 0x4
+	sizeofLongLong   = 0x8
+	sizeofLongDouble = 0x8
+
+	DEVSTAT_NO_DATA = 0x00
+	DEVSTAT_READ    = 0x01
+	DEVSTAT_WRITE   = 0x02
+	DEVSTAT_FREE    = 0x03
+
+	MNT_RDONLY      = 0x00000001
+	MNT_SYNCHRONOUS = 0x00000002
+	MNT_NOEXEC      = 0x00000004
+	MNT_NOSUID      = 0x00000008
+	MNT_UNION       = 0x00000020
+	MNT_ASYNC       = 0x00000040
+	MNT_SUIDDIR     = 0x00100000
+	MNT_SOFTDEP     = 0x00200000
+	MNT_NOSYMFOLLOW = 0x00400000
+	MNT_GJOURNAL    = 0x02000000
+	MNT_MULTILABEL  = 0x04000000
+	MNT_ACLS        = 0x08000000
+	MNT_NOATIME     = 0x10000000
+	MNT_NOCLUSTERR  = 0x40000000
+	MNT_NOCLUSTERW  = 0x80000000
+	MNT_NFS4ACLS    = 0x00000010
+
+	MNT_WAIT    = 1
+	MNT_NOWAIT  = 2
+	MNT_LAZY    = 3
+	MNT_SUSPEND = 4
+)
+
+type (
+	_C_short       int16
+	_C_int         int32
+	_C_long        int32
+	_C_long_long   int64
+	_C_long_double int64
+)
+
+type Statfs struct {
+	Version     uint32
+	Type        uint32
+	Flags       uint64
+	Bsize       uint64
+	Iosize      uint64
+	Blocks      uint64
+	Bfree       uint64
+	Bavail      int64
+	Files       uint64
+	Ffree       int64
+	Syncwrites  uint64
+	Asyncwrites uint64
+	Syncreads   uint64
+	Asyncreads  uint64
+	Spare       [10]uint64
+	Namemax     uint32
+	Owner       uint32
+	Fsid        Fsid
+	Charspare   [80]int8
+	Fstypename  [16]int8
+	Mntfromname [88]int8
+	Mntonname   [88]int8
+}
+type Fsid struct {
+	Val [2]int32
+}
+
+type Devstat struct {
+	Sequence0     uint32
+	Allocated     int32
+	Start_count   uint32
+	End_count     uint32
+	Busy_from     Bintime
+	Dev_links     _Ctype_struct___0
+	Device_number uint32
+	Device_name   [16]int8
+	Unit_number   int32
+	Bytes         [4]uint64
+	Operations    [4]uint64
+	Duration      [4]Bintime
+	Busy_time     Bintime
+	Creation_time Bintime
+	Block_size    uint32
+	Tag_types     [3]uint64
+	Flags         uint32
+	Device_type   uint32
+	Priority      uint32
+	Id            *byte
+	Sequence1     uint32
+}
+type Bintime struct {
+	Sec  int32
+	Frac uint64
+}
+
+type _Ctype_struct___0 struct {
+	Empty uint32
+}

mem/mem_freebsd.go

@@ -6,7 +6,7 @@ import (
 	"os/exec"
 	"strconv"
 	"strings"
-
+	"errors"
 	"github.com/shirou/gopsutil/internal/common"
 )
 
@@ -91,7 +91,6 @@ func SwapMemory() (*SwapMemoryStat, error) {
 	if err != nil {
 		return nil, err
 	}
-	var ret *SwapMemoryStat
 	for _, line := range strings.Split(string(out), "\n") {
 		values := strings.Fields(line)
 		// skip title line
@@ -117,13 +116,13 @@ func SwapMemory() (*SwapMemoryStat, error) {
 			return nil, err
 		}
 
-		ret = &SwapMemoryStat{
+		return &SwapMemoryStat{
 			Total:       total_v,
 			Used:        used_v,
 			Free:        free_v,
 			UsedPercent: up_v,
-		}
+		}, nil
 	}
 
-	return ret, nil
+	return nil, errors.New("no swap devices found")
 }

process/process_freebsd.go

@@ -6,6 +6,8 @@ import (
 	"bytes"
 	"encoding/binary"
 	"unsafe"
+	"strings"
+	"syscall"
 
 	cpu "github.com/shirou/gopsutil/cpu"
 	"github.com/shirou/gopsutil/internal/common"
@@ -53,7 +55,19 @@ func (p *Process) Exe() (string, error) {
 	return "", common.NotImplementedError
 }
 func (p *Process) Cmdline() (string, error) {
-	return "", common.NotImplementedError
+	mib := []int32{CTLKern, KernProc, KernProcArgs, p.Pid}
+	buf, _, err := common.CallSyscall(mib)
+	if err != nil {
+		return "", err
+	}
+	ret := strings.FieldsFunc(string(buf), func(r rune) bool {
+		if r == '\u0000' {
+			return true
+		}
+		return false
+	})
+
+	return strings.Join(ret, " "), nil
 }
 func (p *Process) CreateTime() (int64, error) {
 	return 0, common.NotImplementedError
@@ -121,7 +135,14 @@ func (p *Process) Rlimit() ([]RlimitStat, error) {
 	return rlimit, common.NotImplementedError
 }
 func (p *Process) IOCounters() (*IOCountersStat, error) {
-	return nil, common.NotImplementedError
+	k, err := p.getKProc()
+	if err != nil {
+		return nil, err
+	}
+	return &IOCountersStat{
+		ReadCount:  uint64(k.KiRusage.Inblock),
+		WriteCount: uint64(k.KiRusage.Oublock),
+	}, nil
 }
 func (p *Process) NumCtxSwitches() (*NumCtxSwitchesStat, error) {
 	return nil, common.NotImplementedError
@@ -142,7 +163,15 @@ func (p *Process) Threads() (map[string]string, error) {
 	return ret, common.NotImplementedError
 }
 func (p *Process) CPUTimes() (*cpu.CPUTimesStat, error) {
-	return nil, common.NotImplementedError
+	k, err := p.getKProc()
+	if err != nil {
+		return nil, err
+	}
+	return &cpu.CPUTimesStat{
+		CPU:    "cpu",
+		User:   float64(k.KiRusage.Utime.Sec) + float64(k.KiRusage.Utime.Usec)/1000000,
+		System: float64(k.KiRusage.Stime.Sec) + float64(k.KiRusage.Stime.Usec)/1000000,
+	}, nil
 }
 func (p *Process) CPUAffinity() ([]int32, error) {
 	return nil, common.NotImplementedError
@@ -152,13 +181,16 @@ func (p *Process) MemoryInfo() (*MemoryInfoStat, error) {
 	if err != nil {
 		return nil, err
 	}
-
-	ret := &MemoryInfoStat{
-		RSS: uint64(k.KiRssize),
-		VMS: uint64(k.KiSize),
+	v, err := syscall.Sysctl("vm.stats.vm.v_page_size")
+	if err != nil {
+		return nil, err
 	}
+	pageSize := binary.LittleEndian.Uint16([]byte(v))
 
-	return ret, nil
+	return &MemoryInfoStat{
+		RSS: uint64(k.KiRssize) * uint64(pageSize),
+		VMS: uint64(k.KiSize),
+	}, nil
 }
 func (p *Process) MemoryInfoEx() (*MemoryInfoExStat, error) {
 	return nil, common.NotImplementedError
@@ -241,13 +273,9 @@ func parseKinfoProc(buf []byte) (KinfoProc, error) {
 	var k KinfoProc
 	br := bytes.NewReader(buf)
 	err := binary.Read(br, binary.LittleEndian, &k)
-	if err != nil {
 	return k, err
 }
 
-	return k, nil
-}
-
 func (p *Process) getKProc() (*KinfoProc, error) {
 	mib := []int32{CTLKern, KernProc, KernProcPID, p.Pid}
 

process/process_freebsd_386.go

@@ -10,8 +10,38 @@ const (
 	KernProcPID      = 1  // by process id
 	KernProcProc     = 8  // only return procs
 	KernProcPathname = 12 // path to executable
+	KernProcArgs     = 7  // get/set arguments/proctitle
 )
 
+type Timespec struct {
+	Sec  int32
+	Nsec int32
+}
+
+type Timeval struct {
+	Sec  int32
+	Usec int32
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int32
+	Ixrss    int32
+	Idrss    int32
+	Isrss    int32
+	Minflt   int32
+	Majflt   int32
+	Nswap    int32
+	Inblock  int32
+	Oublock  int32
+	Msgsnd   int32
+	Msgrcv   int32
+	Nsignals int32
+	Nvcsw    int32
+	Nivcsw   int32
+}
+
 // copied from sys/user.h
 type KinfoProc struct {
 	KiStructsize   int32
@@ -83,7 +113,7 @@ type KinfoProc struct {
 	KiNumthreads   int32
 	KiTid          int32
 	KiPri          int32
-	KiRusage       [72]byte
+	KiRusage       Rusage
 	KiRusageCh     [72]byte
 	KiPcb          int32
 	KiKstack       int32

process/process_freebsd_amd64.go

@@ -1,6 +1,5 @@
 // +build freebsd
 // +build amd64
-
 package process
 
 // copied from sys/sysctl.h
@@ -10,8 +9,38 @@ const (
 	KernProcPID      = 1  // by process id
 	KernProcProc     = 8  // only return procs
 	KernProcPathname = 12 // path to executable
+	KernProcArgs     = 7  // get/set arguments/proctitle
 )
 
+type Timespec struct {
+	Sec  int64
+	Nsec int64
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int64
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int64
+	Ixrss    int64
+	Idrss    int64
+	Isrss    int64
+	Minflt   int64
+	Majflt   int64
+	Nswap    int64
+	Inblock  int64
+	Oublock  int64
+	Msgsnd   int64
+	Msgrcv   int64
+	Nsignals int64
+	Nvcsw    int64
+	Nivcsw   int64
+}
+
 // copied from sys/user.h
 type KinfoProc struct {
 	KiStructsize   int32
@@ -83,7 +112,7 @@ type KinfoProc struct {
 	KiNumthreads   int32
 	KiTid          int32
 	KiPri          int32
-	KiRusage       [144]byte
+	KiRusage       Rusage
 	KiRusageCh     [144]byte
 	KiPcb          int64
 	KiKstack       int64