block: introduce block_account_one_io
This is the common code to account operations that produced actual I/O. Reviewed-by: Alberto Garcia <berto@igalia.com> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Message-Id: <20170605123908.18777-18-pbonzini@redhat.com> Signed-off-by: Fam Zheng <famz@redhat.com>
This commit is contained in:
parent
b64bd51efa
commit
39c1b4254e
|
@ -86,7 +86,8 @@ void block_acct_start(BlockAcctStats *stats, BlockAcctCookie *cookie,
|
||||||
cookie->type = type;
|
cookie->type = type;
|
||||||
}
|
}
|
||||||
|
|
||||||
void block_acct_done(BlockAcctStats *stats, BlockAcctCookie *cookie)
|
static void block_account_one_io(BlockAcctStats *stats, BlockAcctCookie *cookie,
|
||||||
|
bool failed)
|
||||||
{
|
{
|
||||||
BlockAcctTimedStats *s;
|
BlockAcctTimedStats *s;
|
||||||
int64_t time_ns = qemu_clock_get_ns(clock_type);
|
int64_t time_ns = qemu_clock_get_ns(clock_type);
|
||||||
|
@ -98,31 +99,14 @@ void block_acct_done(BlockAcctStats *stats, BlockAcctCookie *cookie)
|
||||||
|
|
||||||
assert(cookie->type < BLOCK_MAX_IOTYPE);
|
assert(cookie->type < BLOCK_MAX_IOTYPE);
|
||||||
|
|
||||||
stats->nr_bytes[cookie->type] += cookie->bytes;
|
if (failed) {
|
||||||
stats->nr_ops[cookie->type]++;
|
stats->failed_ops[cookie->type]++;
|
||||||
stats->total_time_ns[cookie->type] += latency_ns;
|
} else {
|
||||||
stats->last_access_time_ns = time_ns;
|
stats->nr_bytes[cookie->type] += cookie->bytes;
|
||||||
|
stats->nr_ops[cookie->type]++;
|
||||||
QSLIST_FOREACH(s, &stats->intervals, entries) {
|
|
||||||
timed_average_account(&s->latency[cookie->type], latency_ns);
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
void block_acct_failed(BlockAcctStats *stats, BlockAcctCookie *cookie)
|
|
||||||
{
|
|
||||||
assert(cookie->type < BLOCK_MAX_IOTYPE);
|
|
||||||
|
|
||||||
stats->failed_ops[cookie->type]++;
|
|
||||||
|
|
||||||
if (stats->account_failed) {
|
|
||||||
BlockAcctTimedStats *s;
|
|
||||||
int64_t time_ns = qemu_clock_get_ns(clock_type);
|
|
||||||
int64_t latency_ns = time_ns - cookie->start_time_ns;
|
|
||||||
|
|
||||||
if (qtest_enabled()) {
|
|
||||||
latency_ns = qtest_latency_ns;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
if (!failed || stats->account_failed) {
|
||||||
stats->total_time_ns[cookie->type] += latency_ns;
|
stats->total_time_ns[cookie->type] += latency_ns;
|
||||||
stats->last_access_time_ns = time_ns;
|
stats->last_access_time_ns = time_ns;
|
||||||
|
|
||||||
|
@ -132,15 +116,24 @@ void block_acct_failed(BlockAcctStats *stats, BlockAcctCookie *cookie)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void block_acct_done(BlockAcctStats *stats, BlockAcctCookie *cookie)
|
||||||
|
{
|
||||||
|
block_account_one_io(stats, cookie, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
void block_acct_failed(BlockAcctStats *stats, BlockAcctCookie *cookie)
|
||||||
|
{
|
||||||
|
block_account_one_io(stats, cookie, true);
|
||||||
|
}
|
||||||
|
|
||||||
void block_acct_invalid(BlockAcctStats *stats, enum BlockAcctType type)
|
void block_acct_invalid(BlockAcctStats *stats, enum BlockAcctType type)
|
||||||
{
|
{
|
||||||
assert(type < BLOCK_MAX_IOTYPE);
|
assert(type < BLOCK_MAX_IOTYPE);
|
||||||
|
|
||||||
/* block_acct_done() and block_acct_failed() update
|
/* block_account_one_io() updates total_time_ns[], but this one does
|
||||||
* total_time_ns[], but this one does not. The reason is that
|
* not. The reason is that invalid requests are accounted during their
|
||||||
* invalid requests are accounted during their submission,
|
* submission, therefore there's no actual I/O involved.
|
||||||
* therefore there's no actual I/O involved. */
|
*/
|
||||||
|
|
||||||
stats->invalid_ops[type]++;
|
stats->invalid_ops[type]++;
|
||||||
|
|
||||||
if (stats->account_invalid) {
|
if (stats->account_invalid) {
|
||||||
|
|
Loading…
Reference in New Issue