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

Make merging of node children conditional in addToResults

Browse Source 
Some operations won't want this.
This commit is contained in:
Bryan Boreham
2017-11-11 14:18:41 +00:00
committed by Matthias Radestock
parent e475c2af1d
commit db41cab0af
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
render/render.go
View File

@@ -160,13 +160,15 @@ func newJoinResults() joinResults {
// Add Node M under id, creating a new result node if not already there
// incrementing a counter if nonblank, and updating the mapping from old ID to new ID
func (ret *joinResults) addToResults(m report.Node, id string, create func(string) report.Node, counters ...string) {
func (ret *joinResults) addToResults(m report.Node, id string, addChildren bool, create func(string) report.Node, counters ...string) {
result, exists := ret.nodes[id]
if !exists {
result = create(id)
}
result.Children = result.Children.Add(m)
result.Children = result.Children.Merge(m.Children)
if addChildren {
result.Children = result.Children.Merge(m.Children)
}
for _, c := range counters {
result.Counters = result.Counters.Add(c, 1)
}