opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-15 03:02:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove a loop in container graph

Browse Source 
Instead of looping to find containers with no dependencies,
maintain a map of them and remove entries as we add dependency
edges.

Signed-off-by: Matthew Heon <matthew.heon@gmail.com>

Closes: #557
Approved by: rhatdan
This commit is contained in:
Matthew Heon
2018-03-28 09:57:38 -04:00
committed by Atomic Bot
parent 4ea493d5a1
commit b0526caa93
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libpod/container_graph.go
View File

@ -15,12 +15,13 @@ type containerNode struct {
type containerGraph struct { type containerGraph struct {
nodes map[string]*containerNode nodes map[string]*containerNode
noDepNodes []*containerNode noDepNodes []*containerNode
notDependedOnNodes []*containerNode notDependedOnNodes map[string]*containerNode
} }
func buildContainerGraph(ctrs []*Container) (*containerGraph, error) { func buildContainerGraph(ctrs []*Container) (*containerGraph, error) {
graph := new(containerGraph) graph := new(containerGraph)
graph.nodes = make(map[string]*containerNode) graph.nodes = make(map[string]*containerNode)
graph.notDependedOnNodes = make(map[string]*containerNode)
// Start by building all nodes, with no edges // Start by building all nodes, with no edges
for _, ctr := range ctrs { for _, ctr := range ctrs {
@ -29,6 +30,7 @@ func buildContainerGraph(ctrs []*Container) (*containerGraph, error) {
ctrNode.container = ctr ctrNode.container = ctr
graph.nodes[ctr.ID()] = ctrNode graph.nodes[ctr.ID()] = ctrNode
graph.notDependedOnNodes[ctr.ID()] = ctrNode
} }
// Now add edges based on dependencies // Now add edges based on dependencies
@ -45,6 +47,9 @@ func buildContainerGraph(ctrs []*Container) (*containerGraph, error) {
// And add the node to the dependent node's dependedOn // And add the node to the dependent node's dependedOn
node.dependsOn = append(node.dependsOn, depNode) node.dependsOn = append(node.dependsOn, depNode)
depNode.dependedOn = append(depNode.dependedOn, node) depNode.dependedOn = append(depNode.dependedOn, node)
// The dependency now has something depending on it
delete(graph.notDependedOnNodes, dep)
} }
// Maintain a list of nodes with no dependencies // Maintain a list of nodes with no dependencies
@ -54,14 +59,6 @@ func buildContainerGraph(ctrs []*Container) (*containerGraph, error) {
} }
} }
// Need one more loop to get nodes that have nothing depending on them
// (no edges pointing to them)
for _, node := range graph.nodes {
if len(node.dependedOn) == 0 {
graph.notDependedOnNodes = append(graph.notDependedOnNodes, node)
}
}
// Need to do cycle detection // Need to do cycle detection
// We cannot start or stop if there are cyclic dependencies // We cannot start or stop if there are cyclic dependencies
cycle, err := detectCycles(graph) cycle, err := detectCycles(graph)