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

bdev: populate module_name

Browse Source 
Add a name parameter to the MODULE_REGISTER macros, and then
modify each bdev module to pass a string for its name.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: If878617ce3c3eacfcf5df44ed6f194f11c66f78f

Reviewed-on: https://review.gerrithub.io/368596
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Jim Harris 2017-07-06 17:20:53 -07:00 committed by Daniel Verkamp
parent b509410cb1
commit 908cab3f1c
10 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
include/spdk_internal/bdev.h
View File

@ -104,7 +104,7 @@ struct spdk_bdev_module_if {
void (*config_text)(FILE *fp);
/** Name for the modules being defined. */
const char *module_name;
const char *name;
/**
* Returns the allocation size required for the backend for uses such as local
@ -423,29 +423,31 @@ spdk_bdev_io_from_ctx(void *ctx)
((uintptr_t)ctx - offsetof(struct spdk_bdev_io, driver_ctx));
}
#define SPDK_BDEV_MODULE_REGISTER(init_fn, fini_fn, config_fn, ctx_size_fn) \
static struct spdk_bdev_module_if init_fn ## _if = { \
#define SPDK_BDEV_MODULE_REGISTER(_name, init_fn, fini_fn, config_fn, ctx_size_fn) \
static struct spdk_bdev_module_if _name ## _if = { \
.name = #_name, \
.module_init = init_fn, \
.module_fini = fini_fn, \
.config_text = config_fn, \
.get_ctx_size = ctx_size_fn, \
}; \
__attribute__((constructor)) static void init_fn ## _init(void) \
__attribute__((constructor)) static void _name ## _init(void) \
{ \
spdk_bdev_module_list_add(&init_fn ## _if); \
spdk_bdev_module_list_add(&_name ## _if); \
}
#define SPDK_VBDEV_MODULE_REGISTER(init_fn, fini_fn, config_fn, ctx_size_fn, bdev_registered_fn)\
static struct spdk_bdev_module_if init_fn ## _if = { \
#define SPDK_VBDEV_MODULE_REGISTER(_name, init_fn, fini_fn, config_fn, ctx_size_fn, registered_fn)\
static struct spdk_bdev_module_if _name ## _if = { \
.name = #_name, \
.module_init = init_fn, \
.module_fini = fini_fn, \
.config_text = config_fn, \
.get_ctx_size = ctx_size_fn, \
.bdev_registered = bdev_registered_fn, \
.bdev_registered = registered_fn, \
}; \
__attribute__((constructor)) static void init_fn ## _init(void) \
__attribute__((constructor)) static void _name ## _init(void) \
{ \
spdk_vbdev_module_list_add(&init_fn ## _if); \
spdk_vbdev_module_list_add(&_name ## _if); \
}
#endif /* SPDK_INTERNAL_BDEV_H */

2
lib/bdev/aio/blockdev_aio.c
View File

@ -52,7 +52,7 @@ blockdev_aio_get_ctx_size(void)
return sizeof(struct blockdev_aio_task);
}
SPDK_BDEV_MODULE_REGISTER(blockdev_aio_initialize, NULL, NULL, blockdev_aio_get_ctx_size)
SPDK_BDEV_MODULE_REGISTER(aio, blockdev_aio_initialize, NULL, NULL, blockdev_aio_get_ctx_size)
static int
blockdev_aio_open(struct file_disk *disk)

4
lib/bdev/bdev.c
View File

@ -373,7 +373,7 @@ spdk_bdev_module_init_next(int rc)
{
if (rc) {
assert(g_next_bdev_module != NULL);
SPDK_ERRLOG("Failed to init bdev module: %s\n", g_next_bdev_module->module_name);
SPDK_ERRLOG("Failed to init bdev module: %s\n", g_next_bdev_module->name);
spdk_bdev_init_complete(rc);
return;
}
@ -396,7 +396,7 @@ spdk_vbdev_module_init_next(int rc)
{
if (rc) {
assert(g_next_vbdev_module != NULL);
SPDK_ERRLOG("Failed to init vbdev module: %s\n", g_next_vbdev_module->module_name);
SPDK_ERRLOG("Failed to init vbdev module: %s\n", g_next_vbdev_module->name);
spdk_bdev_init_complete(rc);
return;
}

2
lib/bdev/error/vbdev_error.c
View File

@ -330,4 +330,4 @@ vbdev_error_fini(void)
}
}
SPDK_VBDEV_MODULE_REGISTER(vbdev_error_init, vbdev_error_fini, NULL, NULL, NULL)
SPDK_VBDEV_MODULE_REGISTER(error, vbdev_error_init, vbdev_error_fini, NULL, NULL, NULL)

