d/numam-spdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lib/thread: improve error message for wrong thread context

Browse Source 
Signed-off-by: John Levon <john.levon@nutanix.com>
Change-Id: Id591f8566df1d6522742461501f750aa9a52a190
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/9480
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
John Levon 2021-09-13 10:27:16 +00:00 committed by Jim Harris
parent 5cd558f383
commit d42557401c
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/thread/thread.c
View File

@ -1550,6 +1550,16 @@ spdk_poller_register_named(spdk_poller_fn fn,
return poller_register(fn, arg, period_microseconds, name);
}
static void
wrong_thread(const char *func, const char *name, struct spdk_thread *thread,
struct spdk_thread *curthread)
{
SPDK_ERRLOG("%s(%s) called from wrong thread %s:%lu (should be "
"%s:%lu)\n", func, name, curthread->name, curthread->id,
thread->name, thread->id);
assert(false);
}
void
spdk_poller_unregister(struct spdk_poller **ppoller)
{
@ -1570,8 +1580,7 @@ spdk_poller_unregister(struct spdk_poller **ppoller)
}
if (poller->thread != thread) {
SPDK_ERRLOG("different from the thread that called spdk_poller_register()\n");
assert(false);
wrong_thread(__func__, poller->name, poller->thread, thread);
return;
}
@ -1606,8 +1615,7 @@ spdk_poller_pause(struct spdk_poller *poller)
}
if (poller->thread != thread) {
SPDK_ERRLOG("different from the thread that called spdk_poller_pause()\n");
assert(false);
wrong_thread(__func__, poller->name, poller->thread, thread);
return;
}
@ -1643,8 +1651,7 @@ spdk_poller_resume(struct spdk_poller *poller)
}
if (poller->thread != thread) {
SPDK_ERRLOG("different from the thread that called spdk_poller_resume()\n");
assert(false);
wrong_thread(__func__, poller->name, poller->thread, thread);
return;
}
@ -2199,8 +2206,7 @@ spdk_put_io_channel(struct spdk_io_channel *ch)
}
if (ch->thread != thread) {
SPDK_ERRLOG("different from the thread that called get_io_channel()\n");
assert(false);
wrong_thread(__func__, "ch", ch->thread, thread);
return;
}
@ -2556,8 +2562,7 @@ spdk_interrupt_unregister(struct spdk_interrupt **pintr)
}
if (intr->thread != thread) {
SPDK_ERRLOG("different from the thread that called spdk_interrupt_register()\n");
assert(false);
wrong_thread(__func__, intr->name, intr->thread, thread);
return;
}
@ -2578,8 +2583,7 @@ spdk_interrupt_set_event_types(struct spdk_interrupt *intr,
}
if (intr->thread != thread) {
SPDK_ERRLOG("different from the thread that called spdk_interrupt_register()\n");
assert(false);
wrong_thread(__func__, intr->name, intr->thread, thread);
return -EINVAL;
}