dan
/
pidusage
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #5 from xNevo/master 

Fixed english typos
This commit is contained in:
David 大伟 2017-07-17 09:56:50 +08:00 committed by GitHub
parent beb3d83057 8d5783c9c4
commit f39c7cf5e2
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pidusage.go
View File

@ -17,7 +17,7 @@ type SysInfo struct {
Memory float64 Memory float64
} }
// Stat will store CUP time struct // Stat will store CPU time struct
type Stat struct { type Stat struct {
utime float64 utime float64
stime float64 stime float64
@ -42,8 +42,7 @@ func wrapper(statType string) func(pid int) (*SysInfo, error) {
} }
func init() { func init() {
platform = runtime.GOOS platform = runtime.GOOS
eol = "\n" if eol = "\n"; strings.Index(platform, "win") == 0 {
if strings.Index(platform, "win") == 0 {
platform = "win" platform = "win"
eol = "\r\n" eol = "\r\n"
} }
@ -79,7 +78,7 @@ func stat(pid int, statType string) (*SysInfo, error) {
stdout, _ := exec.Command("ps", args, strconv.Itoa(pid)).Output() stdout, _ := exec.Command("ps", args, strconv.Itoa(pid)).Output()
ret := formatStdOut(stdout, 1) ret := formatStdOut(stdout, 1)
if len(ret) == 0 { if len(ret) == 0 {
return sysInfo, errors.New("can not foud this pid: " + strconv.Itoa(pid)) return sysInfo, errors.New("Can't find process with this PID: " + strconv.Itoa(pid))
} }
sysInfo.CPU = parseFloat(ret[0]) sysInfo.CPU = parseFloat(ret[0])
sysInfo.Memory = parseFloat(ret[1]) * 1024 sysInfo.Memory = parseFloat(ret[1]) * 1024
@ -105,7 +104,7 @@ func stat(pid int, statType string) (*SysInfo, error) {
splitAfter := strings.SplitAfter(string(procStatFileBytes), ")") splitAfter := strings.SplitAfter(string(procStatFileBytes), ")")
if len(splitAfter) == 0 || len(splitAfter) == 1 { if len(splitAfter) == 0 || len(splitAfter) == 1 {
return sysInfo, errors.New("can not foud this pid: " + strconv.Itoa(pid)) return sysInfo, errors.New("Can't find process with this PID: " + strconv.Itoa(pid))
} }
infos := strings.Split(splitAfter[1], " ") infos := strings.Split(splitAfter[1], " ")
stat := &Stat{ stat := &Stat{