Commit f4564d53 authored by Peter Lieven's avatar Peter Lieven Committed by Kevin Wolf
Browse files

block: add accounting for merged requests 



Signed-off-by: default avatarPeter Lieven <pl@kamp.de>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 35f5a493

block.c

+2 −0
Original line number Diff line number Diff line
@@ -4559,6 +4559,8 @@ static int multiwrite_merge(BlockDriverState *bs, BlockRequest *reqs, 
        }

    }



    block_acct_merge_done(&bs->stats, BLOCK_ACCT_WRITE, num_reqs - outidx - 1);



    return outidx + 1;

}

block/accounting.c

+7 −0
Original line number Diff line number Diff line
@@ -54,3 +54,10 @@ void block_acct_highest_sector(BlockAcctStats *stats, int64_t sector_num, 
        stats->wr_highest_sector = sector_num + nb_sectors - 1;

    }

}



void block_acct_merge_done(BlockAcctStats *stats, enum BlockAcctType type,

                      int num_requests)

{

    assert(type < BLOCK_MAX_IOTYPE);

    stats->merged[type] += num_requests;

}

block/qapi.c

+2 −0
Original line number Diff line number Diff line
@@ -335,6 +335,8 @@ static BlockStats *bdrv_query_stats(const BlockDriverState *bs, 
    s->stats->wr_bytes = bs->stats.nr_bytes[BLOCK_ACCT_WRITE];

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

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

    s->stats->rd_merged = bs->stats.merged[BLOCK_ACCT_READ];

    s->stats->wr_merged = bs->stats.merged[BLOCK_ACCT_WRITE];

    s->stats->wr_highest_offset =

        bs->stats.wr_highest_sector * BDRV_SECTOR_SIZE;

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

hmp.c

+5 −1
Original line number Diff line number Diff line
@@ -474,6 +474,8 @@ void hmp_info_blockstats(Monitor *mon, const QDict *qdict) 
                       " wr_total_time_ns=%" PRId64

                       " rd_total_time_ns=%" PRId64

                       " flush_total_time_ns=%" PRId64

                       " rd_merged=%" PRId64

                       " wr_merged=%" PRId64

                       "\n",

                       stats->value->stats->rd_bytes,

                       stats->value->stats->wr_bytes,
@@ -482,7 +484,9 @@ void hmp_info_blockstats(Monitor *mon, const QDict *qdict) 
                       stats->value->stats->flush_operations,

                       stats->value->stats->wr_total_time_ns,

                       stats->value->stats->rd_total_time_ns,

                       stats->value->stats->flush_total_time_ns);

                       stats->value->stats->flush_total_time_ns,

                       stats->value->stats->rd_merged,

                       stats->value->stats->wr_merged);

    }



    qapi_free_BlockStatsList(stats_list);

include/block/accounting.h

+3 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ typedef struct BlockAcctStats { 
    uint64_t nr_bytes[BLOCK_MAX_IOTYPE];

    uint64_t nr_ops[BLOCK_MAX_IOTYPE];

    uint64_t total_time_ns[BLOCK_MAX_IOTYPE];

    uint64_t merged[BLOCK_MAX_IOTYPE];

    uint64_t wr_highest_sector;

} BlockAcctStats;
@@ -53,5 +54,7 @@ void block_acct_start(BlockAcctStats *stats, BlockAcctCookie *cookie, 
void block_acct_done(BlockAcctStats *stats, BlockAcctCookie *cookie);

void block_acct_highest_sector(BlockAcctStats *stats, int64_t sector_num,

                               unsigned int nb_sectors);

void block_acct_merge_done(BlockAcctStats *stats, enum BlockAcctType type,

                           int num_requests);



#endif