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

reactor: Construct a function to do common code.

Browse Source 
remove lw_thread in a static function.

Signed-off-by: yidong0635 <dongx.yi@intel.com>
Change-Id: Iade1cb6c88e8aba4ca92c22d2596b8b3dea01ff5
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6311
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Xiaodong Liu <xiaodong.liu@intel.com>
This commit is contained in:
yidong0635 2021-02-07 08:55:20 +08:00 committed by Tomasz Zawadzki
parent 92e49c0044
commit 0859c83790
1 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
lib/event/reactor.c
View File

@ -819,23 +819,31 @@ _reactors_scheduler_gather_metrics(void *arg1, void *arg2)
static int _reactor_schedule_thread(struct spdk_thread *thread); static int _reactor_schedule_thread(struct spdk_thread *thread);
static uint64_t g_rusage_period; static uint64_t g_rusage_period;
static void
_reactor_remove_lw_thread(struct spdk_reactor *reactor, struct spdk_lw_thread *lw_thread)
{
struct spdk_thread *thread = spdk_thread_get_from_ctx(lw_thread);
int efd;
TAILQ_REMOVE(&reactor->threads, lw_thread, link);
assert(reactor->thread_count > 0);
reactor->thread_count--;
/* Operate thread intr if running with full interrupt ability */
if (spdk_interrupt_mode_is_enabled()) {
efd = spdk_thread_get_interrupt_fd(thread);
spdk_fd_group_remove(reactor->fgrp, efd);
}
}
static bool static bool
reactor_post_process_lw_thread(struct spdk_reactor *reactor, struct spdk_lw_thread *lw_thread) reactor_post_process_lw_thread(struct spdk_reactor *reactor, struct spdk_lw_thread *lw_thread)
{ {
struct spdk_thread *thread = spdk_thread_get_from_ctx(lw_thread); struct spdk_thread *thread = spdk_thread_get_from_ctx(lw_thread);
int efd;
if (spdk_unlikely(lw_thread->resched)) { if (spdk_unlikely(lw_thread->resched)) {
lw_thread->resched = false; lw_thread->resched = false;
TAILQ_REMOVE(&reactor->threads, lw_thread, link); _reactor_remove_lw_thread(reactor, lw_thread);
assert(reactor->thread_count > 0);
reactor->thread_count--;
/* Operate thread intr if running with full interrupt ability */
if (spdk_interrupt_mode_is_enabled()) {
efd = spdk_thread_get_interrupt_fd(thread);
spdk_fd_group_remove(reactor->fgrp, efd);
}
_reactor_schedule_thread(thread); _reactor_schedule_thread(thread);
return true; return true;
} }
@ -843,15 +851,7 @@ reactor_post_process_lw_thread(struct spdk_reactor *reactor, struct spdk_lw_thre
if (spdk_unlikely(spdk_thread_is_exited(thread) && if (spdk_unlikely(spdk_thread_is_exited(thread) &&
spdk_thread_is_idle(thread))) { spdk_thread_is_idle(thread))) {
if (reactor->flags.is_scheduling == false) { if (reactor->flags.is_scheduling == false) {
TAILQ_REMOVE(&reactor->threads, lw_thread, link); _reactor_remove_lw_thread(reactor, lw_thread);
assert(reactor->thread_count > 0);
reactor->thread_count--;
/* Operate thread intr if running with full interrupt ability */
if (spdk_interrupt_mode_is_enabled()) {
efd = spdk_thread_get_interrupt_fd(thread);
spdk_fd_group_remove(reactor->fgrp, efd);
}
spdk_thread_destroy(thread); spdk_thread_destroy(thread);
return true; return true;
} }
@ -963,16 +963,7 @@ reactor_run(void *arg)
thread = spdk_thread_get_from_ctx(lw_thread); thread = spdk_thread_get_from_ctx(lw_thread);
spdk_set_thread(thread); spdk_set_thread(thread);
if (spdk_thread_is_exited(thread)) { if (spdk_thread_is_exited(thread)) {
TAILQ_REMOVE(&reactor->threads, lw_thread, link); _reactor_remove_lw_thread(reactor, lw_thread);
assert(reactor->thread_count > 0);
reactor->thread_count--;
/* Operate thread intr if running with full interrupt ability */
if (spdk_interrupt_mode_is_enabled()) {
int efd = spdk_thread_get_interrupt_fd(thread);
spdk_fd_group_remove(reactor->fgrp, efd);
}
spdk_thread_destroy(thread); spdk_thread_destroy(thread);
} else { } else {
spdk_thread_poll(thread, 0, 0); spdk_thread_poll(thread, 0, 0);