2
lib/bdev/gpt/vbdev_gpt.c
View File

@ -545,6 +545,6 @@ vbdev_gpt_get_ctx_size(void)
return sizeof(struct spdk_io_channel *);
}
SPDK_VBDEV_MODULE_REGISTER(vbdev_gpt_init, vbdev_gpt_fini, NULL,
SPDK_VBDEV_MODULE_REGISTER(gpt, vbdev_gpt_init, vbdev_gpt_fini, NULL,
vbdev_gpt_get_ctx_size, vbdev_gpt_register)
SPDK_LOG_REGISTER_TRACE_FLAG("vbdev_gpt", SPDK_TRACE_VBDEV_GPT)

2
lib/bdev/malloc/blockdev_malloc.c
View File

@ -99,7 +99,7 @@ blockdev_malloc_get_ctx_size(void)
return sizeof(struct malloc_task) + spdk_copy_task_size();
}
SPDK_BDEV_MODULE_REGISTER(blockdev_malloc_initialize, blockdev_malloc_finish,
SPDK_BDEV_MODULE_REGISTER(malloc, blockdev_malloc_initialize, blockdev_malloc_finish,
blockdev_malloc_get_spdk_running_config, blockdev_malloc_get_ctx_size)
static void

2
lib/bdev/null/blockdev_null.c
View File

@ -284,7 +284,7 @@ blockdev_null_get_spdk_running_config(FILE *fp)
}
}
SPDK_BDEV_MODULE_REGISTER(blockdev_null_initialize, blockdev_null_finish,
SPDK_BDEV_MODULE_REGISTER(null, blockdev_null_initialize, blockdev_null_finish,
blockdev_null_get_spdk_running_config, blockdev_null_get_ctx_size)
SPDK_LOG_REGISTER_TRACE_FLAG("bdev_null", SPDK_TRACE_BDEV_NULL)

2
lib/bdev/nvme/blockdev_nvme.c
View File

@ -150,7 +150,7 @@ bdev_nvme_get_ctx_size(void)
return sizeof(struct nvme_bdev_io);
}
SPDK_BDEV_MODULE_REGISTER(bdev_nvme_library_init, bdev_nvme_library_fini,
SPDK_BDEV_MODULE_REGISTER(nvme, bdev_nvme_library_init, bdev_nvme_library_fini,
bdev_nvme_get_spdk_running_config,
bdev_nvme_get_ctx_size)

2
lib/bdev/rbd/blockdev_rbd.c
View File

@ -210,7 +210,7 @@ blockdev_rbd_get_ctx_size(void)
return sizeof(struct blockdev_rbd_io);
}
SPDK_BDEV_MODULE_REGISTER(blockdev_rbd_library_init, blockdev_rbd_library_fini, NULL,
SPDK_BDEV_MODULE_REGISTER(rbd, blockdev_rbd_library_init, blockdev_rbd_library_fini, NULL,
blockdev_rbd_get_ctx_size)
static int64_t

3
lib/bdev/split/vbdev_split.c
View File

@ -422,5 +422,6 @@ vbdev_split_get_ctx_size(void)
return sizeof(struct spdk_io_channel *);
}
SPDK_VBDEV_MODULE_REGISTER(vbdev_split_init, vbdev_split_fini, NULL, vbdev_split_get_ctx_size, NULL)
SPDK_VBDEV_MODULE_REGISTER(split, vbdev_split_init, vbdev_split_fini, NULL,
vbdev_split_get_ctx_size, NULL)
SPDK_LOG_REGISTER_TRACE_FLAG("vbdev_split", SPDK_TRACE_VBDEV_SPLIT)