Commit 0afce675 authored by Ben Walker's avatar Ben Walker Committed by Tomasz Zawadzki
Browse files

bdevperf: Jobs now print their stats during job cleanup 



We can collapse the two loops at exit time into one this way.

Change-Id: Iffe06e03c54fadc605e168580b69d2c710ac1168
Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/1849


Community-CI: Mellanox Build Bot
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarShuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
parent 83bf7546

test/bdev/bdevperf/bdevperf.c

+47 −44
Original line number Diff line number Diff line
@@ -90,11 +90,7 @@ pthread_mutex_t g_ordinal_lock = PTHREAD_MUTEX_INITIALIZER; 


static struct spdk_poller *g_perf_timer = NULL;



typedef void (*performance_dump_done_fn)(void *ctx);



static void bdevperf_submit_single(struct bdevperf_job *job, struct bdevperf_task *task);

static void performance_dump(uint64_t io_time_in_usec, uint64_t ema_period,

			     performance_dump_done_fn cb_fn, void *cb_arg);

static void rpc_perform_tests_cb(void);



struct bdevperf_job {
@@ -143,15 +139,17 @@ static struct spdk_bdevperf g_bdevperf = { 


struct bdevperf_reactor *g_next_reactor;



static bool g_performance_dump_active = false;



struct bdevperf_aggregate_stats {

	uint64_t			io_time_in_usec;

	uint64_t			ema_period;

	double				total_io_per_second;

	double				total_mb_per_second;

	performance_dump_done_fn	cb_fn;

	void				*cb_arg;

};



static struct bdevperf_aggregate_stats g_stats = {};



/*

 * Cumulative Moving Average (CMA): average of all data up to current

 * Exponential Moving Average (EMA): weighted mean of the previous n data and more weight is given to recent
@@ -345,6 +343,11 @@ bdevperf_free_job(struct bdevperf_job *job) 
static void

bdevperf_free_jobs_done(struct spdk_io_channel_iter *i, int status)

{

	printf("\r =====================================================\n");

	printf("\r %-20s: %10.2f IOPS %10.2f MiB/s\n",

	       "Total", g_stats.total_io_per_second, g_stats.total_mb_per_second);

	fflush(stdout);



	if (g_request && !g_shutdown) {

		rpc_perform_tests_cb();

	} else {
@@ -364,6 +367,7 @@ _bdevperf_free_jobs(struct spdk_io_channel_iter *i) 


	TAILQ_FOREACH_SAFE(job, &reactor->jobs, link, tmp) {

		TAILQ_REMOVE(&reactor->jobs, job, link);

		performance_dump_job(&g_stats, job);

		bdevperf_free_job(job);

	}
@@ -373,32 +377,37 @@ _bdevperf_free_jobs(struct spdk_io_channel_iter *i) 
static void

bdevperf_test_done(void *ctx)

{

	spdk_for_each_channel(&g_bdevperf, _bdevperf_free_jobs, NULL,

			      bdevperf_free_jobs_done);

	if (g_time_in_usec && !g_run_rc) {

		g_stats.io_time_in_usec = g_time_in_usec;



		if (g_performance_dump_active) {

			spdk_thread_send_msg(spdk_get_thread(), bdevperf_test_done, NULL);

			return;

		}

	} else {

		printf("Job run time less than one microsecond, no performance data will be shown\n");

	}



static void

bdevperf_job_end(void *ctx)

{

	if (--g_bdevperf.running_jobs == 0) {

	if (g_show_performance_real_time) {

		spdk_poller_unregister(&g_perf_timer);

	}



	if (g_shutdown) {

		g_time_in_usec = g_shutdown_tsc * 1000000 / spdk_get_ticks_hz();

			printf("Received shutdown signal, test time is about %.6f seconds\n",

		printf("Received shutdown signal, test time was about %.6f seconds\n",

		       (double)g_time_in_usec / 1000000);

	}



		if (g_time_in_usec) {

			if (!g_run_rc) {

				performance_dump(g_time_in_usec, 0, bdevperf_test_done, NULL);

				return;

			}

		} else {

			printf("Test time less than one microsecond, no performance data will be shown\n");

	spdk_for_each_channel(&g_bdevperf, _bdevperf_free_jobs, NULL,

			      bdevperf_free_jobs_done);

}



static void

bdevperf_job_end(void *ctx)

{

	assert(g_master_thread == spdk_get_thread());



	if (--g_bdevperf.running_jobs == 0) {

		bdevperf_test_done(NULL);

	}

}
@@ -926,9 +935,7 @@ _performance_dump_done(struct spdk_io_channel_iter *i, int status) 
	       "Total", stats->total_io_per_second, stats->total_mb_per_second);

	fflush(stdout);



	if (stats->cb_fn) {

		stats->cb_fn(stats->cb_arg);

	}

	g_performance_dump_active = false;



	free(stats);

}
@@ -959,33 +966,29 @@ exit: 
	spdk_for_each_channel_continue(i, 0);

}



static void

performance_dump(uint64_t io_time_in_usec, uint64_t ema_period, performance_dump_done_fn cb_fn,

		 void *cb_arg)

static int

performance_statistics_thread(void *arg)

{

	struct bdevperf_aggregate_stats *stats;



	if (g_performance_dump_active) {

		return -1;

	}



	g_performance_dump_active = true;



	stats = calloc(1, sizeof(*stats));

	if (stats == NULL) {

		return;

		return -1;

	}



	stats->io_time_in_usec = io_time_in_usec;

	stats->ema_period = ema_period;

	stats->cb_fn = cb_fn;

	stats->cb_arg = cb_arg;

	g_show_performance_period_num++;



	stats->io_time_in_usec = g_show_performance_period_num * g_show_performance_period_in_usec;

	stats->ema_period = g_show_performance_ema_period;



	spdk_for_each_channel(&g_bdevperf, _performance_dump, stats,

			      _performance_dump_done);

}





static int

performance_statistics_thread(void *arg)

{

	g_show_performance_period_num++;

	performance_dump(g_show_performance_period_num * g_show_performance_period_in_usec,

			 g_show_performance_ema_period, NULL, NULL);

	return -1;

}