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

Merge pull request #2453 from kinvolk/schu/proc-walker

Browse Source 
proc_linux: don't exec `getNetNamespacePathSuffix()` on every walk
This commit is contained in:
Alfonso Acosta
2017-04-25 15:54:26 +02:00
committed by GitHub
parent 64fadf3c20 1d1f7347ce
commit 372d818804
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
probe/endpoint/procspy/proc_linux.go
View File

@@ -25,10 +25,11 @@ var (
)
type pidWalker struct {
walker process.Walker
tickc <-chan time.Time // Rate-limit clock. Sets the pace when traversing namespaces and /proc/PID/fd/* files.
stopc chan struct{} // Abort walk
fdBlockSize uint64 // Maximum number of /proc/PID/fd/* files to stat() per tick
walker process.Walker
tickc <-chan time.Time // Rate-limit clock. Sets the pace when traversing namespaces and /proc/PID/fd/* files.
stopc chan struct{} // Abort walk
fdBlockSize uint64 // Maximum number of /proc/PID/fd/* files to stat() per tick
netNamespacePathSuffix string
}
func newPidWalker(walker process.Walker, tickc <-chan time.Time, fdBlockSize uint64) pidWalker {
@@ -37,6 +38,7 @@ func newPidWalker(walker process.Walker, tickc <-chan time.Time, fdBlockSize uin
tickc: tickc,
fdBlockSize: fdBlockSize,
stopc: make(chan struct{}),
netNamespacePathSuffix: getNetNamespacePathSuffix(),
}
return w
}
@@ -219,7 +221,7 @@ func (w pidWalker) walk(buf *bytes.Buffer) (map[uint64]*Proc, error) {
w.walker.Walk(func(p, _ process.Process) {
dirName := strconv.Itoa(p.PID)
netNamespacePath := filepath.Join(procRoot, dirName, getNetNamespacePathSuffix())
netNamespacePath := filepath.Join(procRoot, dirName, w.netNamespacePathSuffix)
if err := fs.Stat(netNamespacePath, &statT); err != nil {
return
}