* [PULL 1/4] scripts/simplebench: add simplebench.py
2020-03-18 1:12 [PULL 0/4] Python queue for 5.0 soft freeze Eduardo Habkost
@ 2020-03-18 1:12 ` Eduardo Habkost
2020-03-18 1:12 ` [PULL 2/4] scripts/simplebench: add qemu/bench_block_job.py Eduardo Habkost
` (5 subsequent siblings)
6 siblings, 0 replies; 15+ messages in thread
From: Eduardo Habkost @ 2020-03-18 1:12 UTC (permalink / raw)
To: qemu-devel, Cleber Rosa, Peter Maydell
Cc: Vladimir Sementsov-Ogievskiy, Aleksandar Markovic
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Add simple benchmark table creator.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>
Message-Id: <20200228071914.11746-2-vsementsov@virtuozzo.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
scripts/simplebench/simplebench.py | 128 +++++++++++++++++++++++++++++
1 file changed, 128 insertions(+)
create mode 100644 scripts/simplebench/simplebench.py
diff --git a/scripts/simplebench/simplebench.py b/scripts/simplebench/simplebench.py
new file mode 100644
index 0000000000..59e7314ff6
--- /dev/null
+++ b/scripts/simplebench/simplebench.py
@@ -0,0 +1,128 @@
+#!/usr/bin/env python
+#
+# Simple benchmarking framework
+#
+# Copyright (c) 2019 Virtuozzo International GmbH.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+def bench_one(test_func, test_env, test_case, count=5, initial_run=True):
+ """Benchmark one test-case
+
+ test_func -- benchmarking function with prototype
+ test_func(env, case), which takes test_env and test_case
+ arguments and returns {'seconds': int} (which is benchmark
+ result) on success and {'error': str} on error. Returned
+ dict may contain any other additional fields.
+ test_env -- test environment - opaque first argument for test_func
+ test_case -- test case - opaque second argument for test_func
+ count -- how many times to call test_func, to calculate average
+ initial_run -- do initial run of test_func, which don't get into result
+
+ Returns dict with the following fields:
+ 'runs': list of test_func results
+ 'average': average seconds per run (exists only if at least one run
+ succeeded)
+ 'delta': maximum delta between test_func result and the average
+ (exists only if at least one run succeeded)
+ 'n-failed': number of failed runs (exists only if at least one run
+ failed)
+ """
+ if initial_run:
+ print(' #initial run:')
+ print(' ', test_func(test_env, test_case))
+
+ runs = []
+ for i in range(count):
+ print(' #run {}'.format(i+1))
+ res = test_func(test_env, test_case)
+ print(' ', res)
+ runs.append(res)
+
+ result = {'runs': runs}
+
+ successed = [r for r in runs if ('seconds' in r)]
+ if successed:
+ avg = sum(r['seconds'] for r in successed) / len(successed)
+ result['average'] = avg
+ result['delta'] = max(abs(r['seconds'] - avg) for r in successed)
+
+ if len(successed) < count:
+ result['n-failed'] = count - len(successed)
+
+ return result
+
+
+def ascii_one(result):
+ """Return ASCII representation of bench_one() returned dict."""
+ if 'average' in result:
+ s = '{:.2f} +- {:.2f}'.format(result['average'], result['delta'])
+ if 'n-failed' in result:
+ s += '\n({} failed)'.format(result['n-failed'])
+ return s
+ else:
+ return 'FAILED'
+
+
+def bench(test_func, test_envs, test_cases, *args, **vargs):
+ """Fill benchmark table
+
+ test_func -- benchmarking function, see bench_one for description
+ test_envs -- list of test environments, see bench_one
+ test_cases -- list of test cases, see bench_one
+ args, vargs -- additional arguments for bench_one
+
+ Returns dict with the following fields:
+ 'envs': test_envs
+ 'cases': test_cases
+ 'tab': filled 2D array, where cell [i][j] is bench_one result for
+ test_cases[i] for test_envs[j] (i.e., rows are test cases and
+ columns are test environments)
+ """
+ tab = {}
+ results = {
+ 'envs': test_envs,
+ 'cases': test_cases,
+ 'tab': tab
+ }
+ n = 1
+ n_tests = len(test_envs) * len(test_cases)
+ for env in test_envs:
+ for case in test_cases:
+ print('Testing {}/{}: {} :: {}'.format(n, n_tests,
+ env['id'], case['id']))
+ if case['id'] not in tab:
+ tab[case['id']] = {}
+ tab[case['id']][env['id']] = bench_one(test_func, env, case,
+ *args, **vargs)
+ n += 1
+
+ print('Done')
+ return results
+
+
+def ascii(results):
+ """Return ASCII representation of bench() returned dict."""
+ from tabulate import tabulate
+
+ tab = [[""] + [c['id'] for c in results['envs']]]
+ for case in results['cases']:
+ row = [case['id']]
+ for env in results['envs']:
+ row.append(ascii_one(results['tab'][case['id']][env['id']]))
+ tab.append(row)
+
+ return tabulate(tab)
--
2.24.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PULL 2/4] scripts/simplebench: add qemu/bench_block_job.py
2020-03-18 1:12 [PULL 0/4] Python queue for 5.0 soft freeze Eduardo Habkost
2020-03-18 1:12 ` [PULL 1/4] scripts/simplebench: add simplebench.py Eduardo Habkost
@ 2020-03-18 1:12 ` Eduardo Habkost
2020-03-18 1:12 ` [PULL 3/4] scripts/simplebench: add example usage of simplebench Eduardo Habkost
` (4 subsequent siblings)
6 siblings, 0 replies; 15+ messages in thread
From: Eduardo Habkost @ 2020-03-18 1:12 UTC (permalink / raw)
To: qemu-devel, Cleber Rosa, Peter Maydell
Cc: Vladimir Sementsov-Ogievskiy, Aleksandar Markovic
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Add block-job benchmarking helper functions.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>
Message-Id: <20200228071914.11746-3-vsementsov@virtuozzo.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
scripts/simplebench/bench_block_job.py | 119 +++++++++++++++++++++++++
1 file changed, 119 insertions(+)
create mode 100755 scripts/simplebench/bench_block_job.py
diff --git a/scripts/simplebench/bench_block_job.py b/scripts/simplebench/bench_block_job.py
new file mode 100755
index 0000000000..9808d696cf
--- /dev/null
+++ b/scripts/simplebench/bench_block_job.py
@@ -0,0 +1,119 @@
+#!/usr/bin/env python
+#
+# Benchmark block jobs
+#
+# Copyright (c) 2019 Virtuozzo International GmbH.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+
+import sys
+import os
+import socket
+import json
+
+sys.path.append(os.path.join(os.path.dirname(__file__), '..', '..', 'python'))
+from qemu.machine import QEMUMachine
+from qemu.qmp import QMPConnectError
+
+
+def bench_block_job(cmd, cmd_args, qemu_args):
+ """Benchmark block-job
+
+ cmd -- qmp command to run block-job (like blockdev-backup)
+ cmd_args -- dict of qmp command arguments
+ qemu_args -- list of Qemu command line arguments, including path to Qemu
+ binary
+
+ Returns {'seconds': int} on success and {'error': str} on failure, dict may
+ contain addional 'vm-log' field. Return value is compatible with
+ simplebench lib.
+ """
+
+ vm = QEMUMachine(qemu_args[0], args=qemu_args[1:])
+
+ try:
+ vm.launch()
+ except OSError as e:
+ return {'error': 'popen failed: ' + str(e)}
+ except (QMPConnectError, socket.timeout):
+ return {'error': 'qemu failed: ' + str(vm.get_log())}
+
+ try:
+ res = vm.qmp(cmd, **cmd_args)
+ if res != {'return': {}}:
+ vm.shutdown()
+ return {'error': '"{}" command failed: {}'.format(cmd, str(res))}
+
+ e = vm.event_wait('JOB_STATUS_CHANGE')
+ assert e['data']['status'] == 'created'
+ start_ms = e['timestamp']['seconds'] * 1000000 + \
+ e['timestamp']['microseconds']
+
+ e = vm.events_wait((('BLOCK_JOB_READY', None),
+ ('BLOCK_JOB_COMPLETED', None),
+ ('BLOCK_JOB_FAILED', None)), timeout=True)
+ if e['event'] not in ('BLOCK_JOB_READY', 'BLOCK_JOB_COMPLETED'):
+ vm.shutdown()
+ return {'error': 'block-job failed: ' + str(e),
+ 'vm-log': vm.get_log()}
+ end_ms = e['timestamp']['seconds'] * 1000000 + \
+ e['timestamp']['microseconds']
+ finally:
+ vm.shutdown()
+
+ return {'seconds': (end_ms - start_ms) / 1000000.0}
+
+
+# Bench backup or mirror
+def bench_block_copy(qemu_binary, cmd, source, target):
+ """Helper to run bench_block_job() for mirror or backup"""
+ assert cmd in ('blockdev-backup', 'blockdev-mirror')
+
+ source['node-name'] = 'source'
+ target['node-name'] = 'target'
+
+ return bench_block_job(cmd,
+ {'job-id': 'job0', 'device': 'source',
+ 'target': 'target', 'sync': 'full'},
+ [qemu_binary,
+ '-blockdev', json.dumps(source),
+ '-blockdev', json.dumps(target)])
+
+
+def drv_file(filename):
+ return {'driver': 'file', 'filename': filename,
+ 'cache': {'direct': True}, 'aio': 'native'}
+
+
+def drv_nbd(host, port):
+ return {'driver': 'nbd',
+ 'server': {'type': 'inet', 'host': host, 'port': port}}
+
+
+if __name__ == '__main__':
+ import sys
+
+ if len(sys.argv) < 4:
+ print('USAGE: {} <qmp block-job command name> '
+ '<json string of arguments for the command> '
+ '<qemu binary path and arguments>'.format(sys.argv[0]))
+ exit(1)
+
+ res = bench_block_job(sys.argv[1], json.loads(sys.argv[2]), sys.argv[3:])
+ if 'seconds' in res:
+ print('{:.2f}'.format(res['seconds']))
+ else:
+ print(res)
--
2.24.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PULL 3/4] scripts/simplebench: add example usage of simplebench
2020-03-18 1:12 [PULL 0/4] Python queue for 5.0 soft freeze Eduardo Habkost
2020-03-18 1:12 ` [PULL 1/4] scripts/simplebench: add simplebench.py Eduardo Habkost
2020-03-18 1:12 ` [PULL 2/4] scripts/simplebench: add qemu/bench_block_job.py Eduardo Habkost
@ 2020-03-18 1:12 ` Eduardo Habkost
2020-03-18 1:12 ` [PULL 4/4] MAINTAINERS: add simplebench Eduardo Habkost
` (3 subsequent siblings)
6 siblings, 0 replies; 15+ messages in thread
From: Eduardo Habkost @ 2020-03-18 1:12 UTC (permalink / raw)
To: qemu-devel, Cleber Rosa, Peter Maydell
Cc: Vladimir Sementsov-Ogievskiy, Aleksandar Markovic
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
This example may be used as a template for custom benchmark.
It illustrates three things to prepare:
- define bench_func
- define test environments (columns)
- define test cases (rows)
And final call of simplebench API.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>
Message-Id: <20200228071914.11746-4-vsementsov@virtuozzo.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
scripts/simplebench/bench-example.py | 80 ++++++++++++++++++++++++++++
1 file changed, 80 insertions(+)
create mode 100644 scripts/simplebench/bench-example.py
diff --git a/scripts/simplebench/bench-example.py b/scripts/simplebench/bench-example.py
new file mode 100644
index 0000000000..c642a5b891
--- /dev/null
+++ b/scripts/simplebench/bench-example.py
@@ -0,0 +1,80 @@
+#!/usr/bin/env python3
+#
+# Benchmark example
+#
+# Copyright (c) 2019 Virtuozzo International GmbH.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+
+import simplebench
+from bench_block_job import bench_block_copy, drv_file, drv_nbd
+
+
+def bench_func(env, case):
+ """ Handle one "cell" of benchmarking table. """
+ return bench_block_copy(env['qemu_binary'], env['cmd'],
+ case['source'], case['target'])
+
+
+# You may set the following five variables to correct values, to turn this
+# example to real benchmark.
+ssd_source = '/path-to-raw-source-image-at-ssd'
+ssd_target = '/path-to-raw-target-image-at-ssd'
+hdd_target = '/path-to-raw-source-image-at-hdd'
+nbd_ip = 'nbd-ip-addr'
+nbd_port = 'nbd-port-number'
+
+# Test-cases are "rows" in benchmark resulting table, 'id' is a caption for
+# the row, other fields are handled by bench_func.
+test_cases = [
+ {
+ 'id': 'ssd -> ssd',
+ 'source': drv_file(ssd_source),
+ 'target': drv_file(ssd_target)
+ },
+ {
+ 'id': 'ssd -> hdd',
+ 'source': drv_file(ssd_source),
+ 'target': drv_file(hdd_target)
+ },
+ {
+ 'id': 'ssd -> nbd',
+ 'source': drv_file(ssd_source),
+ 'target': drv_nbd(nbd_ip, nbd_port)
+ },
+]
+
+# Test-envs are "columns" in benchmark resulting table, 'id is a caption for
+# the column, other fields are handled by bench_func.
+test_envs = [
+ {
+ 'id': 'backup-1',
+ 'cmd': 'blockdev-backup',
+ 'qemu_binary': '/path-to-qemu-binary-1'
+ },
+ {
+ 'id': 'backup-2',
+ 'cmd': 'blockdev-backup',
+ 'qemu_binary': '/path-to-qemu-binary-2'
+ },
+ {
+ 'id': 'mirror',
+ 'cmd': 'blockdev-mirror',
+ 'qemu_binary': '/path-to-qemu-binary-1'
+ }
+]
+
+result = simplebench.bench(bench_func, test_envs, test_cases, count=3)
+print(simplebench.ascii(result))
--
2.24.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PULL 4/4] MAINTAINERS: add simplebench
2020-03-18 1:12 [PULL 0/4] Python queue for 5.0 soft freeze Eduardo Habkost
` (2 preceding siblings ...)
2020-03-18 1:12 ` [PULL 3/4] scripts/simplebench: add example usage of simplebench Eduardo Habkost
@ 2020-03-18 1:12 ` Eduardo Habkost
2020-03-18 4:12 ` [PULL 0/4] Python queue for 5.0 soft freeze no-reply
` (2 subsequent siblings)
6 siblings, 0 replies; 15+ messages in thread
From: Eduardo Habkost @ 2020-03-18 1:12 UTC (permalink / raw)
To: qemu-devel, Cleber Rosa, Peter Maydell
Cc: Vladimir Sementsov-Ogievskiy, Aleksandar Markovic
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>
Message-Id: <20200228071914.11746-5-vsementsov@virtuozzo.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
MAINTAINERS | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 7364af0d8b..9b462ef009 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2142,6 +2142,11 @@ F: python/qemu/*py
F: scripts/*.py
F: tests/*.py
+Benchmark util
+M: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
+S: Maintained
+F: scripts/simplebench/
+
QAPI
M: Markus Armbruster <armbru@redhat.com>
M: Michael Roth <mdroth@linux.vnet.ibm.com>
--
2.24.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PULL 0/4] Python queue for 5.0 soft freeze
2020-03-18 1:12 [PULL 0/4] Python queue for 5.0 soft freeze Eduardo Habkost
` (3 preceding siblings ...)
2020-03-18 1:12 ` [PULL 4/4] MAINTAINERS: add simplebench Eduardo Habkost
@ 2020-03-18 4:12 ` no-reply
2020-03-18 7:59 ` Vladimir Sementsov-Ogievskiy
2020-03-18 17:02 ` [PATCH 5/4] scripts/simplebench: fix python script ! headers Vladimir Sementsov-Ogievskiy
2020-03-20 15:59 ` [PULL 0/4] Python queue for 5.0 soft freeze Peter Maydell
6 siblings, 1 reply; 15+ messages in thread
From: no-reply @ 2020-03-18 4:12 UTC (permalink / raw)
To: ehabkost; +Cc: peter.maydell, vsementsov, qemu-devel, crosa
Patchew URL: https://patchew.org/QEMU/20200318011217.2102748-1-ehabkost@redhat.com/
Hi,
This series seems to have some coding style problems. See output below for
more information:
Subject: [PULL 0/4] Python queue for 5.0 soft freeze
Message-id: 20200318011217.2102748-1-ehabkost@redhat.com
Type: series
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
Switched to a new branch 'test'
1b4f6f3 MAINTAINERS: add simplebench
57b42b6 scripts/simplebench: add example usage of simplebench
99ea4d7 scripts/simplebench: add qemu/bench_block_job.py
196f97d scripts/simplebench: add simplebench.py
=== OUTPUT BEGIN ===
1/4 Checking commit 196f97d8566d (scripts/simplebench: add simplebench.py)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#16:
new file mode 100644
ERROR: please use python3 interpreter
#21: FILE: scripts/simplebench/simplebench.py:1:
+#!/usr/bin/env python
total: 1 errors, 1 warnings, 128 lines checked
Patch 1/4 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
2/4 Checking commit 99ea4d73bba8 (scripts/simplebench: add qemu/bench_block_job.py)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#16:
new file mode 100755
ERROR: please use python3 interpreter
#21: FILE: scripts/simplebench/bench_block_job.py:1:
+#!/usr/bin/env python
total: 1 errors, 1 warnings, 119 lines checked
Patch 2/4 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
3/4 Checking commit 57b42b691f7b (scripts/simplebench: add example usage of simplebench)
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
#21:
new file mode 100644
total: 0 errors, 1 warnings, 80 lines checked
Patch 3/4 has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
4/4 Checking commit 1b4f6f3850f4 (MAINTAINERS: add simplebench)
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/20200318011217.2102748-1-ehabkost@redhat.com/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PULL 0/4] Python queue for 5.0 soft freeze
2020-03-18 4:12 ` [PULL 0/4] Python queue for 5.0 soft freeze no-reply
@ 2020-03-18 7:59 ` Vladimir Sementsov-Ogievskiy
2020-03-18 16:12 ` Eduardo Habkost
0 siblings, 1 reply; 15+ messages in thread
From: Vladimir Sementsov-Ogievskiy @ 2020-03-18 7:59 UTC (permalink / raw)
To: qemu-devel, ehabkost; +Cc: peter.maydell, crosa
18.03.2020 7:12, no-reply@patchew.org wrote:
> Patchew URL: https://patchew.org/QEMU/20200318011217.2102748-1-ehabkost@redhat.com/
>
>
>
> Hi,
>
> This series seems to have some coding style problems. See output below for
> more information:
>
> Subject: [PULL 0/4] Python queue for 5.0 soft freeze
> Message-id: 20200318011217.2102748-1-ehabkost@redhat.com
> Type: series
>
> === TEST SCRIPT BEGIN ===
> #!/bin/bash
> git rev-parse base > /dev/null || exit 0
> git config --local diff.renamelimit 0
> git config --local diff.renames True
> git config --local diff.algorithm histogram
> ./scripts/checkpatch.pl --mailback base..
> === TEST SCRIPT END ===
>
> Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
> Switched to a new branch 'test'
> 1b4f6f3 MAINTAINERS: add simplebench
> 57b42b6 scripts/simplebench: add example usage of simplebench
> 99ea4d7 scripts/simplebench: add qemu/bench_block_job.py
> 196f97d scripts/simplebench: add simplebench.py
>
> === OUTPUT BEGIN ===
> 1/4 Checking commit 196f97d8566d (scripts/simplebench: add simplebench.py)
> WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
> #16:
> new file mode 100644
>
> ERROR: please use python3 interpreter
> #21: FILE: scripts/simplebench/simplebench.py:1:
> +#!/usr/bin/env python
Hmm, yes, we need to fix it.
Should I resend?
>
> total: 1 errors, 1 warnings, 128 lines checked
>
> Patch 1/4 has style problems, please review. If any of these errors
> are false positives report them to the maintainer, see
> CHECKPATCH in MAINTAINERS.
>
> 2/4 Checking commit 99ea4d73bba8 (scripts/simplebench: add qemu/bench_block_job.py)
> WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
> #16:
> new file mode 100755
>
> ERROR: please use python3 interpreter
> #21: FILE: scripts/simplebench/bench_block_job.py:1:
> +#!/usr/bin/env python
and here.
>
> total: 1 errors, 1 warnings, 119 lines checked
>
> Patch 2/4 has style problems, please review. If any of these errors
> are false positives report them to the maintainer, see
> CHECKPATCH in MAINTAINERS.
>
> 3/4 Checking commit 57b42b691f7b (scripts/simplebench: add example usage of simplebench)
> WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
> #21:
> new file mode 100644
>
> total: 0 errors, 1 warnings, 80 lines checked
>
> Patch 3/4 has style problems, please review. If any of these errors
> are false positives report them to the maintainer, see
> CHECKPATCH in MAINTAINERS.
> 4/4 Checking commit 1b4f6f3850f4 (MAINTAINERS: add simplebench)
> === OUTPUT END ===
>
> Test command exited with code: 1
>
>
> The full log is available at
> http://patchew.org/logs/20200318011217.2102748-1-ehabkost@redhat.com/testing.checkpatch/?type=message.
> ---
> Email generated automatically by Patchew [https://patchew.org/].
> Please send your feedback to patchew-devel@redhat.com
>
--
Best regards,
Vladimir
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PULL 0/4] Python queue for 5.0 soft freeze
2020-03-18 7:59 ` Vladimir Sementsov-Ogievskiy
@ 2020-03-18 16:12 ` Eduardo Habkost
2020-03-18 16:16 ` Aleksandar Markovic
0 siblings, 1 reply; 15+ messages in thread
From: Eduardo Habkost @ 2020-03-18 16:12 UTC (permalink / raw)
To: Vladimir Sementsov-Ogievskiy; +Cc: peter.maydell, qemu-devel, crosa
On Wed, Mar 18, 2020 at 10:59:22AM +0300, Vladimir Sementsov-Ogievskiy wrote:
> 18.03.2020 7:12, no-reply@patchew.org wrote:
> > Patchew URL: https://patchew.org/QEMU/20200318011217.2102748-1-ehabkost@redhat.com/
> >
> >
> >
> > Hi,
> >
> > This series seems to have some coding style problems. See output below for
> > more information:
> >
> > Subject: [PULL 0/4] Python queue for 5.0 soft freeze
> > Message-id: 20200318011217.2102748-1-ehabkost@redhat.com
> > Type: series
> >
> > === TEST SCRIPT BEGIN ===
> > #!/bin/bash
> > git rev-parse base > /dev/null || exit 0
> > git config --local diff.renamelimit 0
> > git config --local diff.renames True
> > git config --local diff.algorithm histogram
> > ./scripts/checkpatch.pl --mailback base..
> > === TEST SCRIPT END ===
> >
> > Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
> > Switched to a new branch 'test'
> > 1b4f6f3 MAINTAINERS: add simplebench
> > 57b42b6 scripts/simplebench: add example usage of simplebench
> > 99ea4d7 scripts/simplebench: add qemu/bench_block_job.py
> > 196f97d scripts/simplebench: add simplebench.py
> >
> > === OUTPUT BEGIN ===
> > 1/4 Checking commit 196f97d8566d (scripts/simplebench: add simplebench.py)
> > WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
> > #16:
> > new file mode 100644
> >
> > ERROR: please use python3 interpreter
> > #21: FILE: scripts/simplebench/simplebench.py:1:
> > +#!/usr/bin/env python
>
> Hmm, yes, we need to fix it.
>
> Should I resend?
>
Just send that as follow up bug fixes. No need to resend the
whole series.
--
Eduardo
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PULL 0/4] Python queue for 5.0 soft freeze
2020-03-18 16:12 ` Eduardo Habkost
@ 2020-03-18 16:16 ` Aleksandar Markovic
0 siblings, 0 replies; 15+ messages in thread
From: Aleksandar Markovic @ 2020-03-18 16:16 UTC (permalink / raw)
To: Eduardo Habkost
Cc: Peter Maydell, Vladimir Sementsov-Ogievskiy, qemu-devel, crosa
сре, 18. мар 2020. у 17:13 Eduardo Habkost <ehabkost@redhat.com> је написао/ла:
>
> On Wed, Mar 18, 2020 at 10:59:22AM +0300, Vladimir Sementsov-Ogievskiy wrote:
> > 18.03.2020 7:12, no-reply@patchew.org wrote:
> > > Patchew URL: https://patchew.org/QEMU/20200318011217.2102748-1-ehabkost@redhat.com/
> > >
> > >
> > >
> > > Hi,
> > >
> > > This series seems to have some coding style problems. See output below for
> > > more information:
> > >
> > > Subject: [PULL 0/4] Python queue for 5.0 soft freeze
> > > Message-id: 20200318011217.2102748-1-ehabkost@redhat.com
> > > Type: series
> > >
> > > === TEST SCRIPT BEGIN ===
> > > #!/bin/bash
> > > git rev-parse base > /dev/null || exit 0
> > > git config --local diff.renamelimit 0
> > > git config --local diff.renames True
> > > git config --local diff.algorithm histogram
> > > ./scripts/checkpatch.pl --mailback base..
> > > === TEST SCRIPT END ===
> > >
> > > Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384
> > > Switched to a new branch 'test'
> > > 1b4f6f3 MAINTAINERS: add simplebench
> > > 57b42b6 scripts/simplebench: add example usage of simplebench
> > > 99ea4d7 scripts/simplebench: add qemu/bench_block_job.py
> > > 196f97d scripts/simplebench: add simplebench.py
> > >
> > > === OUTPUT BEGIN ===
> > > 1/4 Checking commit 196f97d8566d (scripts/simplebench: add simplebench.py)
> > > WARNING: added, moved or deleted file(s), does MAINTAINERS need updating?
> > > #16:
> > > new file mode 100644
> > >
> > > ERROR: please use python3 interpreter
> > > #21: FILE: scripts/simplebench/simplebench.py:1:
> > > +#!/usr/bin/env python
> >
> > Hmm, yes, we need to fix it.
> >
> > Should I resend?
> >
>
> Just send that as follow up bug fixes. No need to resend the
> whole series.
>
Vladimir, you can send as follow-up fixes those changes in
output format that we both agree are needed for nicer output.
Thanks,
Aleksandar
> --
> Eduardo
>
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 5/4] scripts/simplebench: fix python script ! headers
2020-03-18 1:12 [PULL 0/4] Python queue for 5.0 soft freeze Eduardo Habkost
` (4 preceding siblings ...)
2020-03-18 4:12 ` [PULL 0/4] Python queue for 5.0 soft freeze no-reply
@ 2020-03-18 17:02 ` Vladimir Sementsov-Ogievskiy
2020-03-18 22:31 ` Philippe Mathieu-Daudé
2020-03-20 15:59 ` [PULL 0/4] Python queue for 5.0 soft freeze Peter Maydell
6 siblings, 1 reply; 15+ messages in thread
From: Vladimir Sementsov-Ogievskiy @ 2020-03-18 17:02 UTC (permalink / raw)
To: qemu-devel
Cc: peter.maydell, aleksandar.qemu.devel, vsementsov, ehabkost, crosa
- simplebench.py is not for executing by itself, so drop the header
- in bench_block_job.py fix python to python3
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
scripts/simplebench/bench_block_job.py | 2 +-
scripts/simplebench/simplebench.py | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/scripts/simplebench/bench_block_job.py b/scripts/simplebench/bench_block_job.py
index 9808d696cf..a0dda1dc4e 100755
--- a/scripts/simplebench/bench_block_job.py
+++ b/scripts/simplebench/bench_block_job.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
#
# Benchmark block jobs
#
diff --git a/scripts/simplebench/simplebench.py b/scripts/simplebench/simplebench.py
index 59e7314ff6..7e25f3590b 100644
--- a/scripts/simplebench/simplebench.py
+++ b/scripts/simplebench/simplebench.py
@@ -1,5 +1,3 @@
-#!/usr/bin/env python
-#
# Simple benchmarking framework
#
# Copyright (c) 2019 Virtuozzo International GmbH.
--
2.21.0
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH 5/4] scripts/simplebench: fix python script ! headers
2020-03-18 17:02 ` [PATCH 5/4] scripts/simplebench: fix python script ! headers Vladimir Sementsov-Ogievskiy
@ 2020-03-18 22:31 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 15+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-03-18 22:31 UTC (permalink / raw)
To: Vladimir Sementsov-Ogievskiy, qemu-devel
Cc: peter.maydell, aleksandar.qemu.devel, ehabkost, crosa
On 3/18/20 6:02 PM, Vladimir Sementsov-Ogievskiy wrote:
> - simplebench.py is not for executing by itself, so drop the header
> - in bench_block_job.py fix python to python3
>
> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
> ---
> scripts/simplebench/bench_block_job.py | 2 +-
> scripts/simplebench/simplebench.py | 2 --
> 2 files changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/scripts/simplebench/bench_block_job.py b/scripts/simplebench/bench_block_job.py
> index 9808d696cf..a0dda1dc4e 100755
> --- a/scripts/simplebench/bench_block_job.py
> +++ b/scripts/simplebench/bench_block_job.py
> @@ -1,4 +1,4 @@
> -#!/usr/bin/env python
> +#!/usr/bin/env python3
> #
> # Benchmark block jobs
> #
> diff --git a/scripts/simplebench/simplebench.py b/scripts/simplebench/simplebench.py
> index 59e7314ff6..7e25f3590b 100644
> --- a/scripts/simplebench/simplebench.py
> +++ b/scripts/simplebench/simplebench.py
> @@ -1,5 +1,3 @@
> -#!/usr/bin/env python
> -#
> # Simple benchmarking framework
> #
> # Copyright (c) 2019 Virtuozzo International GmbH.
>
I'd rather see this squashed in patches 1 and 2, if not:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PULL 0/4] Python queue for 5.0 soft freeze
2020-03-18 1:12 [PULL 0/4] Python queue for 5.0 soft freeze Eduardo Habkost
` (5 preceding siblings ...)
2020-03-18 17:02 ` [PATCH 5/4] scripts/simplebench: fix python script ! headers Vladimir Sementsov-Ogievskiy
@ 2020-03-20 15:59 ` Peter Maydell
2020-03-20 16:11 ` Philippe Mathieu-Daudé
6 siblings, 1 reply; 15+ messages in thread
From: Peter Maydell @ 2020-03-20 15:59 UTC (permalink / raw)
To: Eduardo Habkost
Cc: Vladimir Sementsov-Ogievskiy, QEMU Developers, Cleber Rosa
On Wed, 18 Mar 2020 at 01:12, Eduardo Habkost <ehabkost@redhat.com> wrote:
>
> The following changes since commit d649689a8ecb2e276cc20d3af6d416e3c299cb17:
>
> Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2020-03-17 18:33:05 +0000)
>
> are available in the Git repository at:
>
> git://github.com/ehabkost/qemu.git tags/python-next-pull-request
>
> for you to fetch changes up to f4abfc6cb037da951e7977a67171f361fc6d21d7:
>
> MAINTAINERS: add simplebench (2020-03-17 21:09:26 -0400)
>
> ----------------------------------------------------------------
> Python queue for 5.0 soft freeze
>
> * Add scripts/simplebench (Vladimir Sementsov-Ogievskiy)
>
Applied, thanks.
Please update the changelog at https://wiki.qemu.org/ChangeLog/5.0
for any user-visible changes.
-- PMM
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PULL 0/4] Python queue for 5.0 soft freeze
2020-03-20 15:59 ` [PULL 0/4] Python queue for 5.0 soft freeze Peter Maydell
@ 2020-03-20 16:11 ` Philippe Mathieu-Daudé
2020-03-20 16:14 ` Peter Maydell
0 siblings, 1 reply; 15+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-03-20 16:11 UTC (permalink / raw)
To: Peter Maydell, Eduardo Habkost
Cc: Vladimir Sementsov-Ogievskiy, QEMU Developers, Cleber Rosa
On 3/20/20 4:59 PM, Peter Maydell wrote:
> On Wed, 18 Mar 2020 at 01:12, Eduardo Habkost <ehabkost@redhat.com> wrote:
>>
>> The following changes since commit d649689a8ecb2e276cc20d3af6d416e3c299cb17:
>>
>> Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2020-03-17 18:33:05 +0000)
>>
>> are available in the Git repository at:
>>
>> git://github.com/ehabkost/qemu.git tags/python-next-pull-request
>>
>> for you to fetch changes up to f4abfc6cb037da951e7977a67171f361fc6d21d7:
>>
>> MAINTAINERS: add simplebench (2020-03-17 21:09:26 -0400)
>>
>> ----------------------------------------------------------------
>> Python queue for 5.0 soft freeze
>>
>> * Add scripts/simplebench (Vladimir Sementsov-Ogievskiy)
>>
>
>
> Applied, thanks.
I guess there was a mis understanding with Eduardo, he was going to
resend this pullrequest due to:
ERROR: please use python3 interpreter
#21: FILE: scripts/simplebench/bench_block_job.py:1:
+#!/usr/bin/env python
This was replied on the series cover:
https://www.mail-archive.com/qemu-devel@nongnu.org/msg690373.html
Can we apply Vladimir directly patch as a build-fix on top of the merge
commit 3d0ac346?
https://www.mail-archive.com/qemu-devel@nongnu.org/msg690385.html
>
> Please update the changelog at https://wiki.qemu.org/ChangeLog/5.0
> for any user-visible changes.
>
> -- PMM
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PULL 0/4] Python queue for 5.0 soft freeze
2020-03-20 16:11 ` Philippe Mathieu-Daudé
@ 2020-03-20 16:14 ` Peter Maydell
2020-03-20 16:19 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 15+ messages in thread
From: Peter Maydell @ 2020-03-20 16:14 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Cleber Rosa, Vladimir Sementsov-Ogievskiy, Eduardo Habkost,
QEMU Developers
On Fri, 20 Mar 2020 at 16:11, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>
> On 3/20/20 4:59 PM, Peter Maydell wrote:
> > On Wed, 18 Mar 2020 at 01:12, Eduardo Habkost <ehabkost@redhat.com> wrote:
> >>
> >> The following changes since commit d649689a8ecb2e276cc20d3af6d416e3c299cb17:
> >>
> >> Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2020-03-17 18:33:05 +0000)
> >>
> >> are available in the Git repository at:
> >>
> >> git://github.com/ehabkost/qemu.git tags/python-next-pull-request
> >>
> >> for you to fetch changes up to f4abfc6cb037da951e7977a67171f361fc6d21d7:
> >>
> >> MAINTAINERS: add simplebench (2020-03-17 21:09:26 -0400)
> >>
> >> ----------------------------------------------------------------
> >> Python queue for 5.0 soft freeze
> >>
> >> * Add scripts/simplebench (Vladimir Sementsov-Ogievskiy)
> >>
> >
> >
> > Applied, thanks.
>
> I guess there was a mis understanding with Eduardo, he was going to
> resend this pullrequest due to:
>
> ERROR: please use python3 interpreter
Ah, sorry. I'd read the replies to this thread as meaning that
those things were OK to fix as followup patches rather than
requiring a respin of the pull.
thanks
-- PMM
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PULL 0/4] Python queue for 5.0 soft freeze
2020-03-20 16:14 ` Peter Maydell
@ 2020-03-20 16:19 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 15+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-03-20 16:19 UTC (permalink / raw)
To: Peter Maydell
Cc: Cleber Rosa, Vladimir Sementsov-Ogievskiy, Eduardo Habkost,
QEMU Developers
On 3/20/20 5:14 PM, Peter Maydell wrote:
> On Fri, 20 Mar 2020 at 16:11, Philippe Mathieu-Daudé <philmd@redhat.com> wrote:
>>
>> On 3/20/20 4:59 PM, Peter Maydell wrote:
>>> On Wed, 18 Mar 2020 at 01:12, Eduardo Habkost <ehabkost@redhat.com> wrote:
>>>>
>>>> The following changes since commit d649689a8ecb2e276cc20d3af6d416e3c299cb17:
>>>>
>>>> Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (2020-03-17 18:33:05 +0000)
>>>>
>>>> are available in the Git repository at:
>>>>
>>>> git://github.com/ehabkost/qemu.git tags/python-next-pull-request
>>>>
>>>> for you to fetch changes up to f4abfc6cb037da951e7977a67171f361fc6d21d7:
>>>>
>>>> MAINTAINERS: add simplebench (2020-03-17 21:09:26 -0400)
>>>>
>>>> ----------------------------------------------------------------
>>>> Python queue for 5.0 soft freeze
>>>>
>>>> * Add scripts/simplebench (Vladimir Sementsov-Ogievskiy)
>>>>
>>>
>>>
>>> Applied, thanks.
>>
>> I guess there was a mis understanding with Eduardo, he was going to
>> resend this pullrequest due to:
>>
>> ERROR: please use python3 interpreter
>
> Ah, sorry. I'd read the replies to this thread as meaning that
> those things were OK to fix as followup patches rather than
> requiring a respin of the pull.
As you noticed, scripts/simplebench/bench_block_job.py is not run in our
tests, so no need to hold the other pull requests, we'll fix later.
Thanks,
Phil.
^ permalink raw reply [flat|nested] 15+ messages in thread