pidusage.go

@@ -9,7 +9,6 @@ import (
 	"runtime"
 	"strconv"
 	"strings"
-	"sync"
 )
 
 // SysInfo will record cpu and memory data
@@ -18,7 +17,7 @@ type SysInfo struct {
 	Memory float64
 }
 
-// Stat will store CPU time struct
+// Stat will store CUP time struct
 type Stat struct {
 	utime  float64
 	stime  float64
@@ -34,7 +33,6 @@ type fn func(int) (*SysInfo, error)
 var fnMap map[string]fn
 var platform string
 var history map[int]Stat
-var historyLock sync.Mutex
 var eol string
 
 func wrapper(statType string) func(pid int) (*SysInfo, error) {
@@ -44,7 +42,8 @@ func wrapper(statType string) func(pid int) (*SysInfo, error) {
 }
 func init() {
 	platform = runtime.GOOS
-	if eol = "\n"; strings.Index(platform, "win") == 0 {
+	eol = "\n"
+	if strings.Index(platform, "win") == 0 {
 		platform = "win"
 		eol = "\r\n"
 	}
@@ -80,7 +79,7 @@ func stat(pid int, statType string) (*SysInfo, error) {
 		stdout, _ := exec.Command("ps", args, strconv.Itoa(pid)).Output()
 		ret := formatStdOut(stdout, 1)
 		if len(ret) == 0 {
-			return sysInfo, errors.New("Can't find process with this PID: " + strconv.Itoa(pid))
+			return sysInfo, errors.New("can not foud this pid: " + strconv.Itoa(pid))
 		}
 		sysInfo.CPU = parseFloat(ret[0])
 		sysInfo.Memory = parseFloat(ret[1]) * 1024
@@ -106,7 +105,7 @@ func stat(pid int, statType string) (*SysInfo, error) {
 		splitAfter := strings.SplitAfter(string(procStatFileBytes), ")")
 
 		if len(splitAfter) == 0 || len(splitAfter) == 1 {
-			return sysInfo, errors.New("Can't find process with this PID: " + strconv.Itoa(pid))
+			return sysInfo, errors.New("can not foud this pid: " + strconv.Itoa(pid))
 		}
 		infos := strings.Split(splitAfter[1], " ")
 		stat := &Stat{
@@ -141,9 +140,7 @@ func stat(pid int, statType string) (*SysInfo, error) {
 			seconds = 1
 		}
 
-		historyLock.Lock()
 		history[pid] = *stat
-		historyLock.Unlock()
 		sysInfo.CPU = (total / seconds) * 100
 		sysInfo.Memory = stat.rss * pageSize
 	}