Commit 0ddd0ad9 authored by Benoît Canet's avatar Benoît Canet Committed by Kevin Wolf
Browse files

block: Extract the BlockAcctStats structure 



Extract the block accounting statistics into a structure so the block device
models can hold them in the future.

CC: Kevin Wolf <kwolf@redhat.com>
CC: Stefan Hajnoczi <stefanha@redhat.com>
CC: Max Reitz <mreitz@redhat.com>
CC: Eric Blake <eblake@redhat.com>

Signed-off-by: default avatarBenoît Canet <benoit.canet@nodalink.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 1a7044bb

block.c

+6 −5
Original line number Diff line number Diff line
@@ -3363,8 +3363,8 @@ static int coroutine_fn bdrv_aligned_pwritev(BlockDriverState *bs, 


    bdrv_set_dirty(bs, sector_num, nb_sectors);



    if (bs->wr_highest_sector < sector_num + nb_sectors - 1) {

        bs->wr_highest_sector = sector_num + nb_sectors - 1;

    if (bs->stats.wr_highest_sector < sector_num + nb_sectors - 1) {

        bs->stats.wr_highest_sector = sector_num + nb_sectors - 1;

    }

    if (bs->growable && ret >= 0) {

        bs->total_sectors = MAX(bs->total_sectors, sector_num + nb_sectors);
@@ -5588,9 +5588,10 @@ bdrv_acct_done(BlockDriverState *bs, BlockAcctCookie *cookie) 
{

    assert(cookie->type < BDRV_MAX_IOTYPE);



    bs->nr_bytes[cookie->type] += cookie->bytes;

    bs->nr_ops[cookie->type]++;

    bs->total_time_ns[cookie->type] += get_clock() - cookie->start_time_ns;

    bs->stats.nr_bytes[cookie->type] += cookie->bytes;

    bs->stats.nr_ops[cookie->type]++;

    bs->stats.total_time_ns[cookie->type] += get_clock() -

                                             cookie->start_time_ns;

}



void bdrv_img_create(const char *filename, const char *fmt,

block/qapi.c

+10 −9
Original line number Diff line number Diff line
@@ -333,15 +333,16 @@ static BlockStats *bdrv_query_stats(const BlockDriverState *bs) 
    }



    s->stats = g_malloc0(sizeof(*s->stats));

    s->stats->rd_bytes = bs->nr_bytes[BDRV_ACCT_READ];

    s->stats->wr_bytes = bs->nr_bytes[BDRV_ACCT_WRITE];

    s->stats->rd_operations = bs->nr_ops[BDRV_ACCT_READ];

    s->stats->wr_operations = bs->nr_ops[BDRV_ACCT_WRITE];

    s->stats->wr_highest_offset = bs->wr_highest_sector * BDRV_SECTOR_SIZE;

    s->stats->flush_operations = bs->nr_ops[BDRV_ACCT_FLUSH];

    s->stats->wr_total_time_ns = bs->total_time_ns[BDRV_ACCT_WRITE];

    s->stats->rd_total_time_ns = bs->total_time_ns[BDRV_ACCT_READ];

    s->stats->flush_total_time_ns = bs->total_time_ns[BDRV_ACCT_FLUSH];

    s->stats->rd_bytes = bs->stats.nr_bytes[BDRV_ACCT_READ];

    s->stats->wr_bytes = bs->stats.nr_bytes[BDRV_ACCT_WRITE];

    s->stats->rd_operations = bs->stats.nr_ops[BDRV_ACCT_READ];

    s->stats->wr_operations = bs->stats.nr_ops[BDRV_ACCT_WRITE];

    s->stats->wr_highest_offset =

        bs->stats.wr_highest_sector * BDRV_SECTOR_SIZE;

    s->stats->flush_operations = bs->stats.nr_ops[BDRV_ACCT_FLUSH];

    s->stats->wr_total_time_ns = bs->stats.total_time_ns[BDRV_ACCT_WRITE];

    s->stats->rd_total_time_ns = bs->stats.total_time_ns[BDRV_ACCT_READ];

    s->stats->flush_total_time_ns = bs->stats.total_time_ns[BDRV_ACCT_FLUSH];



    if (bs->file) {

        s->has_parent = true;

include/block/block.h

+7 −0
Original line number Diff line number Diff line
@@ -492,6 +492,13 @@ enum BlockAcctType { 
    BDRV_MAX_IOTYPE,

};



typedef struct BlockAcctStats {

    uint64_t nr_bytes[BDRV_MAX_IOTYPE];

    uint64_t nr_ops[BDRV_MAX_IOTYPE];

    uint64_t total_time_ns[BDRV_MAX_IOTYPE];

    uint64_t wr_highest_sector;

} BlockAcctStats;



typedef struct BlockAcctCookie {

    int64_t bytes;

    int64_t start_time_ns;

include/block/block_int.h

+1 −4
Original line number Diff line number Diff line
@@ -359,10 +359,7 @@ struct BlockDriverState { 
    bool         io_limits_enabled;



    /* I/O stats (display with "info blockstats"). */

    uint64_t nr_bytes[BDRV_MAX_IOTYPE];

    uint64_t nr_ops[BDRV_MAX_IOTYPE];

    uint64_t total_time_ns[BDRV_MAX_IOTYPE];

    uint64_t wr_highest_sector;

    BlockAcctStats stats;



    /* I/O Limits */

    BlockLimits bl;