From patchwork Thu Mar 4 10:17:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 1447207 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.a=rsa-sha256 header.s=selector2 header.b=pjnxwpXA; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Drn0v51W0z9sW8 for ; Thu, 4 Mar 2021 21:19:43 +1100 (AEDT) Received: from localhost ([::1]:33312 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lHl53-0006hj-IU for incoming@patchwork.ozlabs.org; Thu, 04 Mar 2021 05:19:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49298) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHl3U-0004s3-TA; Thu, 04 Mar 2021 05:18:04 -0500 Received: from mail-eopbgr20120.outbound.protection.outlook.com ([40.107.2.120]:19927 helo=EUR02-VE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHl3T-0002G5-1r; Thu, 04 Mar 2021 05:18:04 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ce1ZSoyBgp5du6E72mXi8taT/dV5kVhK42KLG/kBXdBBEl9xYzoD6U6iyzT6p0mzO6rvS6UEASR7EowixniSsFKt59hGgzwlQUJwBJMFudGeFhFsTsB/XTpn3JJ6tGVGmUpNfxmH4a29OL3fhf+eVb2eDqkYhA7dyc4xVVCzjVTiis4TlVFgGjaxOJxndICYDbW1xVixjntdzLVy1BIwl2krdhFiR4fUF2aTBfIMqb2y1epYLF0I34SzH7Ax0lVOoPEO6rXa9h/VElzfMy7P25Lghe6G67vtoWRlGaKe2Hh2MXNW9lwROAtSRd6A50hJD6mBJNll8HzignIAUEaKVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rByT8a22LIBHxMkcmH2ih0FaMOD4GJLZWLnJMye3mjE=; b=NIWZeRQStp7VtEJCfKz4FL0D28Ne3m0KXysYr5JyFsgqDPlCbz1nNtfxtza2yXNy8/yEfyK1UEeJ0ERZl6s+I4TAuj3miu5KMKJZjbBddNFqyUV4/Ih8Z5I/SH4NZR2XM8cDKUxNovCfpNMNJMeH5nJOdMnTUMIQH1AOWJD1w++idDai/DteSEkieCBmmLC8cfXsndMHMhoMa/Fu8GKCTnSi/Ofk7RZ+C9K1H3mVxPpNtfTiSr9Yb75hHB6A2HgpjtxGySGU+jdrctq18w1BegTaE1RD3cBPyFpsuTFkkoD/gGbFxV/+oh/LLxF+6l5Vgg4qcF2R6P+Pa/eU8pscoQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rByT8a22LIBHxMkcmH2ih0FaMOD4GJLZWLnJMye3mjE=; b=pjnxwpXAI0pw3OnzU8LL/l7PHNsk4zrRfUbrykjsbLG5vu77FcOXupemsxenTmQy9YCyg0eHuIwNhnfimnA7DpVi3Jk3VLqhKjNcYKcOf0e5dB300a+pZmKV0YoJdRxy2F4y+cH6xalm+CBYqZmSoBpaltfYwe8IDrSXkdtRXww= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB4913.eurprd08.prod.outlook.com (2603:10a6:20b:ce::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.17; Thu, 4 Mar 2021 10:17:57 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3912.021; Thu, 4 Mar 2021 10:17:57 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, den@openvz.org, vsementsov@virtuozzo.com, mreitz@redhat.com Subject: [PATCH v2 1/8] simplebench: bench_one(): add slow_limit argument Date: Thu, 4 Mar 2021 13:17:31 +0300 Message-Id: <20210304101738.20248-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210304101738.20248-1-vsementsov@virtuozzo.com> References: <20210304101738.20248-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.246] X-ClientProxiedBy: HE1P189CA0032.EURP189.PROD.OUTLOOK.COM (2603:10a6:7:53::45) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.246) by HE1P189CA0032.EURP189.PROD.OUTLOOK.COM (2603:10a6:7:53::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.17 via Frontend Transport; Thu, 4 Mar 2021 10:17:56 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 02a7a066-4ba7-446c-3bf0-08d8def6c7d4 X-MS-TrafficTypeDiagnostic: AM6PR08MB4913: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: N+eG24QtiaMW7vjp18zN8sah3W08QKtA+4un3Hkz38Fv7NCxMaVroEUztv1kz5FdcPnVvYhkAqoXtnfB2Mt4DQxqrSiAhPIUQIuLWjTud60SZLh6yWXg7Vc49NuiM2r1/Owlwu7H0o0PwUDnw7nOttP4KzUms46AAKaz0OfLZKhvnPBKemuDuSh9FKCNvVWBFFfo3+p91WEFUHYMzkkJXtoDqIWGDZC19ucdtHsEeV8ccHSapPa2CFKB9rAF8GjSffGQ4ah6spAMqyo0koa6yCdayfBEECrscQ2M9utEScVJA26AntrYj0YGoaYbYnAKl/uhjf3snKtXH7FQ2E4FMlan9CRXkRqPjq2E2wqGF5LdZqHqR1vD1IkoqQRuWsl5+pLb9keoY7Hv3jHvz4BsWwlvc4/lXstEC/BCe2Bsq6M1K0jJxNIXrIENIkQ1pvUPrIG8jopcRTynEAD9vfwaz3eH0gsKse8viJTsGE2ahU23XdIluNaAlvTPQiytVE1Z3APZHN3Xcg3zQvhNEwwpbo8bc+coOHp76SJD9ASHB9TNynQMsmKQ/OVQoL8avSoFJnA8FzcbCRJu8C3KqlwRpw== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(39840400004)(136003)(376002)(396003)(366004)(346002)(186003)(26005)(5660300002)(4326008)(316002)(66476007)(8936002)(69590400012)(1076003)(8676002)(66946007)(66556008)(6916009)(52116002)(6506007)(6666004)(16526019)(956004)(36756003)(2616005)(6486002)(83380400001)(2906002)(86362001)(478600001)(6512007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: F6AAU8djUjeYdhLiAJufuvlXZP37W++OEY+vM9BWubrxMAihU+J6lYQOCFSuRWa4zZDbQ0XoTTyAHTSfe3+Pvf8srgwuaWJh9SvesrRj/YXPbEgcvOuaTLo96VHhUNwxeEy4FIl0Xwi1t9fIfwN2xzD5wPoj3JCZPp92gjFIysOAtBmI6tV1vZV5Lie3K/56ck//Z3/JoLv0TMhnLRxVzFRppSIb1fVCuAg2K0UJnVRuftqnBKhfzH8dO566h30uZXRdhDmXwQKnd+eNGxLkF3sR0TqpSo89JWQGDJrrzQimsWWAB7+pqiJ0U/bv/V/UnS9JEohwUyPwtKQDsb6eiDRrTdcB+2S1/WxzfpwbE53xvAJob1GDVHEaO8YG2X+TAdBLhvdp8Hkh1aKjJV05m1bnyYk/o0R2kFESTcfG88FS92riw0KfDW87cahCvVbp2Mn+yhkDLliOb6/Obua3Vu2fN5dskjiMTfqMtS0H5FM59jSGq7VigzJH68NSy4xI0VfPiQx5y7BFBShxqcjF/35UqpTqgHMtUcxS05DABIOqgjCDBPfDjsRDL/x15RGaJ8JWnxpc4pW+Vm9A+5AqLnc52KYOxWCQwYEIYT4UI08K8YNLjECGDSPVinDzLbmRqQdeopH/wqbKRcVRo73fMufPdjvrJX4zNVD/WRCr09LXxqk6HzsV+pmMMiwKZvTstpFiATwnE9D67UcYSQaFX2uiO2VR0IzOdgxggvD2oBvnLqFDa1DxEo0NovvIPGsyo1slS6fx9GM4dgqRgGD/UaAacCL1qblQrTDhHoL0GvHD6Z/8y4xFO7BjhKh1ySNzfE+ZVe511XDQ5byzZvnymbYaUNThFFz1tEttrkrIfYaaU9uGoS+P/rwkiG5Lj44uWHHrHfSw1jqJlmtcUOE+VUPubuPXJCUvU3W/4FvXEbCnmjHei2L9+01INqUpQ7TkAwnTKe4eGtpr+QWJeHzzwTsO+nG9eXRNSIWXrtxKeiWuxNNDD/5HCXDLxjBPH+HumdwMWC1xSGsM4gZ94XN8Ked1kgEN+uMHouQm7D88m+aLenGQY/bqhOes3L5+J/ledrHb/YOOBSXhM+PQBcWrD1NICL5+IkXPY5unhlvBrhgupqo9AFLPZmqQqfzoHgHR6n3LdOudWEIAtmo9+trPFuq2kSLkh45mgdGqG77W719KlcAP5hsypnCZ6/n/sAbnoW43Pz2T11/6Mg2pLMtWeXto/XLkIGZRS/q8LMvRvjVwKrrmPGRrblN3TFAGrjcKDzRC45F7NFp+zQe5/CwFjCd3wgqw+X744Cfu/IkfKb87rr2DhMepWDRmZqpxQcgd X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 02a7a066-4ba7-446c-3bf0-08d8def6c7d4 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2021 10:17:57.0444 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: SAqvbxdpToQsy0aEQT3JjIJrQyUAZh5c660O2IxF7KO1CaIQ4Qfkin84KW8hDYjqI7Q54y/EdjjmUXr05rKC1qjx6YJF90W1dQ5yJEakOK8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4913 Received-SPF: pass client-ip=40.107.2.120; envelope-from=vsementsov@virtuozzo.com; helo=EUR02-VE1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Sometimes one of cells in a testing table runs too slow. And we really don't want to wait so long. Limit number of runs in this case. Signed-off-by: Vladimir Sementsov-Ogievskiy --- scripts/simplebench/simplebench.py | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/scripts/simplebench/simplebench.py b/scripts/simplebench/simplebench.py index f61513af90..b153cae274 100644 --- a/scripts/simplebench/simplebench.py +++ b/scripts/simplebench/simplebench.py @@ -19,9 +19,11 @@ # import statistics +import time -def bench_one(test_func, test_env, test_case, count=5, initial_run=True): +def bench_one(test_func, test_env, test_case, count=5, initial_run=True, + slow_limit=100): """Benchmark one test-case test_func -- benchmarking function with prototype @@ -36,6 +38,8 @@ def bench_one(test_func, test_env, test_case, count=5, initial_run=True): 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 + slow_limit -- reduce test runs to 2, if current run exceedes the limit + (in seconds) Returns dict with the following fields: 'runs': list of test_func results @@ -47,17 +51,34 @@ def bench_one(test_func, test_env, test_case, count=5, initial_run=True): 'n-failed': number of failed runs (exists only if at least one run failed) """ + runs = [] + i = 0 if initial_run: + t = time.time() + print(' #initial run:') - print(' ', test_func(test_env, test_case)) + res = test_func(test_env, test_case) + print(' ', res) + + if time.time() - t > slow_limit: + print(' - initial run is too slow, so it counts') + runs.append(res) + i = 1 + + for i in range(i, count): + t = time.time() - runs = [] - for i in range(count): print(' #run {}'.format(i+1)) res = test_func(test_env, test_case) print(' ', res) runs.append(res) + if time.time() - t > slow_limit and len(runs) >= 2: + print(' - run is too slow, and we have enough runs, stop here') + break + + count = len(runs) + result = {'runs': runs} succeeded = [r for r in runs if ('seconds' in r or 'iops' in r)] From patchwork Thu Mar 4 10:17:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 1447215 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.a=rsa-sha256 header.s=selector2 header.b=rizp/V7w; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Drn6Z6cn1z9sPf for ; Thu, 4 Mar 2021 21:24:38 +1100 (AEDT) Received: from localhost ([::1]:50196 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lHl9o-0005U0-PB for incoming@patchwork.ozlabs.org; Thu, 04 Mar 2021 05:24:36 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49384) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHl3Z-00052G-7o; Thu, 04 Mar 2021 05:18:09 -0500 Received: from mail-eopbgr20120.outbound.protection.outlook.com ([40.107.2.120]:19927 helo=EUR02-VE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHl3W-0002G5-9Y; Thu, 04 Mar 2021 05:18:08 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aZRoePQWq4D7m1cGecpqpx6T5ShYtZgBVE0wAA3qCUtyIxr3MZl61xN14suFnJ3VS6l7sBU6fiSZUpJ9GXm2114WLzXGlrISH8pRDVK1vfYiPCegSOGEYCi3udtYya30DyeozfoReFMKSMbziL7itm5wd1MnjaEQXqHX/BZxdY0eA2Gp8CYSBd0gy8Jfe7aVRSQZYX59hxjtfFRVSms9ThLeewTq0FMoKTVIPAkuv25jgDoVzVOlafVNuPmdOx9LGtOn91QfrNR/FqYX3oYZ7XDSM+tUcl8yQP2I47MJG8XsKd7vAdr6LX5LYtOx2D3WPmprqoJi57hXel+TMcruag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3XtyZ15xm6Glfp6kjpULXtIJKc0Ul3QK++6UsbXKgWU=; b=aXd1K10vYtzfg7mEXpR6/mRQfRSrW+5FUhzBB5dDshtBds3HjqJKozRIWHva8PlQwbBUUi4AFGDfI6Ap07tjO42F1k6mFAxTPXxobtJ4E8YPzhM5vH8p/0QLLkKWQ0nHJ0N2LwLtYLARvhBqMPSX26mmJOm8Y96h9qP/tgidsBB+MZWg9fvWIndFmpB33NOEaSAJXwrPOHDYiR1wytKWPyd3iG/itiFrRamtN/Io2JxMIlUEn7DfKxoiqBiESKwcS7Gg6oHXOTJhGm8NIC9VEA1ZR3DkGzfFwR9InKdi+gzBDoUhOijcK52p4IJsf2Ca3JslYUECcops0mZuestWjA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3XtyZ15xm6Glfp6kjpULXtIJKc0Ul3QK++6UsbXKgWU=; b=rizp/V7w8+oJixJ9pz6xeboWf+IfkKBSt74YovDEkJo/mbW+JuL7U6qAbxxxzMgU7zUe7HBT/gBtBuFyTSW/Zau18z845fYM61Y6UjxZbkBiKvdisNPqz/tkOSTWoxALhIO8C+V3F1ygJ1uiI3lG23GCriIL050WtJexj+bD6kM= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB4913.eurprd08.prod.outlook.com (2603:10a6:20b:ce::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.17; Thu, 4 Mar 2021 10:17:58 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3912.021; Thu, 4 Mar 2021 10:17:58 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, den@openvz.org, vsementsov@virtuozzo.com, mreitz@redhat.com Subject: [PATCH v2 2/8] simplebench: bench_one(): support count=1 Date: Thu, 4 Mar 2021 13:17:32 +0300 Message-Id: <20210304101738.20248-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210304101738.20248-1-vsementsov@virtuozzo.com> References: <20210304101738.20248-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.246] X-ClientProxiedBy: HE1P189CA0032.EURP189.PROD.OUTLOOK.COM (2603:10a6:7:53::45) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.246) by HE1P189CA0032.EURP189.PROD.OUTLOOK.COM (2603:10a6:7:53::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.17 via Frontend Transport; Thu, 4 Mar 2021 10:17:57 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ecefa234-adbc-45bf-34bc-08d8def6c874 X-MS-TrafficTypeDiagnostic: AM6PR08MB4913: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2043; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qf+s/nRF5B0jCIA4hPmGpzrj6jcnvGfMCt7onrjQOCFUbYQqsb8IDnHMpK5//MOH7sHfYGomlYAV4wM5kghira96MFRikYW0KtM0ZHXPl1XHG/x59GBiH9RDCsSOiCCoYCmcwltA4pFLrGDdtwsKX4EBlhooXuncDygCUe957qGwv6YxsE7CbJLZQH0OsofU57DuI4K9hS7TI7TC+Ky8Xa5MowOSWu1f2JB7ulYSAlnZQNKfJ4nI/mjDwaveD410OTa0q5QUebGzwLfjHL6Yv/59RWTfqt7+rTB/nJCAXl5dpw+PZBy/vLS9JcM//L+0N1VPJqFxNW4JrsxcT8aqLRKEadzSEEv45BQvMCS6gMQJSpwJ/yBc/qPoY33ri7QOYoqlxrknxOswczOT9zEQtsVL8nZViut7bMaPf/5nzfa6p0pyRleNypVI1RCOwR66ypvSXXoecAbxBYZK2DJCPMh4NcvSkvB8TvfkLYYH84CDifNFzS0pcKDyGkpQ+JCq+ynWUGrA0Vi48z3SKu6vIqReLDqF4s9Q+McG+FFqkjvp2RmyUgAxfjIlJ6ChSSyFdMDGZ8oaBX8w7HoC9L1dog== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(39840400004)(136003)(376002)(396003)(366004)(346002)(186003)(26005)(4744005)(5660300002)(4326008)(316002)(66476007)(8936002)(69590400012)(1076003)(8676002)(66946007)(66556008)(6916009)(52116002)(6506007)(6666004)(16526019)(956004)(36756003)(2616005)(6486002)(83380400001)(2906002)(86362001)(478600001)(6512007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: tGgX8dARKkCW82dl2+6ZabJi0hmfWtUz7/RQ9dNIiWnjNPwKZbP5kHB2lIMBL0DUKUBWU6ZQ4lpVoUgdJs/zGesQ8ZKAyOT+5x53Gm1joFl09ZyGEDQ7sZPWH6Xj5DoOr/hs0b7N2vsU9BnEFJH0LIQ9GvJ/lGJrcE+fQCv7ie1bYvl4mBvFB2WrTh/MQUcCJIXn0sxTPlHTUnztkUs2VPo5p3jYlyqnsfR31kFSYpe8dlCvNiApLqvZ1YD75CZ1mIklDn9kRes3TOsye8EK1nFJ7FUL/7UOQFEsUV3kay8L9wd4CH7ddcbSVUZnpJjXnVF7FIovd6jryOqgfqjqGMUK4WtrGtWFe2U5qtv/l40tG5EBN2XL+uXl93vL7DDojmjhsPu5emBMwfQN9DOlQ0pb8OWkiDE5Rlr+o6ZTMp/IewpV+2o+kIXckDzIIuVJP9nv3gZN2vJuvYBrkOWtLSbNJVpC+6aGkn4auwT6SWPnnO+dtA2U//FyfI84JH6v18qo5W2meR9AdTy29jY0JGNfY4mdVzrLI3kD3e980K7OUyLKckVcO8oKLIBQdsiaaNm38q804/+SHWFom0Qn6KH+44seF9G7oZR0pAnKQZYYwtVzZnAVlDV4VSy2VvpJaC8k7862Ks0BdVbRUqHHdtj2YLEjxbKxf/o5baeyBH2zpgXhKrqY2H+AoSQ+EsWVW7zwdQGPXc37DfASBjvCb/J/YDFy4UiRlTObK7YxAsXORCGjdp6iZmvl+aISO+vh6WDIFlWyRxcRfaof/udP/kSYs1TOVIP22qpg9D7tk4HJ8AKN4eiPL8C49IvIB3PmQKq2Qc7yysUsRvkvWm+XJmRvb3qHZAo/rYkHTJ1Nh0hzdoM/XalavJ2YvIk/amguAzuZs4TbDMc24NhInAPF0OqxNLYXMXpZLrmmZBu7rdqlkQ6JfKJn9SwCtqMoBgF/pIAJp5Ac+twxHRTQkTCJ5bSSNP5Al+nLOxrhBrCI4Ejofo/GkydaiA7hqxxNDTtnKU323p88DF3XZgHYIEq3/ZbVtjX5cUL+UvCGpNhd38rkVCPy5vG7g9BTy9LaehjwjfKy9BV30KyEuFqcicANsQfaUqgE3b43zO0ptUWCOLr6dMy3vfTxlqIsw/PPoAj4bFy5HJwPb5q32KU7RmbeQnfpD8/86wMGTBd+m19ZJ+jBm5SQgwKn1buoKm3oBu5eV3wWzFVVKTYviIKJwgmpcGQQ4bAwcYbbGow/tdW0YrN6S239lNgeQi2qbUmUZQ3l3M336AqWU/K6ccl5GTbLqJz4Yhk7eC3QA0gOlPjUEvoD150K0XQH/Y2sZrXb8pCt X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: ecefa234-adbc-45bf-34bc-08d8def6c874 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2021 10:17:58.1022 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 2/6NvkNnIsnx3xsz04LxU3ircYDl2a0N/00MTr+/J0WgmhLLZgS2Pi9s9xhRcFIBPPbH0oByUbFnwglV4Nc4zyqzWPlWJplueZMePsMMs9E= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4913 Received-SPF: pass client-ip=40.107.2.120; envelope-from=vsementsov@virtuozzo.com; helo=EUR02-VE1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" statistics.stdev raises if sequence length is less than two. Support that case by hand. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: John Snow --- scripts/simplebench/simplebench.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/simplebench/simplebench.py b/scripts/simplebench/simplebench.py index b153cae274..712e1f845b 100644 --- a/scripts/simplebench/simplebench.py +++ b/scripts/simplebench/simplebench.py @@ -92,7 +92,10 @@ def bench_one(test_func, test_env, test_case, count=5, initial_run=True, dim = 'seconds' result['dimension'] = dim result['average'] = statistics.mean(r[dim] for r in succeeded) - result['stdev'] = statistics.stdev(r[dim] for r in succeeded) + if len(succeeded) == 1: + result['stdev'] = 0 + else: + result['stdev'] = statistics.stdev(r[dim] for r in succeeded) if len(succeeded) < count: result['n-failed'] = count - len(succeeded) From patchwork Thu Mar 4 10:17:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vladimir Sementsov-Ogievskiy X-Patchwork-Id: 1447209 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.a=rsa-sha256 header.s=selector2 header.b=ptsolPhs; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4Drn2J5L1lz9sW4 for ; Thu, 4 Mar 2021 21:20:56 +1100 (AEDT) Received: from localhost ([::1]:35304 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lHl6E-0007WO-Kx for incoming@patchwork.ozlabs.org; Thu, 04 Mar 2021 05:20:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49424) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHl3b-00059R-V8; Thu, 04 Mar 2021 05:18:11 -0500 Received: from mail-eopbgr20120.outbound.protection.outlook.com ([40.107.2.120]:19927 helo=EUR02-VE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lHl3a-0002G5-1p; Thu, 04 Mar 2021 05:18:11 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BmZi/aKGs/0/w8sU0XpEqr203Wst3YwHz0lJydzAJ/vEn5VXyrUxeNKonhnhz3ljLiHd67gHCrik6/j36odt71Z2/WHUrSbbkOWdgiX3NzOyG0u3J054YaSBezWju6ha0BxspFb8K7yqDC4U62d+wwatDZ++kFDiKvdD6dCjhCDMZAjrgn0RlztUh7xWPc+fOHVA/v1OFudmNXKrlgh+qZ/vONMnGDJP1ddbnRZl2/x7u0SW36E7S0K4PR56MZFjQnKa/7U/wkkEMsuTH1b+HEaTnefLepb3EKv21bcexhTwVF/sRGoaVTm75ywk/5uu8n/2CuQPgoLfcahephxICg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+Jk7bpcHmP57dmdGTMhum4TU5RdI78Qv+TLwSse18q8=; b=XwwAJ5RxSzyjiK7Dvd61xAvwnTCRRnFqoAa9XdzjsB+i2eAYPEUFpSy35mwpD/nlrkCThspCgsOQDJUlJEZTvyntD9dDpRY3aTSwA8+km42QbQd0bCsH6BmmnrGKB7Ai6GXYpDwSDaFqt6jcXz7AKR5SlbgdLk5jZouA31cwBzaMa+iiEU7qRaccIvHRuGKqHxaC2hKApNGRVHgIsmHn3CuEQRwOXGp+DAs3P/VecjzjecNLFmplPtb4e33qhPSy2Hd22SGTRCIXbTxz2ptFKC7mZLn6TSehh66b69TJVBCkcTRlQ17/vUK2LgPRL6sHZDR0dW2WujKAzDgc7I8xZA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+Jk7bpcHmP57dmdGTMhum4TU5RdI78Qv+TLwSse18q8=; b=ptsolPhs9/euxrkYUvugRzgXzA44b/rJFBKnD5jw0PPQldZPnbsUy5rNCVWluOl9bSDTPkOy1F088OX2dLDNIqKX/bE6f9simNeeWi80rycYBndruNIbNNKqujKLxmcv1ZYOw6kwyd8bu9CDWf5Ss8u/mdk/5A/LyjRZ/3uymUA= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB4913.eurprd08.prod.outlook.com (2603:10a6:20b:ce::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.17; Thu, 4 Mar 2021 10:17:59 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::f1f0:6610:11f5:5e4a%8]) with mapi id 15.20.3912.021; Thu, 4 Mar 2021 10:17:59 +0000 From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, den@openvz.org, vsementsov@virtuozzo.com, mreitz@redhat.com Subject: [PATCH v2 3/8] simplebench/bench-backup: add --compressed option Date: Thu, 4 Mar 2021 13:17:33 +0300 Message-Id: <20210304101738.20248-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210304101738.20248-1-vsementsov@virtuozzo.com> References: <20210304101738.20248-1-vsementsov@virtuozzo.com> X-Originating-IP: [185.215.60.246] X-ClientProxiedBy: HE1P189CA0032.EURP189.PROD.OUTLOOK.COM (2603:10a6:7:53::45) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (185.215.60.246) by HE1P189CA0032.EURP189.PROD.OUTLOOK.COM (2603:10a6:7:53::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3912.17 via Frontend Transport; Thu, 4 Mar 2021 10:17:58 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c27e1102-982c-43bf-103d-08d8def6c911 X-MS-TrafficTypeDiagnostic: AM6PR08MB4913: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fUu7yd64GQyKruHFh40OxW1aaCgl4KqQVmtCnkVNjNZ7IHTPpBJ/2kP/J6nsa8qhgj94DHPbRnQ7MR8pXcMKV4zoecs7LIOLL6rLDsFT+joIM7E/r2WhukYBvIadAfCYz6XIkBevb1denKp6sV/Vw4/PhQIc5/CvnBdxxMK2milXJ0Yt97BJaqBI0tk01A9fYuiklWbCdIRZuW4bQahd1JwjS6YFGvDRi2TAjYkUrpicJ7U7usG95/Izesx0zENAJTu7wZmw6AjDHr/R5zuv49qj1p+bOwQ8UvQ0J1Y2VzhZDcJjq56bniWSqoyObSbmDLeQMYXfguRtHzyGF9qKMgEEPKAv/BHONi5QkivfNP0lG8kXmgijaaKeeVgMlK3ZcuoUBc7i6MgvmoPmxaaafUr41LCkYqozN3JlTSzpPcIel38n0XzSvdX8jDg1yCZlF7MGWH3dEcP+eROyTpPLgmKnuOZ/PWlL/p3sjGUGBlnBkvf3yls/zqTnkB9jYv8nzgF4xoy2Uf6F1qsanhIDtG7Wm2vJwteDM1IRddv0NpH/FTwJd6d4QtzjOGh9uGhTanUYJ5xulqSVBlikEh2ahg== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(39840400004)(136003)(376002)(396003)(366004)(346002)(186003)(26005)(5660300002)(4326008)(316002)(66476007)(8936002)(69590400012)(1076003)(8676002)(66946007)(66556008)(6916009)(52116002)(6506007)(6666004)(16526019)(956004)(36756003)(2616005)(6486002)(83380400001)(2906002)(86362001)(478600001)(6512007); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: 0ZmVf1BjrYcwch2q8TV2IHLvyRM2SnQn9/Ov51QIYs/3DchWlypHuWnV2G9Qbj+VX/tJ/dObkDISSwOP035UYFQWTofkMYag7R0QJpTnrCltvfettpCz8uYKrYL+60hvc0MGjFjuwXmBtYl8xT2tM8JYVvJ5xxA0vUEw/3HqdHq95ER+xih/m8B2qQJ8mx5S0QRkYObgHid1IYeMoCUzXWPHy7OfmvYaRQwD3AQ7g95ARm+JQ+ftdB/uc8rbP41JuTXgQ807MY6u1+mGI6xTdvv5LKjUlUliEjE9pK3a4/GJ9h9Ki+H7ZfudyI6jiF3az/Iy7kUBXlLv1ILzn6VLj56+sUKiEGSp+BV+epq1TEGqmNJE1PusqIXuclILsgx2pw+H1CzQfMTVmX4B4n7J+c4FHih7jIkxLy8q+Ryz2G0T/vYOOXPpYL/4OwN7C8XTrP8DWVn/xVugrSMpTccqGSwLrVd+VviMi9R9lRpkp3iDH09VF74q/0Lot5PDhxKPPHRw7TO3MUNeLxJmZ4pybwDdNaXvianL2hHNrI79BPJDKjL5fZOGcb84r/zJ1mdfAkG60UAtw4x67JmIGBKj5iHdj0b/nw6BecZObW+GACXtFsGus6hNgkyKI0D0q3iWzxngEcWunCNWsI+j5u+9GiwF0+n0yDWUkoR3GoyYi1lR2Vrq9V/AlIKU3W3zwGMiknKXDeerENEcf95O8zryVqBozKuw1YX+qe53IG3tn17+2F32kL6ZEdnSP/CDoQB32pb7z0yRZEuKJbww9iHGnC6/ys8BqaF6pURL9QqeAd5uBconny/oymmouJLtoY3YZBKtL2inZwCLNYjUlp4iJdKPV3jnabOtyq0AYdqGvQit9wE9xjOTTWT71Cldv5D4LVgkZmnjY5+dIjAiFXCSC6tuZwUMt2473VfqDUXXq1Q15Hqsa9OOZtzkMWZL6Jw5YMFq7CzOAoV6dPisqWTaLcsCcgNUjg6iil1oPGOhqOnc3Jib4mng5epsucSOGcHPNAUR6UUJYzNApTcXb6dMO1FMeCtTKFzSj3KH7++vGkdDWcKVIwVfToJusxTff74XGGt8KH3Hqs/pPnyZX47g7iKs9R5YHVmLRB0pXqmoxly5biX4hSlfK4gbzDEu9E/QRFtD8HWMjrtJq5geiVQOa3v5VPr9jOTkWzl0UpBTSj41AJ7aLh6rK2MaGJIlZDRdN7T1fF6NnvSoTbfUhJqgypJbn/2PnYxiSIxuK3JTORka7tty3dSrk6gFqQg5bnyWAPrgx6uw3xPanjoIMEckyPWsvGLvK5b8t4LDz9DD/R+fjUbsP/eI6J0kfceWGiW+ X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: c27e1102-982c-43bf-103d-08d8def6c911 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Mar 2021 10:17:59.1153 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: u9QiXEWd0rtYnp3+HG01TkupgoJwD21W1JBCk8YayhFGuU4xpeu8NJpgiq4eEISmmn2ozuMryP3faFOoNLjys2Ce2q9abT0TTCCNkUug8Eg= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4913 Received-SPF: pass client-ip=40.107.2.120; envelope-from=vsementsov@virtuozzo.com; helo=EUR02-VE1-obe.outbound.protection.outlook.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Allow bench compressed backup. Signed-off-by: Vladimir Sementsov-Ogievskiy --- scripts/simplebench/bench-backup.py | 55 ++++++++++++++++++-------- scripts/simplebench/bench_block_job.py | 23 +++++++++++ 2 files changed, 62 insertions(+), 16 deletions(-) diff --git a/scripts/simplebench/bench-backup.py b/scripts/simplebench/bench-backup.py index 33a1ecfefa..72eae85bb1 100755 --- a/scripts/simplebench/bench-backup.py +++ b/scripts/simplebench/bench-backup.py @@ -23,7 +23,7 @@ import simplebench from results_to_text import results_to_text -from bench_block_job import bench_block_copy, drv_file, drv_nbd +from bench_block_job import bench_block_copy, drv_file, drv_nbd, drv_qcow2 def bench_func(env, case): @@ -37,29 +37,41 @@ def bench_func(env, case): def bench(args): test_cases = [] - sources = {} - targets = {} - for d in args.dir: - label, path = d.split(':') # paths with colon not supported - sources[label] = drv_file(path + '/test-source') - targets[label] = drv_file(path + '/test-target') + # paths with colon not supported, so we just split by ':' + dirs = dict(d.split(':') for d in args.dir) + nbd_drv = None if args.nbd: nbd = args.nbd.split(':') host = nbd[0] port = '10809' if len(nbd) == 1 else nbd[1] - drv = drv_nbd(host, port) - sources['nbd'] = drv - targets['nbd'] = drv + nbd_drv = drv_nbd(host, port) for t in args.test: src, dst = t.split(':') - test_cases.append({ - 'id': t, - 'source': sources[src], - 'target': targets[dst] - }) + if src == 'nbd' and dst == 'nbd': + raise ValueError("Can't use 'nbd' label for both src and dst") + + if (src == 'nbd' or dst == 'nbd') and not nbd_drv: + raise ValueError("'nbd' label used but --nbd is not given") + + if src == 'nbd': + source = nbd_drv + else: + source = drv_file(dirs[src] + '/test-source') + + if dst == 'nbd': + test_cases.append({'id': t, 'source': source, 'target': nbd_drv}) + continue + + fname = dirs[dst] + '/test-target' + if args.compressed: + fname += '.qcow2' + target = drv_file(fname) + if args.compressed: + target = drv_qcow2(target) + test_cases.append({'id': t, 'source': source, 'target': target}) binaries = [] # list of (