github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-08-18 03:46:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: extract common code of joinResults.addChild variants

Browse Source
This commit is contained in:
Matthias Radestock
2017-12-21 10:05:56 +00:00
parent 9713a156c7
commit 724ea0c230
1 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
render/render.go
+12 -24
View File
@@ -176,12 +176,11 @@ func newJoinResults(inputNodes report.Nodes) joinResults {
return joinResults{nodes: nodes, mapped: map[string]string{}, multi: map[string][]string{}}
}
func (ret *joinResults) add(m report.Node, n report.Node) {
ret.nodes[n.ID] = n
if _, ok := ret.mapped[m.ID]; !ok {
ret.mapped[m.ID] = n.ID
func (ret *joinResults) mapChild(from, to string) {
if _, ok := ret.mapped[from]; !ok {
ret.mapped[from] = to
} else {
ret.multi[m.ID] = append(ret.multi[m.ID], n.ID)
ret.multi[from] = append(ret.multi[from], to)
}
}
@@ -202,35 +201,24 @@ func (ret *joinResults) addUnmappedChild(m report.Node, id string, create func(s
// Add m as a child of the node at id, creating a new result node if
// not already there, and updating the mapping from old ID to new ID.
func (ret *joinResults) addChild(m report.Node, id string, create func(string) report.Node) {
result, exists := ret.nodes[id]
if !exists {
result = create(id)
}
result.Children = result.Children.Add(m)
if m.Topology != report.Endpoint { // optimisation: we never look at endpoint counts
result.Counters = result.Counters.Add(m.Topology, 1)
}
ret.add(m, result)
ret.addUnmappedChild(m, id, create)
ret.mapChild(m.ID, id)
}
// Like addChild, but also add m's children.
func (ret *joinResults) addChildAndChildren(m report.Node, id string, create func(string) report.Node) {
result, exists := ret.nodes[id]
if !exists {
result = create(id)
}
result.Children = result.Children.Add(m)
ret.addUnmappedChild(m, id, create)
result := ret.nodes[id]
result.Children = result.Children.Merge(m.Children)
if m.Topology != report.Endpoint { // optimisation: we never look at endpoint counts
result.Counters = result.Counters.Add(m.Topology, 1)
}
ret.add(m, result)
ret.nodes[id] = result
ret.mapChild(m.ID, id)
}
// Add a copy of n straight into the results
func (ret *joinResults) passThrough(n report.Node) {
n.Adjacency = nil // result() assumes all nodes start with no adjacencies
ret.add(n, n)
ret.nodes[n.ID] = n
ret.mapChild(n.ID, n.ID)
}
// Rewrite Adjacency of nodes in ret mapped from original nodes in