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

Merge pull request #898 from tyldavis/master 

Fix MemoryMaps on ARM
This commit is contained in:
shirou 2020-07-24 12:39:17 +09:00 committed by GitHub
parent 7a4809ba68 8d28f1b305
commit efc768ada6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
process/process_linux.go
View File

@ -576,7 +576,8 @@ func (p *Process) MemoryMapsWithContext(ctx context.Context, grouped bool) (*[]M
if len(field) < 2 { if len(field) < 2 {
continue continue
} }
v := strings.Trim(field[1], " kB") // remove last "kB" v := strings.Trim(field[1], "kB") // remove last "kB"
v = strings.TrimSpace(v)
t, err := strconv.ParseUint(v, 10, 64) t, err := strconv.ParseUint(v, 10, 64)
if err != nil { if err != nil {
return m, err return m, err
@ -610,11 +611,11 @@ func (p *Process) MemoryMapsWithContext(ctx context.Context, grouped bool) (*[]M
blocks := make([]string, 16) blocks := make([]string, 16)
for _, line := range lines { for _, line := range lines {
field := strings.Split(line, " ") fields := strings.Fields(line)
if strings.HasSuffix(field[0], ":") == false { if len(fields) > 0 && !strings.HasSuffix(fields[0], ":") {
// new block section // new block section
if len(blocks) > 0 { if len(blocks) > 0 {
g, err := getBlock(field, blocks) g, err := getBlock(fields, blocks)
if err != nil { if err != nil {
return &ret, err return &ret, err
} }