godep update: gopsutil

This commit is contained in:
Cameron Sparr 2015-10-07 16:12:55 -06:00
parent d620651ef6
commit d9f1a60a64
4 changed files with 48 additions and 25 deletions

8
Godeps/Godeps.json generated
View File

@ -197,8 +197,8 @@
}, },
{ {
"ImportPath": "github.com/shirou/gopsutil/host", "ImportPath": "github.com/shirou/gopsutil/host",
"Comment": "1.0.0-153-gc1313e7", "Comment": "1.0.0-161-g3303647",
"Rev": "c1313e76341b18456212c5645d1daa7f132ac50e" "Rev": "3303647209557312e5db51450ea8bbdef56d5176"
}, },
{ {
"ImportPath": "github.com/shirou/gopsutil/load", "ImportPath": "github.com/shirou/gopsutil/load",
@ -217,8 +217,8 @@
}, },
{ {
"ImportPath": "github.com/shirou/gopsutil/process", "ImportPath": "github.com/shirou/gopsutil/process",
"Comment": "1.0.0-153-gc1313e7", "Comment": "1.0.0-161-g3303647",
"Rev": "c1313e76341b18456212c5645d1daa7f132ac50e" "Rev": "3303647209557312e5db51450ea8bbdef56d5176"
}, },
{ {
"ImportPath": "github.com/streadway/amqp", "ImportPath": "github.com/streadway/amqp",

View File

@ -3,25 +3,40 @@
package host package host
type exitStatus struct { const (
Etermination int16 // Process termination status. sizeofPtr = 0x8
Eexit int16 // Process exit status. sizeofShort = 0x2
} sizeofInt = 0x4
type timeval struct { sizeofLong = 0x8
TvSec uint32 // Seconds. sizeofLongLong = 0x8
TvUsec uint32 // Microseconds. )
}
type (
_C_short int16
_C_int int32
_C_long int64
_C_long_long int64
)
type utmp struct { type utmp struct {
Type int16 // Type of login. Type int16
Pid int32 // Process ID of login process. Pad_cgo_0 [2]byte
Line [32]byte // Devicename. Pid int32
ID [4]byte // Inittab ID. Line [32]int8
User [32]byte // Username. Id [4]int8
Host [256]byte // Hostname for remote login. User [32]int8
Exit exitStatus // Exit status of a process marked Host [256]int8
Session int32 // Session ID, used for windowing. Exit exit_status
Tv timeval // Time entry was made. Session int32
AddrV6 [16]byte // Internet address of remote host. Tv UtTv
Unused [20]byte // Reserved for future use. // original is 20 Addr_v6 [4]int32
X__glibc_reserved [20]int8
}
type exit_status struct {
Termination int16
Exit int16
}
type UtTv struct {
TvSec int32
TvUsec int32
} }

View File

@ -596,8 +596,8 @@ func (p *Process) fillFromStat() (string, int32, *cpu.CPUTimesStat, int64, int32
if err != nil { if err != nil {
return "", 0, nil, 0, 0, err return "", 0, nil, 0, 0, err
} }
ctime := (t / uint64(ClockTicks)) + uint64(bootTime)*1000 ctime := (t / uint64(ClockTicks)) + uint64(bootTime)
createTime := int64(ctime) createTime := int64(ctime * 1000)
// p.Nice = mustParseInt32(fields[18]) // p.Nice = mustParseInt32(fields[18])
// use syscall instead of parse Stat file // use syscall instead of parse Stat file

View File

@ -270,9 +270,17 @@ func Test_Process_CreateTime(t *testing.T) {
if err != nil { if err != nil {
t.Errorf("error %v", err) t.Errorf("error %v", err)
} }
if c < 1420000000 { if c < 1420000000 {
t.Errorf("process created time is wrong.") t.Errorf("process created time is wrong.")
} }
gotElapsed := time.Since(time.Unix(int64(c/1000), 0))
maxElapsed := time.Duration(5 * time.Second)
if gotElapsed >= maxElapsed {
t.Errorf("this process has not been running for %v", gotElapsed)
}
} }
func Test_Parent(t *testing.T) { func Test_Parent(t *testing.T) {