From ae74e70effdf4dada03d332eff03581d6909aace Mon Sep 17 00:00:00 2001 From: Krzysztof Karas Date: Fri, 16 Apr 2021 10:04:40 +0200 Subject: [PATCH] lib/event: remove _spdk_scheduler_disable() Remove _spdk_scheduler_disable() to avoid confusion as there is no spdk_scheduler_enable function. Since spdk_scheduler_disable sets scheduler period to 0, use spdk_scheduler_period_set(0) instead. Signed-off-by: Krzysztof Karas Signed-off-by: Tomasz Zawadzki Change-Id: I4f1390a635f80e8b92775aa4be2e37f5b95467f8 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/7448 Tested-by: SPDK CI Jenkins Reviewed-by: Konrad Sztyber Reviewed-by: Jim Harris Reviewed-by: Shuhei Matsumoto Community-CI: Broadcom CI Community-CI: Mellanox Build Bot --- include/spdk_internal/event.h | 5 ----- lib/event/app.c | 2 +- lib/event/reactor.c | 6 ------ test/unit/lib/event/app.c/app_ut.c | 2 +- 4 files changed, 2 insertions(+), 13 deletions(-) diff --git a/include/spdk_internal/event.h b/include/spdk_internal/event.h index 9c97f82e20..81a6dafabe 100644 --- a/include/spdk_internal/event.h +++ b/include/spdk_internal/event.h @@ -342,11 +342,6 @@ struct spdk_scheduler *_spdk_scheduler_get(void); */ void _spdk_scheduler_period_set(uint64_t period); -/** - * Disable the scheduler. - */ -void _spdk_scheduler_disable(void); - /** * Get period of currently set scheduler. */ diff --git a/lib/event/app.c b/lib/event/app.c index 64e205f5b7..35b246a06f 100644 --- a/lib/event/app.c +++ b/lib/event/app.c @@ -617,7 +617,7 @@ app_stop(void *arg1) spdk_rpc_finish(); g_spdk_app.stopped = true; - _spdk_scheduler_disable(); + _spdk_scheduler_period_set(0); _start_subsystem_fini(NULL); } diff --git a/lib/event/reactor.c b/lib/event/reactor.c index e1daf0619f..9f34130d08 100644 --- a/lib/event/reactor.c +++ b/lib/event/reactor.c @@ -154,12 +154,6 @@ _spdk_scheduler_period_set(uint64_t period) g_scheduler_period = period * spdk_get_ticks_hz() / SPDK_SEC_TO_USEC; } -void -_spdk_scheduler_disable(void) -{ - g_scheduler_period = 0; -} - void _spdk_scheduler_list_add(struct spdk_scheduler *scheduler) { diff --git a/test/unit/lib/event/app.c/app_ut.c b/test/unit/lib/event/app.c/app_ut.c index 34ad0b0738..8d038881be 100644 --- a/test/unit/lib/event/app.c/app_ut.c +++ b/test/unit/lib/event/app.c/app_ut.c @@ -58,7 +58,7 @@ DEFINE_STUB_V(spdk_reactors_start, (void)); DEFINE_STUB_V(spdk_reactors_stop, (void *arg1)); DEFINE_STUB(spdk_reactors_init, int, (void), 0); DEFINE_STUB_V(spdk_reactors_fini, (void)); -DEFINE_STUB_V(_spdk_scheduler_disable, (void)); +DEFINE_STUB_V(_spdk_scheduler_period_set, (uint64_t period)); bool g_scheduling_in_progress; static void