Merge "Getting numanode from all possible structure"

This commit is contained in:
Jenkins 2016-03-14 15:35:22 +00:00 committed by Gerrit Code Review
commit bc56d1c476
1 changed files with 5 additions and 5 deletions

10
agent
View File

@ -945,13 +945,13 @@ class NodeAgent
topology = {:numa_nodes => [], :supported_hugepages => supported_hugepages, :distances => [["1.0"]]}
doc.elements.each('/topology/object/distances/') do |dist|
doc.elements.each('//distances/') do |dist|
topology[:distances] = dist.elements.collect{|v| v.attributes['value']}
.each_slice(dist.attributes['nbobjs'].to_i).to_a
end
numa_node = "/topology/object/object[@type='NUMANode']"
element = doc.elements[numa_node] ? numa_node : "/topology/object[@type='Machine']"
numa_node = "//object[@type='NUMANode']"
element = doc.elements["//object[@type='NUMANode']"] ? numa_node : "//object[@type='Machine']"
doc.elements.each(element) do |numa|
@ -959,10 +959,10 @@ class NodeAgent
struct[:id] = numa.attributes['os_index'].to_i
struct[:memory] = numa.attributes['local_memory'].to_i
numa.elements.each("object/object/object[@type='PU']") do |pu|
numa.elements.each("#{numa.xpath}//[@type='PU']") do |pu|
struct[:cpus] << pu.attributes['os_index'].to_i
end
numa.elements.each("object/object/object[@type='PCIDev']") do |pcidev|
numa.elements.each("#{numa.xpath}//[@type='PCIDev']") do |pcidev|
struct[:pcidevs] << pcidev.attributes['pci_busid']
end
topology[:numa_nodes] << struct