run go fmt ./...

pull/310/head
Cameron Sparr 8 years ago
parent 3b18639664
commit a213bf5e6d
No known key found for this signature in database
GPG Key ID: 19E67263DCB25D0F

@ -97,7 +97,7 @@ func finishCPUInfo(c *InfoStat) error {
return nil return nil
} }
} }
c.Mhz = value/1000.0 // value is in kHz c.Mhz = value / 1000.0 // value is in kHz
return nil return nil
} }

@ -7,8 +7,8 @@ import (
"encoding/binary" "encoding/binary"
"errors" "errors"
"fmt" "fmt"
"os/exec"
"github.com/shirou/gopsutil/internal/common" "github.com/shirou/gopsutil/internal/common"
"os/exec"
) )
func GetPageSize() (uint64, error) { func GetPageSize() (uint64, error) {

@ -4,7 +4,6 @@
Input to cgo -godefs. Input to cgo -godefs.
*/ */
package mem package mem
/* /*
@ -31,7 +30,5 @@ const (
sizeOfBcachestats = C.sizeof_struct_bcachestats sizeOfBcachestats = C.sizeof_struct_bcachestats
) )
type Uvmexp C.struct_uvmexp type Uvmexp C.struct_uvmexp
type Bcachestats C.struct_bcachestats type Bcachestats C.struct_bcachestats

@ -222,7 +222,7 @@ func IOCounters(pernic bool) ([]IOCountersStat, error) {
} }
if truncated { if truncated {
// run netstat with -I$ifacename // run netstat with -I$ifacename
if out, err = invoke.Command(netstat, "-ibdnWI" + interfaceName);err != nil { if out, err = invoke.Command(netstat, "-ibdnWI"+interfaceName); err != nil {
return nil, err return nil, err
} }
parsedIfaces, err := parseNetstatOutput(string(out)) parsedIfaces, err := parseNetstatOutput(string(out))

@ -43,7 +43,7 @@ func assertLoopbackStat(t *testing.T, err error, stat *IOCountersStat) {
assert.Equal(t, 869107, stat.PacketsRecv) assert.Equal(t, 869107, stat.PacketsRecv)
assert.Equal(t, 0, stat.Errin) assert.Equal(t, 0, stat.Errin)
assert.Equal(t, 169411755, stat.BytesRecv) assert.Equal(t, 169411755, stat.BytesRecv)
assert.Equal(t,869108, stat.PacketsSent) assert.Equal(t, 869108, stat.PacketsSent)
assert.Equal(t, 1, stat.Errout) assert.Equal(t, 1, stat.Errout)
assert.Equal(t, 169411756, stat.BytesSent) assert.Equal(t, 169411756, stat.BytesSent)
} }
@ -119,19 +119,19 @@ func TestParseNetstatTruncated(t *testing.T) {
assert.Equal(t, truncatedIface, nsInterfaces[6].stat.Name) assert.Equal(t, truncatedIface, nsInterfaces[6].stat.Name)
assert.NotNil(t, nsInterfaces[7].linkId) assert.NotNil(t, nsInterfaces[7].linkId)
assert.Equal(t,uint(90), *nsInterfaces[7].linkId) assert.Equal(t, uint(90), *nsInterfaces[7].linkId)
assert.Equal(t, truncatedIface, nsInterfaces[7].stat.Name) assert.Equal(t, truncatedIface, nsInterfaces[7].stat.Name)
assert.NotNil(t, nsInterfaces[8].linkId) assert.NotNil(t, nsInterfaces[8].linkId)
assert.Equal(t, uint(92), *nsInterfaces[8].linkId ) assert.Equal(t, uint(92), *nsInterfaces[8].linkId)
assert.Equal(t, truncatedIface, nsInterfaces[8].stat.Name) assert.Equal(t, truncatedIface, nsInterfaces[8].stat.Name)
assert.NotNil(t, nsInterfaces[9].linkId) assert.NotNil(t, nsInterfaces[9].linkId)
assert.Equal(t, uint(93), *nsInterfaces[9].linkId ) assert.Equal(t, uint(93), *nsInterfaces[9].linkId)
assert.Equal(t, truncatedIface, nsInterfaces[9].stat.Name) assert.Equal(t, truncatedIface, nsInterfaces[9].stat.Name)
assert.NotNil(t, nsInterfaces[10].linkId) assert.NotNil(t, nsInterfaces[10].linkId)
assert.Equal(t, uint(95), *nsInterfaces[10].linkId ) assert.Equal(t, uint(95), *nsInterfaces[10].linkId)
assert.Equal(t, truncatedIface, nsInterfaces[10].stat.Name) assert.Equal(t, truncatedIface, nsInterfaces[10].stat.Name)
mapUsage := newMapInterfaceNameUsage(nsInterfaces) mapUsage := newMapInterfaceNameUsage(nsInterfaces)

@ -12,7 +12,7 @@ import (
) )
func ParseNetstat(output string, mode string, func ParseNetstat(output string, mode string,
iocs map[string]IOCountersStat) (error) { iocs map[string]IOCountersStat) error {
lines := strings.Split(output, "\n") lines := strings.Split(output, "\n")
exists := make([]string, 0, len(lines)-1) exists := make([]string, 0, len(lines)-1)
@ -72,7 +72,7 @@ func ParseNetstat(output string, mode string,
n, present := iocs[values[0]] n, present := iocs[values[0]]
if !present { if !present {
n = IOCountersStat{Name : values[0]} n = IOCountersStat{Name: values[0]}
} }
if mode == "inb" { if mode == "inb" {
n.BytesRecv = parsed[0] n.BytesRecv = parsed[0]

@ -3,8 +3,8 @@
package process package process
import ( import (
"bytes"
"C" "C"
"bytes"
"encoding/binary" "encoding/binary"
"strings" "strings"
"syscall" "syscall"
@ -12,8 +12,8 @@ import (
cpu "github.com/shirou/gopsutil/cpu" cpu "github.com/shirou/gopsutil/cpu"
"github.com/shirou/gopsutil/internal/common" "github.com/shirou/gopsutil/internal/common"
net "github.com/shirou/gopsutil/net"
mem "github.com/shirou/gopsutil/mem" mem "github.com/shirou/gopsutil/mem"
net "github.com/shirou/gopsutil/net"
) )
// MemoryInfoExStat is different between OSes // MemoryInfoExStat is different between OSes
@ -58,7 +58,7 @@ func (p *Process) Exe() (string, error) {
} }
func (p *Process) CmdlineSlice() ([]string, error) { func (p *Process) CmdlineSlice() ([]string, error) {
mib := []int32{CTLKern, KernProcArgs, p.Pid, KernProcArgv } mib := []int32{CTLKern, KernProcArgs, p.Pid, KernProcArgv}
buf, _, err := common.CallSyscall(mib) buf, _, err := common.CallSyscall(mib)
if err != nil { if err != nil {
@ -75,7 +75,7 @@ func (p *Process) CmdlineSlice() ([]string, error) {
strParts = append(strParts, C.GoString(argv)) strParts = append(strParts, C.GoString(argv))
argc++ argc++
argv = *(**C.char)(unsafe.Pointer(uintptr(argvp) + uintptr(argc) * size)) argv = *(**C.char)(unsafe.Pointer(uintptr(argvp) + uintptr(argc)*size))
} }
return strParts, nil return strParts, nil
} }

@ -51,7 +51,6 @@ const (
ArgMax = 256 * 1024 // sys/syslimits.h:#define ARG_MAX ArgMax = 256 * 1024 // sys/syslimits.h:#define ARG_MAX
) )
const ( const (
sizeofPtr = C.sizeofPtr sizeofPtr = C.sizeofPtr
sizeofShort = C.sizeof_short sizeofShort = C.sizeof_short

Loading…
Cancel
Save