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

io_channel: use spdk_poller_fn consistently

Browse Source 
There are two separate function pointer types declared in io_channel.h:
spdk_thread_fn for cross-thread messages, and spdk_poller_fn for
pollers.  They currently have the same signature, but this will be
changing in an upcoming patch, so we need to fix the poller-related
functions to use the correct type (a few were using spdk_thread_fn by
mistake).

Change-Id: I0f0d8f1eea9905395125fc91e0355a49e65be99e
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-on: https://review.gerrithub.io/403598
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
Daniel Verkamp 2018-03-12 16:49:49 -07:00 committed by Jim Harris
parent 963b3a3bf7
commit abe4c73f40
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/bdev/fio_plugin/fio_plugin.c
View File

@ -127,7 +127,7 @@ spdk_fio_bdev_init_done(void *cb_arg, int rc)
static struct spdk_poller * static struct spdk_poller *
spdk_fio_start_poller(void *thread_ctx, spdk_fio_start_poller(void *thread_ctx,
spdk_thread_fn fn, spdk_poller_fn fn,
void *arg, void *arg,
uint64_t period_microseconds) uint64_t period_microseconds)
{ {

2
include/spdk/io_channel.h
View File

@ -181,7 +181,7 @@ void spdk_for_each_thread(spdk_thread_fn fn, void *ctx, spdk_thread_fn cpl);
* \return a pointer to the poller registered on the current thread on success * \return a pointer to the poller registered on the current thread on success
* or NULL on failure. * or NULL on failure.
*/ */
struct spdk_poller *spdk_poller_register(spdk_thread_fn fn, struct spdk_poller *spdk_poller_register(spdk_poller_fn fn,
void *arg, void *arg,
uint64_t period_microseconds); uint64_t period_microseconds);

2
lib/event/reactor.c
View File

@ -249,7 +249,7 @@ _spdk_poller_insert_timer(struct spdk_reactor *reactor, struct spdk_poller *poll
static struct spdk_poller * static struct spdk_poller *
_spdk_reactor_start_poller(void *thread_ctx, _spdk_reactor_start_poller(void *thread_ctx,
spdk_thread_fn fn, spdk_poller_fn fn,
void *arg, void *arg,
uint64_t period_microseconds) uint64_t period_microseconds)
{ {

2
test/lib/ut_multithread.c
View File

@ -83,7 +83,7 @@ __send_msg(spdk_thread_fn fn, void *ctx, void *thread_ctx)
} }
static struct spdk_poller * static struct spdk_poller *
__start_poller(void *thread_ctx, spdk_thread_fn fn, void *arg, uint64_t period_microseconds) __start_poller(void *thread_ctx, spdk_poller_fn fn, void *arg, uint64_t period_microseconds)
{ {
struct ut_thread *thread = thread_ctx; struct ut_thread *thread = thread_ctx;
struct ut_poller *poller = calloc(1, sizeof(struct ut_poller)); struct ut_poller *poller = calloc(1, sizeof(struct ut_poller));