Commit b81b9367 authored by Elvis Pranskevichus's avatar Elvis Pranskevichus

Record host platform information in benchmark data

parent d083da37
......@@ -388,7 +388,13 @@ def main():
print()
if args.save_json:
info_cmd = server_base + python + ['/usr/src/servers/platinfo.py']
print(' ' + ' '.join(info_cmd))
output = subprocess.check_output(info_cmd, universal_newlines=True)
platform_info = json.loads(output)
benchmarks_data = {
'platform': platform_info,
'concurrency_levels': args.concurrency_levels,
'payload_size_levels': args.payload_size_levels,
'benchmarks': benchmarks_data,
......
import json
import os.path
import platform
import warnings
if __name__ == '__main__':
machine = platform.machine()
processor = platform.processor()
system = platform.system()
cpuinfo_f = '/proc/cpuinfo'
if (processor in {machine, 'unknown'} and os.path.exists(cpuinfo_f)):
with open(cpuinfo_f, 'rt') as f:
for line in f:
if line.startswith('model name'):
_, _, p = line.partition(':')
processor = p.strip()
break
if 'Linux' in system:
with warnings.catch_warnings():
# see issue #1322 for more information
warnings.filterwarnings(
'ignore',
'dist\(\) and linux_distribution\(\) '
'functions are deprecated .*',
PendingDeprecationWarning,
)
distname, distversion, distid = platform.dist('')
distribution = '{} {}'.format(distname, distversion).strip()
else:
distribution = None
data = {
'cpu': processor,
'arch': machine,
'system': '{} {}'.format(system, platform.release()),
'distribution': distribution
}
print(json.dumps(data))
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment