From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52655) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8X1e-0007qb-Dp for qemu-devel@nongnu.org; Wed, 29 Jan 2014 10:26:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W8X1Z-0005Im-9u for qemu-devel@nongnu.org; Wed, 29 Jan 2014 10:26:02 -0500 Received: from paradis.irqsave.net ([62.212.105.220]:48612) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W8X1Y-0005Hk-Pm for qemu-devel@nongnu.org; Wed, 29 Jan 2014 10:25:57 -0500 Date: Wed, 29 Jan 2014 16:25:54 +0100 From: =?iso-8859-1?Q?Beno=EEt?= Canet Message-ID: <20140129152554.GA3079@irqsave.net> References: <1390984843-2101-1-git-send-email-famz@redhat.com> <1390984843-2101-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: <1390984843-2101-2-git-send-email-famz@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 1/4] qemu-io: New option "-a" to 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 Le Wednesday 29 Jan 2014 =E0 16:40:40 (+0800), Fam Zheng a =E9crit : > This option will enable accounting of aio requests. >=20 > Signed-off-by: Fam Zheng > --- > qemu-io-cmds.c | 35 +++++++++++++++++++++++++++++++---- > 1 file changed, 31 insertions(+), 4 deletions(-) >=20 > diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c > index f1de24c..d6e20e6 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,8 @@ struct aio_ctx { > int vflag; > int Cflag; > int Pflag; > + int aflag; > + BlockAcctCookie acct; > int pattern; > struct timeval t1; > }; > @@ -1370,6 +1373,10 @@ static void aio_write_done(void *opaque, int ret= ) > goto out; > } > =20 > + if (ctx->aflag) { > + bdrv_acct_done(ctx->bs, &ctx->acct); > + } > + > if (ctx->qflag) { > goto out; > } > @@ -1407,6 +1414,10 @@ static void aio_read_done(void *opaque, int ret) > g_free(cmp_buf); > } > =20 > + if (ctx->aflag) { > + bdrv_acct_done(ctx->bs, &ctx->acct); > + } > + > if (ctx->qflag) { > goto out; > } > @@ -1442,6 +1453,7 @@ static void aio_read_help(void) > " -P, -- use a pattern to verify read data\n" > " -v, -- dump buffer to standard output\n" > " -q, -- quiet mode, do not show I/O statistics\n" > +" -a, -- account IO\n" > "\n"); > } > =20 > @@ -1452,7 +1464,7 @@ static const cmdinfo_t aio_read_cmd =3D { > .cfunc =3D aio_read_f, > .argmin =3D 2, > .argmax =3D -1, > - .args =3D "[-Cqv] [-P pattern ] off len [len..]", > + .args =3D "[-Cqva] [-P pattern ] off len [len..]", > .oneline =3D "asynchronously reads a number of bytes", > .help =3D aio_read_help, > }; > @@ -1462,7 +1474,8 @@ 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 > - while ((c =3D getopt(argc, argv, "CP:qv")) !=3D EOF) { > + ctx->bs =3D bs; > + while ((c =3D getopt(argc, argv, "CP:qva")) !=3D EOF) { > switch (c) { > case 'C': > ctx->Cflag =3D 1; > @@ -1481,6 +1494,9 @@ static int aio_read_f(BlockDriverState *bs, int a= rgc, char **argv) > case 'v': > ctx->vflag =3D 1; > break; > + case 'a': > + ctx->aflag =3D 1; > + break; > default: > g_free(ctx); > return qemuio_command_usage(&aio_read_cmd); > @@ -1515,6 +1531,9 @@ static int aio_read_f(BlockDriverState *bs, int a= rgc, char **argv) > } > =20 > gettimeofday(&ctx->t1, NULL); > + if (ctx->aflag) { > + 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; > @@ -1537,6 +1556,7 @@ static void aio_write_help(void) > " -P, -- use different pattern to fill file\n" > " -C, -- report statistics in a machine parsable format\n" > " -q, -- quiet mode, do not show I/O statistics\n" > +" -a, -- account IO\n" > "\n"); > } > =20 > @@ -1547,7 +1567,7 @@ static const cmdinfo_t aio_write_cmd =3D { > .cfunc =3D aio_write_f, > .argmin =3D 2, > .argmax =3D -1, > - .args =3D "[-Cq] [-P pattern ] off len [len..]", > + .args =3D "[-Cqa] [-P pattern ] off len [len..]", > .oneline =3D "asynchronously writes a number of bytes", > .help =3D aio_write_help, > }; > @@ -1558,7 +1578,8 @@ 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 > - while ((c =3D getopt(argc, argv, "CqP:")) !=3D EOF) { > + ctx->bs =3D bs; > + while ((c =3D getopt(argc, argv, "CqP:a")) !=3D EOF) { > switch (c) { > case 'C': > ctx->Cflag =3D 1; > @@ -1573,6 +1594,9 @@ static int aio_write_f(BlockDriverState *bs, int = argc, char **argv) > return 0; > } > break; > + case 'a': > + ctx->aflag =3D 1; > + break; > default: > g_free(ctx); > return qemuio_command_usage(&aio_write_cmd); > @@ -1607,6 +1631,9 @@ static int aio_write_f(BlockDriverState *bs, int = argc, char **argv) > } > =20 > gettimeofday(&ctx->t1, NULL); > + if (ctx->aflag) { > + bdrv_acct_start(bs, &ctx->acct, ctx->qiov.size, BDRV_ACCT_WRIT= E); > + } > bdrv_aio_writev(bs, ctx->offset >> 9, &ctx->qiov, > ctx->qiov.size >> 9, aio_write_done, ctx); > return 0; > --=20 > 1.8.5.3 >=20 >=20 Reviewed-by: Benoit Canet