ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bdevperf: Rename perf_dump_ctx to bdevperf_aggregate_stats

Browse Source 
Signed-off-by: Ben Walker <benjamin.walker@intel.com>
Change-Id: I661fa03690b53fee1dcb7343d3f03c629e6e96c1
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1871
Community-CI: Mellanox Build Bot
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
This commit is contained in:
Ben Walker 2020-04-15 11:43:34 -07:00 committed by Tomasz Zawadzki
parent 94d42195b6
commit 83bf754674
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
test/bdev/bdevperf/bdevperf.c
View File

@ -143,7 +143,7 @@ static struct spdk_bdevperf g_bdevperf = {
struct bdevperf_reactor *g_next_reactor; struct bdevperf_reactor *g_next_reactor;
struct perf_dump_ctx { struct bdevperf_aggregate_stats {
uint64_t io_time_in_usec; uint64_t io_time_in_usec;
uint64_t ema_period; uint64_t ema_period;
double total_io_per_second; double total_io_per_second;
@ -181,23 +181,23 @@ get_ema_io_per_second(struct bdevperf_job *job, uint64_t ema_period)
} }
static void static void
performance_dump_job(struct perf_dump_ctx *ctx, struct bdevperf_job *job) performance_dump_job(struct bdevperf_aggregate_stats *stats, struct bdevperf_job *job)
{ {
double io_per_second, mb_per_second; double io_per_second, mb_per_second;
printf("\r Thread name: %s\n", spdk_thread_get_name(job->reactor->thread)); printf("\r Thread name: %s\n", spdk_thread_get_name(job->reactor->thread));
printf("\r Core Mask: 0x%s\n", spdk_cpuset_fmt(spdk_thread_get_cpumask(job->reactor->thread))); printf("\r Core Mask: 0x%s\n", spdk_cpuset_fmt(spdk_thread_get_cpumask(job->reactor->thread)));
if (ctx->ema_period == 0) { if (stats->ema_period == 0) {
io_per_second = get_cma_io_per_second(job, ctx->io_time_in_usec); io_per_second = get_cma_io_per_second(job, stats->io_time_in_usec);
} else { } else {
io_per_second = get_ema_io_per_second(job, ctx->ema_period); io_per_second = get_ema_io_per_second(job, stats->ema_period);
} }
mb_per_second = io_per_second * g_io_size / (1024 * 1024); mb_per_second = io_per_second * g_io_size / (1024 * 1024);
printf("\r %-20s: %10.2f IOPS %10.2f MiB/s\n", printf("\r %-20s: %10.2f IOPS %10.2f MiB/s\n",
job->name, io_per_second, mb_per_second); job->name, io_per_second, mb_per_second);
ctx->total_io_per_second += io_per_second; stats->total_io_per_second += io_per_second;
ctx->total_mb_per_second += mb_per_second; stats->total_mb_per_second += mb_per_second;
} }
static void static void
@ -917,31 +917,31 @@ bdevperf_submit_on_reactor(struct spdk_io_channel_iter *i)
static void static void
_performance_dump_done(struct spdk_io_channel_iter *i, int status) _performance_dump_done(struct spdk_io_channel_iter *i, int status)
{ {
struct perf_dump_ctx *ctx; struct bdevperf_aggregate_stats *stats;
ctx = spdk_io_channel_iter_get_ctx(i); stats = spdk_io_channel_iter_get_ctx(i);
printf("\r =====================================================\n"); printf("\r =====================================================\n");
printf("\r %-20s: %10.2f IOPS %10.2f MiB/s\n", printf("\r %-20s: %10.2f IOPS %10.2f MiB/s\n",
"Total", ctx->total_io_per_second, ctx->total_mb_per_second); "Total", stats->total_io_per_second, stats->total_mb_per_second);
fflush(stdout); fflush(stdout);
if (ctx->cb_fn) { if (stats->cb_fn) {
ctx->cb_fn(ctx->cb_arg); stats->cb_fn(stats->cb_arg);
} }
free(ctx); free(stats);
} }
static void static void
_performance_dump(struct spdk_io_channel_iter *i) _performance_dump(struct spdk_io_channel_iter *i)
{ {
struct perf_dump_ctx *ctx; struct bdevperf_aggregate_stats *stats;
struct spdk_io_channel *ch; struct spdk_io_channel *ch;
struct bdevperf_reactor *reactor; struct bdevperf_reactor *reactor;
struct bdevperf_job *job; struct bdevperf_job *job;
ctx = spdk_io_channel_iter_get_ctx(i); stats = spdk_io_channel_iter_get_ctx(i);
ch = spdk_io_channel_iter_get_channel(i); ch = spdk_io_channel_iter_get_channel(i);
reactor = spdk_io_channel_get_ctx(ch); reactor = spdk_io_channel_get_ctx(ch);
@ -950,7 +950,7 @@ _performance_dump(struct spdk_io_channel_iter *i)
} }
TAILQ_FOREACH(job, &reactor->jobs, link) { TAILQ_FOREACH(job, &reactor->jobs, link) {
performance_dump_job(ctx, job); performance_dump_job(stats, job);
} }
fflush(stdout); fflush(stdout);
@ -963,19 +963,19 @@ static void
performance_dump(uint64_t io_time_in_usec, uint64_t ema_period, performance_dump_done_fn cb_fn, performance_dump(uint64_t io_time_in_usec, uint64_t ema_period, performance_dump_done_fn cb_fn,
void *cb_arg) void *cb_arg)
{ {
struct perf_dump_ctx *ctx; struct bdevperf_aggregate_stats *stats;
ctx = calloc(1, sizeof(*ctx)); stats = calloc(1, sizeof(*stats));
if (ctx == NULL) { if (stats == NULL) {
return; return;
} }
ctx->io_time_in_usec = io_time_in_usec; stats->io_time_in_usec = io_time_in_usec;
ctx->ema_period = ema_period; stats->ema_period = ema_period;
ctx->cb_fn = cb_fn; stats->cb_fn = cb_fn;
ctx->cb_arg = cb_arg; stats->cb_arg = cb_arg;
spdk_for_each_channel(&g_bdevperf, _performance_dump, ctx, spdk_for_each_channel(&g_bdevperf, _performance_dump, stats,
_performance_dump_done); _performance_dump_done);
} }