cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Only add the overhead for each iteration of cpuinfo parsing if Xen is detected

Browse source
This commit is contained in:
Adam Miller 2015-01-07 08:45:14 -06:00
parent 3729259b68
commit f274234824
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
lib/ansible/module_utils/facts.py
View file

@ -609,7 +609,17 @@ class LinuxHardware(Hardware):
coreid = 0
sockets = {}
cores = {}
xen = False
xen_paravirt = False
if os.path.exists('/proc/xen'):
xen = True
try:
if open('/sys/hypervisor/type').readline().strip() == 'xen':
xen = True
except IOError:
pass
if not os.access("/proc/cpuinfo", os.R_OK):
return
self.facts['processor'] = []
@ -617,6 +627,15 @@ class LinuxHardware(Hardware):
data = line.split(":", 1)
key = data[0].strip()
if xen:
if key == 'flags':
# Check for vme cpu flag, Xen paravirt does not expose this.
# Need to detect Xen paravirt because it exposes cpuinfo
# differently than Xen HVM or KVM and causes reporting of
# only a single cpu core.
if 'vme' not in data:
xen_paravirt = True
# model name is for Intel arch, Processor (mind the uppercase P)
# works for some ARM devices, like the Sheevaplug.
if key == 'model name' or key == 'Processor' or key == 'vendor_id':
@ -628,13 +647,6 @@ class LinuxHardware(Hardware):
if key == 'model name':
model_name_occurrence += 1
i += 1
elif key == 'flags':
# Check for vme cpu flag, Xen paravirt does not expose this.
# Need to detect Xen paravirt because it exposes cpuinfo
# differently than Xen HVM or KVM and causes reporting of
# only a single cpu core.
if 'vme' not in data:
xen_paravirt = True
elif key == 'physical id':
physid = data[1].strip()
if physid not in sockets: