Skip to content

Commit 14e7c91

Browse files
rdobsonrdobson
committed
Merge pull request #7 from rdobson/cpuinfo
Add support for parsing cpuinfo
2 parents 426379a + 76fae91 commit 14e7c91

4 files changed

Lines changed: 278 additions & 6 deletions

File tree

‎hwinfo/host/cpuinfo.py‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
"""Module for parsing the output of /proc/cpuinfo"""
2+
3+
from hwinfo.util import CommandParser
4+
5+
REGEX_TEMPLATE = r'%s([\ \t])+\:\ (?P<%s>.*)'
6+
7+
class CPUInfoParser(CommandParser):
8+
9+
ITEM_SEPERATOR = "\n\n"
10+
11+
ITEM_REGEXS = [
12+
REGEX_TEMPLATE % ('processor', 'processor'),
13+
REGEX_TEMPLATE % ('vendor_id', 'vendor_id'),
14+
REGEX_TEMPLATE % (r'cpu\ family', 'cpu_family'),
15+
REGEX_TEMPLATE % ('model', 'model'),
16+
REGEX_TEMPLATE % (r'model\ name', 'model_name'),
17+
REGEX_TEMPLATE % ('stepping', 'stepping'),
18+
REGEX_TEMPLATE % ('microcode', 'microcode'),
19+
REGEX_TEMPLATE % (r'cpu\ MHz', 'cpu_mhz'),
20+
REGEX_TEMPLATE % (r'cache\ size', 'cache_size'),
21+
REGEX_TEMPLATE % (r'fpu', 'fpu'),
22+
REGEX_TEMPLATE % (r'fpu_exception', 'fpu_exception'),
23+
REGEX_TEMPLATE % (r'cpuid\ level', 'cpuid_level'),
24+
REGEX_TEMPLATE % (r'wp', 'wp'),
25+
REGEX_TEMPLATE % (r'flags', 'flags'),
26+
REGEX_TEMPLATE % (r'bogomips', 'bogomips'),
27+
REGEX_TEMPLATE % (r'clflush\ size', 'clflush_size'),
28+
REGEX_TEMPLATE % (r'cache_alignment', 'cache_alignment'),
29+
REGEX_TEMPLATE % (r'address\ sizes', 'address_sizes'),
30+
REGEX_TEMPLATE % (r'power\ management', 'power_management'),
31+
]

‎hwinfo/host/tests/data/cpuinfo‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
processor : 0
2+
vendor_id : GenuineIntel
3+
cpu family : 6
4+
model : 30
5+
model name : Intel(R) Xeon(R) CPU X3430 @ 2.40GHz
6+
stepping : 5
7+
microcode : 0x3
8+
cpu MHz : 2394.052
9+
cache size : 8192 KB
10+
fpu : yes
11+
fpu_exception : yes
12+
cpuid level : 11
13+
wp : yes
14+
flags : fpu de tsc msr pae mce cx8 apic sep mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good nopl nonstop_tsc pni monitor vmx est ssse3 cx16 sse4_1 sse4_2 popcnt hypervisor lahf_lm dtherm tpr_shadow vnmi flexpriority ept vpid
15+
bogomips : 4788.10
16+
clflush size : 64
17+
cache_alignment : 64
18+
address sizes : 36 bits physical, 48 bits virtual
19+
power management:
20+
21+
processor : 1
22+
vendor_id : GenuineIntel
23+
cpu family : 6
24+
model : 30
25+
model name : Intel(R) Xeon(R) CPU X3430 @ 2.40GHz
26+
stepping : 5
27+
microcode : 0x3
28+
cpu MHz : 2394.052
29+
cache size : 8192 KB
30+
fpu : yes
31+
fpu_exception : yes
32+
cpuid level : 11
33+
wp : yes
34+
flags : fpu de tsc msr pae mce cx8 apic sep mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good nopl nonstop_tsc pni monitor vmx est ssse3 cx16 sse4_1 sse4_2 popcnt hypervisor lahf_lm dtherm tpr_shadow vnmi flexpriority ept vpid
35+
bogomips : 4788.10
36+
clflush size : 64
37+
cache_alignment : 64
38+
address sizes : 36 bits physical, 48 bits virtual
39+
power management:
40+
41+
processor : 2
42+
vendor_id : GenuineIntel
43+
cpu family : 6
44+
model : 30
45+
model name : Intel(R) Xeon(R) CPU X3430 @ 2.40GHz
46+
stepping : 5
47+
microcode : 0x3
48+
cpu MHz : 2394.052
49+
cache size : 8192 KB
50+
fpu : yes
51+
fpu_exception : yes
52+
cpuid level : 11
53+
wp : yes
54+
flags : fpu de tsc msr pae mce cx8 apic sep mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good nopl nonstop_tsc pni monitor vmx est ssse3 cx16 sse4_1 sse4_2 popcnt hypervisor lahf_lm dtherm tpr_shadow vnmi flexpriority ept vpid
55+
bogomips : 4788.10
56+
clflush size : 64
57+
cache_alignment : 64
58+
address sizes : 36 bits physical, 48 bits virtual
59+
power management:
60+
61+
processor : 3
62+
vendor_id : GenuineIntel
63+
cpu family : 6
64+
model : 30
65+
model name : Intel(R) Xeon(R) CPU X3430 @ 2.40GHz
66+
stepping : 5
67+
microcode : 0x3
68+
cpu MHz : 2394.052
69+
cache size : 8192 KB
70+
fpu : yes
71+
fpu_exception : yes
72+
cpuid level : 11
73+
wp : yes
74+
flags : fpu de tsc msr pae mce cx8 apic sep mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good nopl nonstop_tsc pni monitor vmx est ssse3 cx16 sse4_1 sse4_2 popcnt hypervisor lahf_lm dtherm tpr_shadow vnmi flexpriority ept vpid
75+
bogomips : 4788.10
76+
clflush size : 64
77+
cache_alignment : 64
78+
address sizes : 36 bits physical, 48 bits virtual
79+
power management:
80+

‎hwinfo/host/tests/test_cpuinfo.py‎

Lines changed: 128 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,128 @@
1+
"""Module for unittesting dmidecode methods"""
2+
3+
import unittest
4+
from hwinfo.host.cpuinfo import CPUInfoParser
5+
6+
DATA_DIR = 'hwinfo/host/tests/data'
7+
8+
class CPUInfoParserTests(unittest.TestCase):
9+
10+
DATA = """
11+
processor : 0
12+
vendor_id : GenuineIntel
13+
cpu family : 6
14+
model : 30
15+
model name : Intel(R) Xeon(R) CPU X3430 @ 2.40GHz
16+
stepping : 5
17+
microcode : 0x3
18+
cpu MHz : 2394.052
19+
cache size : 8192 KB
20+
fpu : yes
21+
fpu_exception : yes
22+
cpuid level : 11
23+
wp : yes
24+
flags : fpu de tsc msr pae mce cx8 apic sep mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good nopl nonstop_tsc pni monitor vmx est ssse3 cx16 sse4_1 sse4_2 popcnt hypervisor lahf_lm dtherm tpr_shadow vnmi flexpriority ept vpid
25+
bogomips : 4788.10
26+
clflush size : 64
27+
cache_alignment : 64
28+
address sizes : 36 bits physical, 48 bits virtual
29+
power management:
30+
"""
31+
32+
DATA_REC = {
33+
'processor': '0',
34+
'vendor_id': 'GenuineIntel',
35+
'cpu_family': '6',
36+
'model': '30',
37+
'model_name': 'Intel(R) Xeon(R) CPU X3430 @ 2.40GHz',
38+
'stepping': '5',
39+
'microcode': '0x3',
40+
'cpu_mhz': '2394.052',
41+
'cache_size': '8192 KB',
42+
'fpu': 'yes',
43+
'fpu_exception': 'yes',
44+
'cpuid_level': '11',
45+
'wp': 'yes',
46+
'flags': 'fpu de tsc msr pae mce cx8 apic sep mca cmov pat clflush acpi mmx fxsr sse sse2 ss ht syscall nx lm constant_tsc rep_good nopl nonstop_tsc pni monitor vmx est ssse3 cx16 sse4_1 sse4_2 popcnt hypervisor lahf_lm dtherm tpr_shadow vnmi flexpriority ept vpid',
47+
'bogomips': '4788.10',
48+
'clflush_size': '64',
49+
'cache_alignment': '64',
50+
'address_sizes': '36 bits physical, 48 bits virtual',
51+
'power_management': '',
52+
}
53+
54+
55+
def setUp(self):
56+
self.parser = CPUInfoParser(self.DATA.strip())
57+
58+
def _assert_equal(self, key):
59+
rec = self.parser.parse_items()[0]
60+
return self.assertEqual(rec[key], self.DATA_REC[key])
61+
62+
def test_cpuinfo_processor(self):
63+
return self._assert_equal('processor')
64+
65+
def test_vendor_id(self):
66+
return self._assert_equal('vendor_id')
67+
68+
def test_cpu_family(self):
69+
return self._assert_equal('cpu_family')
70+
71+
def test_model(self):
72+
return self._assert_equal('model')
73+
74+
def test_model_name(self):
75+
return self._assert_equal('model_name')
76+
77+
def test_stepping(self):
78+
return self._assert_equal('stepping')
79+
80+
def test_microcode(self):
81+
return self._assert_equal('microcode')
82+
83+
def test_cpu_mhz(self):
84+
return self._assert_equal('cpu_mhz')
85+
86+
def test_cache_size(self):
87+
return self._assert_equal('cache_size')
88+
89+
def test_fpu(self):
90+
return self._assert_equal('fpu')
91+
92+
def test_fpu_exception(self):
93+
return self._assert_equal('fpu_exception')
94+
95+
def test_cpuid_level(self):
96+
return self._assert_equal('cpuid_level')
97+
98+
def test_wp(self):
99+
return self._assert_equal('wp')
100+
101+
def test_flags(self):
102+
return self._assert_equal('flags')
103+
104+
def test_bogomips(self):
105+
return self._assert_equal('bogomips')
106+
107+
def test_clflush_size(self):
108+
return self._assert_equal('clflush_size')
109+
110+
def test_cache_alignment(self):
111+
return self._assert_equal('cache_alignment')
112+
113+
def test_address_sizes(self):
114+
return self._assert_equal('address_sizes')
115+
116+
class CPUInfoMultipleParseTest(unittest.TestCase):
117+
118+
DATA_FILE = "%s/cpuinfo" % DATA_DIR
119+
120+
def setUp(self):
121+
fh = open(self.DATA_FILE)
122+
data = fh.read()
123+
fh.close()
124+
self.parser = CPUInfoParser(data)
125+
126+
def test_number_of_processors(self):
127+
recs = self.parser.parse_items()
128+
self.assertEqual(len(recs), 4)

‎hwinfo/tools/inspector.py‎

Lines changed: 39 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
from hwinfo.pci.lspci import *
1111

1212
from hwinfo.host import dmidecode
13+
from hwinfo.host import cpuinfo
1314

1415
def remote_command(host, username, password, cmd):
1516
client = paramiko.SSHClient()
@@ -54,6 +55,9 @@ def get_lspci_data(self):
5455
def get_dmidecode_data(self):
5556
return self.exec_command(['dmidecode'])
5657

58+
def get_cpuinfo_data(self):
59+
return self.exec_command(['cat /proc/cpuinfo'])
60+
5761
def get_pci_devices(self):
5862
data = self.get_lspci_data()
5963
parser = LspciNNMMParser(data)
@@ -66,6 +70,11 @@ def get_info(self):
6670
rec = parser.parse()
6771
return rec
6872

73+
def get_cpu_info(self):
74+
data = self.get_cpuinfo_data()
75+
parser = cpuinfo.CPUInfoParser(data)
76+
return parser.parse_items()
77+
6978
def search_for_file(dirname, filename):
7079
for root, _, files in os.walk(dirname):
7180
if filename in files:
@@ -93,6 +102,9 @@ def get_lspci_data(self):
93102
def get_dmidecode_data(self):
94103
return self._load_from_file('dmidecode.out')
95104

105+
def get_cpuinfo_data(self):
106+
return self._load_from_file('cpuinfo')
107+
96108
def pci_filter(devices, types):
97109
res = []
98110
for device in devices:
@@ -122,6 +134,13 @@ def rec_to_table(rec):
122134
table.add_row([k, v])
123135
return table
124136

137+
def tabulate_recs(recs, header):
138+
table = PrettyTable(header)
139+
for rec in recs:
140+
vls = [rec[k] for k in header]
141+
table.add_row(vls)
142+
return table
143+
125144
def tabulate_pci_recs(recs):
126145
header = [
127146
'vendor_name',
@@ -133,18 +152,26 @@ def tabulate_pci_recs(recs):
133152
'subdevice_name',
134153
'subdevice_id',
135154
]
136-
table = PrettyTable(header)
137-
for rec in recs:
138-
vls = [rec[k] for k in header]
139-
table.add_row(vls)
140-
return table
155+
return tabulate_recs(recs, header)
156+
157+
def tabulate_cpu_recs(recs):
158+
header = [
159+
'processor',
160+
'vendor_id',
161+
'cpu_family',
162+
'model',
163+
'stepping',
164+
'model_name',
165+
'cpu_mhz',
166+
]
167+
return tabulate_recs(recs, header)
141168

142169
def main():
143170
"""Entry Point"""
144171

145172
parser = ArgumentParser(prog="hwinfo")
146173

147-
filter_choices = ['bios', 'nic', 'storage', 'gpu']
174+
filter_choices = ['bios', 'nic', 'storage', 'gpu', 'cpu']
148175
parser.add_argument("-f", "--filter", choices=filter_choices, help="Query a specific class.")
149176
parser.add_argument("-m", "--machine", default='localhost', help="Remote host address.")
150177
parser.add_argument("-u", "--username", help="Username for remote host.")
@@ -173,6 +200,12 @@ def main():
173200
print rec_to_table(host.get_info())
174201
print ""
175202

203+
if 'cpu' in options:
204+
print "CPU Info:"
205+
print ""
206+
print tabulate_cpu_recs(host.get_cpu_info())
207+
print ""
208+
176209
if 'nic' in options:
177210
devices = pci_filter_for_nics(host.get_pci_devices())
178211
print "Ethernet Controller Info:"

0 commit comments

Comments
 (0)