From fd3612063903abb7674c44957b7471597056b03c Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Thu, 14 May 2020 16:32:50 -0700 Subject: [PATCH] lib/event: remove _spdk prefix from functions. Signed-off-by: Seth Howell Change-Id: Ie9aef08d8c46ed9eef883784578fa795e2cd60fd Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2438 Tested-by: SPDK CI Jenkins Community-CI: Mellanox Build Bot Reviewed-by: Shuhei Matsumoto Reviewed-by: Ben Walker Reviewed-by: Aleksey Marchuk --- lib/event/app.c | 4 ++-- lib/event/reactor.c | 14 +++++++------- lib/event/subsystem.c | 6 +++--- test/unit/lib/event/reactor.c/reactor_ut.c | 22 +++++++++++----------- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/lib/event/app.c b/lib/event/app.c index 5cdd33e1e..ee3addd51 100644 --- a/lib/event/app.c +++ b/lib/event/app.c @@ -703,7 +703,7 @@ spdk_app_fini(void) } static void -_spdk_app_stop(void *arg1) +app_stop(void *arg1) { spdk_rpc_finish(); spdk_subsystem_fini(spdk_reactors_stop, NULL); @@ -720,7 +720,7 @@ spdk_app_stop(int rc) * We want to run spdk_subsystem_fini() from the same thread where spdk_subsystem_init() * was called. */ - spdk_thread_send_msg(g_app_thread, _spdk_app_stop, NULL); + spdk_thread_send_msg(g_app_thread, app_stop, NULL); } static void diff --git a/lib/event/reactor.c b/lib/event/reactor.c index e13de75dd..cda4a32b1 100644 --- a/lib/event/reactor.c +++ b/lib/event/reactor.c @@ -210,7 +210,7 @@ spdk_event_call(struct spdk_event *event) } static inline uint32_t -_spdk_event_queue_run_batch(struct spdk_reactor *reactor) +event_queue_run_batch(struct spdk_reactor *reactor) { unsigned count, i; void *events[SPDK_EVENT_BATCH_SIZE]; @@ -312,14 +312,14 @@ static int _reactor_schedule_thread(struct spdk_thread *thread); static uint64_t g_rusage_period; static void -reactor_run(struct spdk_reactor *reactor) +_reactor_run(struct spdk_reactor *reactor) { struct spdk_thread *thread; struct spdk_lw_thread *lw_thread, *tmp; uint64_t now; int rc; - _spdk_event_queue_run_batch(reactor); + event_queue_run_batch(reactor); TAILQ_FOREACH_SAFE(lw_thread, &reactor->threads, link, tmp) { thread = spdk_thread_get_from_ctx(lw_thread); @@ -361,7 +361,7 @@ reactor_run(struct spdk_reactor *reactor) } static int -_spdk_reactor_run(void *arg) +reactor_run(void *arg) { struct spdk_reactor *reactor = arg; struct spdk_thread *thread; @@ -379,7 +379,7 @@ _spdk_reactor_run(void *arg) reactor->tsc_last = spdk_get_ticks(); while (1) { - reactor_run(reactor); + _reactor_run(reactor); if (g_reactor_state != SPDK_REACTOR_STATE_RUNNING) { break; @@ -453,7 +453,7 @@ spdk_reactors_start(void) continue; } - rc = spdk_env_thread_launch_pinned(reactor->lcore, _spdk_reactor_run, reactor); + rc = spdk_env_thread_launch_pinned(reactor->lcore, reactor_run, reactor); if (rc < 0) { SPDK_ERRLOG("Unable to start reactor thread on core %u\n", reactor->lcore); assert(false); @@ -474,7 +474,7 @@ spdk_reactors_start(void) /* Start the master reactor */ reactor = spdk_reactor_get(current_core); assert(reactor != NULL); - _spdk_reactor_run(reactor); + reactor_run(reactor); spdk_env_thread_wait_all(); diff --git a/lib/event/subsystem.c b/lib/event/subsystem.c index 606b4a12d..2cff890b2 100644 --- a/lib/event/subsystem.c +++ b/lib/event/subsystem.c @@ -213,7 +213,7 @@ spdk_subsystem_init(spdk_subsystem_init_fn cb_fn, void *cb_arg) } static void -_spdk_subsystem_fini_next(void *arg1) +subsystem_fini_next(void *arg1) { assert(g_fini_thread == spdk_get_thread()); @@ -248,9 +248,9 @@ void spdk_subsystem_fini_next(void) { if (g_fini_thread != spdk_get_thread()) { - spdk_thread_send_msg(g_fini_thread, _spdk_subsystem_fini_next, NULL); + spdk_thread_send_msg(g_fini_thread, subsystem_fini_next, NULL); } else { - _spdk_subsystem_fini_next(NULL); + subsystem_fini_next(NULL); } } diff --git a/test/unit/lib/event/reactor.c/reactor_ut.c b/test/unit/lib/event/reactor.c/reactor_ut.c index ae6120284..db50ea2f6 100644 --- a/test/unit/lib/event/reactor.c/reactor_ut.c +++ b/test/unit/lib/event/reactor.c/reactor_ut.c @@ -100,7 +100,7 @@ test_event_call(void) reactor = spdk_reactor_get(0); CU_ASSERT(reactor != NULL); - CU_ASSERT(_spdk_event_queue_run_batch(reactor) == 1); + CU_ASSERT(event_queue_run_batch(reactor) == 1); CU_ASSERT(test1 == 1); CU_ASSERT(test2 == 0xFF); @@ -136,7 +136,7 @@ test_schedule_thread(void) MOCK_SET(spdk_env_get_current_core, 3); - CU_ASSERT(_spdk_event_queue_run_batch(reactor) == 1); + CU_ASSERT(event_queue_run_batch(reactor) == 1); MOCK_CLEAR(spdk_env_get_current_core); @@ -187,7 +187,7 @@ test_reschedule_thread(void) CU_ASSERT(reactor != NULL); MOCK_SET(spdk_env_get_current_core, 1); - CU_ASSERT(_spdk_event_queue_run_batch(reactor) == 1); + CU_ASSERT(event_queue_run_batch(reactor) == 1); CU_ASSERT(TAILQ_FIRST(&reactor->threads) == lw_thread); spdk_set_thread(thread); @@ -206,7 +206,7 @@ test_reschedule_thread(void) CU_ASSERT(lw_thread->resched == true); - _spdk_reactor_run(reactor); + reactor_run(reactor); CU_ASSERT(lw_thread->resched == false); CU_ASSERT(TAILQ_EMPTY(&reactor->threads)); @@ -215,13 +215,13 @@ test_reschedule_thread(void) CU_ASSERT(reactor != NULL); MOCK_SET(spdk_env_get_current_core, 0); - CU_ASSERT(_spdk_event_queue_run_batch(reactor) == 0); + CU_ASSERT(event_queue_run_batch(reactor) == 0); reactor = spdk_reactor_get(2); CU_ASSERT(reactor != NULL); MOCK_SET(spdk_env_get_current_core, 2); - CU_ASSERT(_spdk_event_queue_run_batch(reactor) == 1); + CU_ASSERT(event_queue_run_batch(reactor) == 1); CU_ASSERT(TAILQ_FIRST(&reactor->threads) == lw_thread); @@ -287,7 +287,7 @@ test_for_each_reactor(void) reactor = spdk_reactor_get(i); CU_ASSERT(reactor != NULL); - _spdk_event_queue_run_batch(reactor); + event_queue_run_batch(reactor); CU_ASSERT(count == (i + 1)); CU_ASSERT(done == false); } @@ -296,7 +296,7 @@ test_for_each_reactor(void) reactor = spdk_reactor_get(0); CU_ASSERT(reactor != NULL); - _spdk_event_queue_run_batch(reactor); + event_queue_run_batch(reactor); CU_ASSERT(count == 6); CU_ASSERT(done == true); @@ -376,7 +376,7 @@ test_reactor_stats(void) idle2 = spdk_poller_register(poller_run_idle, (void *)300, 0); CU_ASSERT(idle2 != NULL); - reactor_run(reactor); + _reactor_run(reactor); CU_ASSERT(thread1->tsc_last == 200); CU_ASSERT(thread1->stats.busy_tsc == 100); @@ -398,7 +398,7 @@ test_reactor_stats(void) busy2 = spdk_poller_register(poller_run_busy, (void *)400, 0); CU_ASSERT(busy2 != NULL); - reactor_run(reactor); + _reactor_run(reactor); CU_ASSERT(thread1->tsc_last == 700); CU_ASSERT(thread1->stats.busy_tsc == 100); @@ -418,7 +418,7 @@ test_reactor_stats(void) spdk_poller_unregister(&busy2); spdk_thread_exit(thread2); - reactor_run(reactor); + _reactor_run(reactor); CU_ASSERT(TAILQ_EMPTY(&reactor->threads));