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

bdevperf: replace "master_thread" with "main_thread"

Browse Source 
Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: Ic622568a3990f55698876bb9ec086c6d378d4b03
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5355
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Aleksey Marchuk <alexeymar@mellanox.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Jim Harris 2020-11-30 20:32:45 +00:00 committed by Tomasz Zawadzki
parent 0e8925db3c
commit 3d78c09db1
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,7 +81,7 @@ static int g_run_rc = 0;
static bool g_shutdown = false; static bool g_shutdown = false;
static uint64_t g_shutdown_tsc; static uint64_t g_shutdown_tsc;
static bool g_zcopy = false; static bool g_zcopy = false;
static struct spdk_thread *g_master_thread; static struct spdk_thread *g_main_thread;
static int g_time_in_sec = 0; static int g_time_in_sec = 0;
static bool g_mix_specified = false; static bool g_mix_specified = false;
static const char *g_job_bdev_name; static const char *g_job_bdev_name;
@ -422,7 +422,7 @@ bdevperf_test_done(void *ctx)
static void static void
bdevperf_job_end(void *ctx) bdevperf_job_end(void *ctx)
{ {
assert(g_master_thread == spdk_get_thread()); assert(g_main_thread == spdk_get_thread());
if (--g_bdevperf.running_jobs == 0) { if (--g_bdevperf.running_jobs == 0) {
bdevperf_test_done(NULL); bdevperf_test_done(NULL);
@ -439,7 +439,7 @@ bdevperf_end_task(struct bdevperf_task *task)
if (job->current_queue_depth == 0) { if (job->current_queue_depth == 0) {
spdk_put_io_channel(job->ch); spdk_put_io_channel(job->ch);
spdk_bdev_close(job->bdev_desc); spdk_bdev_close(job->bdev_desc);
spdk_thread_send_msg(g_master_thread, bdevperf_job_end, NULL); spdk_thread_send_msg(g_main_thread, bdevperf_job_end, NULL);
} }
} }
} }
@ -1015,7 +1015,7 @@ _performance_dump(void *ctx)
* That's true right now, but if that ever changed this would need a lock. */ * That's true right now, but if that ever changed this would need a lock. */
stats->current_job = TAILQ_NEXT(stats->current_job, link); stats->current_job = TAILQ_NEXT(stats->current_job, link);
if (stats->current_job == NULL) { if (stats->current_job == NULL) {
spdk_thread_send_msg(g_master_thread, _performance_dump_done, stats); spdk_thread_send_msg(g_main_thread, _performance_dump_done, stats);
} else { } else {
spdk_thread_send_msg(stats->current_job->thread, _performance_dump, stats); spdk_thread_send_msg(stats->current_job->thread, _performance_dump, stats);
} }
@ -1048,7 +1048,7 @@ performance_statistics_thread(void *arg)
*/ */
stats->current_job = TAILQ_FIRST(&g_bdevperf.jobs); stats->current_job = TAILQ_FIRST(&g_bdevperf.jobs);
if (stats->current_job == NULL) { if (stats->current_job == NULL) {
spdk_thread_send_msg(g_master_thread, _performance_dump_done, stats); spdk_thread_send_msg(g_main_thread, _performance_dump_done, stats);
} else { } else {
spdk_thread_send_msg(stats->current_job->thread, _performance_dump, stats); spdk_thread_send_msg(stats->current_job->thread, _performance_dump, stats);
} }
@ -1114,8 +1114,8 @@ construct_job_thread(struct spdk_cpuset *cpumask, const char *tag)
char thread_name[32]; char thread_name[32];
struct spdk_cpuset tmp; struct spdk_cpuset tmp;
/* This function runs on the master thread. */ /* This function runs on the main thread. */
assert(g_master_thread == spdk_get_thread()); assert(g_main_thread == spdk_get_thread());
/* Handle default mask */ /* Handle default mask */
if (spdk_cpuset_count(cpumask) == 0) { if (spdk_cpuset_count(cpumask) == 0) {
@ -1176,7 +1176,7 @@ _bdevperf_construct_job(void *ctx)
} }
end: end:
spdk_thread_send_msg(g_master_thread, _bdevperf_construct_job_done, NULL); spdk_thread_send_msg(g_main_thread, _bdevperf_construct_job_done, NULL);
} }
static void static void
@ -1829,7 +1829,7 @@ bdevperf_run(void *arg1)
{ {
uint32_t i; uint32_t i;
g_master_thread = spdk_get_thread(); g_main_thread = spdk_get_thread();
spdk_cpuset_zero(&g_all_cpuset); spdk_cpuset_zero(&g_all_cpuset);
SPDK_ENV_FOREACH_CORE(i) { SPDK_ENV_FOREACH_CORE(i) {