OrgGo
/
shirou_gopsutil
mirror of https://hub.fastgit.org/shirou/gopsutil.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lint

This commit is contained in:
Antoine Toulme 2023-08-25 14:38:11 -07:00
parent a48fd71137
commit ca71a6db3c
No known key found for this signature in database
GPG Key ID: 63199BF2E58EE4AE
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
internal/common/common_linux.go
View File

@ -73,24 +73,24 @@ func BootTimeWithContext(ctx context.Context) (uint64, error) {
if useStatFile {
return readBootTimeStat(ctx)
} else {
filename := HostProcWithContext(ctx, "uptime")
lines, err := ReadLines(filename)
if err != nil {
return handleBootTimeFileReadErr(err)
}
if len(lines) != 1 {
return 0, fmt.Errorf("wrong uptime format")
}
f := strings.Fields(lines[0])
b, err := strconv.ParseFloat(f[0], 64)
if err != nil {
return 0, err
}
currentTime := float64(time.Now().UnixNano()) / float64(time.Second)
t := currentTime - b
return uint64(t), nil
}
filename := HostProcWithContext(ctx, "uptime")
lines, err := ReadLines(filename)
if err != nil {
return handleBootTimeFileReadErr(err)
}
if len(lines) != 1 {
return 0, fmt.Errorf("wrong uptime format")
}
f := strings.Fields(lines[0])
b, err := strconv.ParseFloat(f[0], 64)
if err != nil {
return 0, err
}
currentTime := float64(time.Now().UnixNano()) / float64(time.Second)
t := currentTime - b
return uint64(t), nil
}
func handleBootTimeFileReadErr(err error) (uint64, error) {
@ -102,7 +102,7 @@ func handleBootTimeFileReadErr(err error) (uint64, error) {
}
currentTime := time.Now().UnixNano() / int64(time.Second)
t := currentTime - info.Uptime
t := currentTime - int64(info.Uptime)
return uint64(t), nil
}
return 0, err

2
process/process_test.go
View File

@ -19,9 +19,9 @@ import (
"time"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/shirou/gopsutil/v3/internal/common"
"github.com/stretchr/testify/require"
)
var mu sync.Mutex