From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41853) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WBiuJ-0004dO-0Z for qemu-devel@nongnu.org; Fri, 07 Feb 2014 05:43:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WBiuC-00067Z-UO for qemu-devel@nongnu.org; Fri, 07 Feb 2014 05:43:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60169) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WBiuC-00067T-LJ for qemu-devel@nongnu.org; Fri, 07 Feb 2014 05:43:32 -0500 From: Fam Zheng Date: Fri, 7 Feb 2014 18:43:29 +0800 Message-Id: <1391769813-15437-2-git-send-email-famz@redhat.com> In-Reply-To: <1391769813-15437-1-git-send-email-famz@redhat.com> References: <1391769813-15437-1-git-send-email-famz@redhat.com> Subject: [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: qemu-devel@nongnu.org Cc: Kevin Wolf , =?UTF-8?q?Beno=C3=AEt=20Canet?= , Stefan Hajnoczi , pbonzini@redhat.com This will enable accounting of aio requests issued from qemu-io aio read/write commands. Signed-off-by: Fam Zheng --- qemu-io-cmds.c | 10 ++++++++++ 1 file changed, 10 insertions(+) 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: } 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; } + 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); } + bdrv_acct_done(ctx->bs, &ctx->acct); + if (ctx->qflag) { goto out; } @@ -1462,6 +1468,7 @@ static int aio_read_f(BlockDriverState *bs, int argc, char **argv) int nr_iov, c; struct aio_ctx *ctx = g_new0(struct aio_ctx, 1); + ctx->bs = bs; while ((c = getopt(argc, argv, "CP:qv")) != EOF) { switch (c) { case 'C': @@ -1515,6 +1522,7 @@ static int aio_read_f(BlockDriverState *bs, int argc, char **argv) } 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 = 0xcd; struct aio_ctx *ctx = g_new0(struct aio_ctx, 1); + ctx->bs = bs; while ((c = getopt(argc, argv, "CqP:")) != EOF) { switch (c) { case 'C': @@ -1607,6 +1616,7 @@ static int aio_write_f(BlockDriverState *bs, int argc, char **argv) } 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; -- 1.8.5.4