From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37002) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCpNF-0002sh-FZ for qemu-devel@nongnu.org; Mon, 10 Feb 2014 06:50:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WCpNA-0006N6-G3 for qemu-devel@nongnu.org; Mon, 10 Feb 2014 06:50:05 -0500 Received: from paradis.irqsave.net ([62.212.105.220]:49543) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCpNA-0006LK-5p for qemu-devel@nongnu.org; Mon, 10 Feb 2014 06:50:00 -0500 Date: Mon, 10 Feb 2014 12:49:56 +0100 From: =?iso-8859-1?Q?Beno=EEt?= Canet Message-ID: <20140210114956.GA3088@irqsave.net> References: <1391769813-15437-1-git-send-email-famz@redhat.com> <1391769813-15437-2-git-send-email-famz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <1391769813-15437-2-git-send-email-famz@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 1/5] qemu-io: Account IO by aio_read and aio_write List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng Cc: Kevin Wolf , =?iso-8859-1?Q?Beno=EEt?= Canet , qemu-devel@nongnu.org, Stefan Hajnoczi , pbonzini@redhat.com Le Friday 07 Feb 2014 =E0 18:43:29 (+0800), Fam Zheng a =E9crit : > This will enable accounting of aio requests issued from qemu-io aio > read/write commands. >=20 > Signed-off-by: Fam Zheng > --- > qemu-io-cmds.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) >=20 > diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c > index f1de24c..d68eb23 100644 > --- a/qemu-io-cmds.c > +++ b/qemu-io-cmds.c > @@ -1346,6 +1346,7 @@ out: > } > =20 > struct aio_ctx { > + BlockDriverState *bs; > QEMUIOVector qiov; > int64_t offset; > char *buf; > @@ -1353,6 +1354,7 @@ struct aio_ctx { > int vflag; > int Cflag; > int Pflag; > + BlockAcctCookie acct; > int pattern; > struct timeval t1; > }; > @@ -1370,6 +1372,8 @@ static void aio_write_done(void *opaque, int ret) > goto out; > } > =20 > + bdrv_acct_done(ctx->bs, &ctx->acct); > + > if (ctx->qflag) { > goto out; > } > @@ -1407,6 +1411,8 @@ static void aio_read_done(void *opaque, int ret) > g_free(cmp_buf); > } > =20 > + bdrv_acct_done(ctx->bs, &ctx->acct); > + > if (ctx->qflag) { > goto out; > } > @@ -1462,6 +1468,7 @@ static int aio_read_f(BlockDriverState *bs, int a= rgc, char **argv) > int nr_iov, c; > struct aio_ctx *ctx =3D g_new0(struct aio_ctx, 1); > =20 > + ctx->bs =3D bs; > while ((c =3D getopt(argc, argv, "CP:qv")) !=3D EOF) { > switch (c) { > case 'C': > @@ -1515,6 +1522,7 @@ static int aio_read_f(BlockDriverState *bs, int a= rgc, char **argv) > } > =20 > gettimeofday(&ctx->t1, NULL); > + bdrv_acct_start(bs, &ctx->acct, ctx->qiov.size, BDRV_ACCT_READ); > bdrv_aio_readv(bs, ctx->offset >> 9, &ctx->qiov, > ctx->qiov.size >> 9, aio_read_done, ctx); > return 0; > @@ -1558,6 +1566,7 @@ static int aio_write_f(BlockDriverState *bs, int = argc, char **argv) > int pattern =3D 0xcd; > struct aio_ctx *ctx =3D g_new0(struct aio_ctx, 1); > =20 > + ctx->bs =3D bs; > while ((c =3D getopt(argc, argv, "CqP:")) !=3D EOF) { > switch (c) { > case 'C': > @@ -1607,6 +1616,7 @@ static int aio_write_f(BlockDriverState *bs, int = argc, char **argv) > } > =20 > gettimeofday(&ctx->t1, NULL); > + bdrv_acct_start(bs, &ctx->acct, ctx->qiov.size, BDRV_ACCT_WRITE); > bdrv_aio_writev(bs, ctx->offset >> 9, &ctx->qiov, > ctx->qiov.size >> 9, aio_write_done, ctx); > return 0; > --=20 > 1.8.5.4 >=20 Reviewed-by: Benoit Canet