github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-22 14:56:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Review feedback

Browse Source
This commit is contained in:
Alfonso Acosta
2016-02-08 13:41:41 +00:00
parent b08c427618
commit 3dd2d45fe5
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
probe/endpoint/procspy/background_reader_linux.go
View File

@@ -3,6 +3,7 @@ package procspy
import (
"bytes"
"fmt"
"io"
"math"
"sync"
"time"
@@ -122,12 +123,11 @@ func (br *backgroundReader) loop() {
}
}
func (br *backgroundReader) getWalkedProcPid(buf *bytes.Buffer) map[uint64]*Proc {
func (br *backgroundReader) getWalkedProcPid(buf *bytes.Buffer) (map[uint64]*Proc, error) {
br.mtx.Lock()
defer br.mtx.Unlock()
reader := bytes.NewReader(br.readyBuf.Bytes())
buf.ReadFrom(reader)
_, err := io.Copy(buf, br.readyBuf)
return br.readySockets
return br.readySockets, err
}

5
probe/endpoint/procspy/spy_linux.go
View File

@@ -50,7 +50,10 @@ func (s *linuxScanner) Connections(processes bool) (ConnIter, error) {
var procs map[uint64]*Proc
if processes {
procs = s.br.getWalkedProcPid(buf)
var err error
if procs, err = s.br.getWalkedProcPid(buf); err != nil {
return nil, err
}
}
if buf.Len() == 0 {