From 72eed604b407e8cb53ce41e97d573b801c6ea50e Mon Sep 17 00:00:00 2001 From: Tomasz Zawadzki Date: Thu, 7 Jan 2021 08:43:56 -0500 Subject: [PATCH] lib/event: do not spawn a thread for each reactor Those spdk threads were neither used or tracked in event framework. Needed to edit hardcoded cpumask value in spdkcli test to accept any string. Signed-off-by: Tomasz Zawadzki Change-Id: Ieffea1bdf467f50ec0bd3af4b17a1d259fd876b4 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/5817 Tested-by: SPDK CI Jenkins Reviewed-by: Jim Harris Reviewed-by: Changpeng Liu Reviewed-by: Shuhei Matsumoto --- lib/event/reactor.c | 10 ---------- .../match_files/spdkcli_details_vhost_ctrl.test.match | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/lib/event/reactor.c b/lib/event/reactor.c index 2bc7ac372..0d195bd28 100644 --- a/lib/event/reactor.c +++ b/lib/event/reactor.c @@ -811,10 +811,8 @@ void spdk_reactors_start(void) { struct spdk_reactor *reactor; - struct spdk_cpuset tmp_cpumask = {}; uint32_t i, current_core; int rc; - char thread_name[32]; g_rusage_period = (CONTEXT_SWITCH_MONITOR_PERIOD * spdk_get_ticks_hz()) / SPDK_SEC_TO_USEC; g_reactor_state = SPDK_REACTOR_STATE_RUNNING; @@ -833,14 +831,6 @@ spdk_reactors_start(void) assert(false); return; } - - /* For now, for each reactor spawn one thread. */ - snprintf(thread_name, sizeof(thread_name), "reactor_%u", reactor->lcore); - - spdk_cpuset_zero(&tmp_cpumask); - spdk_cpuset_set_cpu(&tmp_cpumask, i, true); - - spdk_thread_create(thread_name, &tmp_cpumask); } spdk_cpuset_set_cpu(&g_reactor_core_mask, i, true); } diff --git a/test/spdkcli/match_files/spdkcli_details_vhost_ctrl.test.match b/test/spdkcli/match_files/spdkcli_details_vhost_ctrl.test.match index 7e045fb7d..b545dd7cb 100644 --- a/test/spdkcli/match_files/spdkcli_details_vhost_ctrl.test.match +++ b/test/spdkcli/match_files/spdkcli_details_vhost_ctrl.test.match @@ -14,7 +14,7 @@ } ] }, - "cpumask": "0x3", + "cpumask": "$(S)", "ctrlr": "vhost_scsi1", "delay_base_us": 20, "iops_threshold": 1000000,