From nobody Mon Feb 9 20:35:28 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1495731024680392.0802611202985; Thu, 25 May 2017 09:50:24 -0700 (PDT) Received: from localhost ([::1]:32768 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDvxv-00060y-0l for importer@patchew.org; Thu, 25 May 2017 12:50:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51996) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dDvh5-000512-Oh for qemu-devel@nongnu.org; Thu, 25 May 2017 12:33:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dDvh4-0004CQ-Sz for qemu-devel@nongnu.org; Thu, 25 May 2017 12:32:59 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33942) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dDvh2-00045U-0f; Thu, 25 May 2017 12:32:56 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F3E474E35B; Thu, 25 May 2017 16:32:54 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-117-34.ams2.redhat.com [10.36.117.34]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v4PGWQ5N001654; Thu, 25 May 2017 12:32:53 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com F3E474E35B Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=pbonzini@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com F3E474E35B From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 25 May 2017 18:32:24 +0200 Message-Id: <20170525163225.29954-18-pbonzini@redhat.com> In-Reply-To: <20170525163225.29954-1-pbonzini@redhat.com> References: <20170525163225.29954-1-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Thu, 25 May 2017 16:32:55 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 17/18] block: introduce block_account_one_io X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: famz@redhat.com, stefanha@redhat.com, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This is the common code to account operations that produced actual I/O. Reviewed-by: Alberto Garcia Reviewed-by: Stefan Hajnoczi Signed-off-by: Paolo Bonzini --- block/accounting.c | 51 ++++++++++++++++++++++----------------------------- 1 file changed, 22 insertions(+), 29 deletions(-) diff --git a/block/accounting.c b/block/accounting.c index 3f457c4..a279e0b 100644 --- a/block/accounting.c +++ b/block/accounting.c @@ -86,7 +86,8 @@ void block_acct_start(BlockAcctStats *stats, BlockAcctCoo= kie *cookie, cookie->type =3D type; } =20 -void block_acct_done(BlockAcctStats *stats, BlockAcctCookie *cookie) +static void block_account_one_io(BlockAcctStats *stats, BlockAcctCookie *c= ookie, + bool failed) { BlockAcctTimedStats *s; int64_t time_ns =3D qemu_clock_get_ns(clock_type); @@ -98,31 +99,14 @@ void block_acct_done(BlockAcctStats *stats, BlockAcctCo= okie *cookie) =20 assert(cookie->type < BLOCK_MAX_IOTYPE); =20 - stats->nr_bytes[cookie->type] +=3D cookie->bytes; - stats->nr_ops[cookie->type]++; - stats->total_time_ns[cookie->type] +=3D latency_ns; - stats->last_access_time_ns =3D time_ns; - - QSLIST_FOREACH(s, &stats->intervals, entries) { - timed_average_account(&s->latency[cookie->type], latency_ns); + if (failed) { + stats->failed_ops[cookie->type]++; + } else { + stats->nr_bytes[cookie->type] +=3D cookie->bytes; + stats->nr_ops[cookie->type]++; } -} - -void block_acct_failed(BlockAcctStats *stats, BlockAcctCookie *cookie) -{ - assert(cookie->type < BLOCK_MAX_IOTYPE); - - stats->failed_ops[cookie->type]++; - - if (stats->account_failed) { - BlockAcctTimedStats *s; - int64_t time_ns =3D qemu_clock_get_ns(clock_type); - int64_t latency_ns =3D time_ns - cookie->start_time_ns; - - if (qtest_enabled()) { - latency_ns =3D qtest_latency_ns; - } =20 + if (!failed || stats->account_failed) { stats->total_time_ns[cookie->type] +=3D latency_ns; stats->last_access_time_ns =3D time_ns; =20 @@ -132,15 +116,24 @@ void block_acct_failed(BlockAcctStats *stats, BlockAc= ctCookie *cookie) } } =20 +void block_acct_done(BlockAcctStats *stats, BlockAcctCookie *cookie) +{ + block_account_one_io(stats, cookie, false); +} + +void block_acct_failed(BlockAcctStats *stats, BlockAcctCookie *cookie) +{ + block_account_one_io(stats, cookie, true); +} + void block_acct_invalid(BlockAcctStats *stats, enum BlockAcctType type) { assert(type < BLOCK_MAX_IOTYPE); =20 - /* block_acct_done() and block_acct_failed() update - * total_time_ns[], but this one does not. The reason is that - * invalid requests are accounted during their submission, - * therefore there's no actual I/O involved. */ - + /* block_account_one_io() updates total_time_ns[], but this one does + * not. The reason is that invalid requests are accounted during their + * submission, therefore there's no actual I/O involved. + */ stats->invalid_ops[type]++; =20 if (stats->account_invalid) { --=20 1.8.3.1