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

copy_engine: rename spdk_copy_module_get_max_ctx_size() to spdk_copy_task_size()

Browse Source 
Make the public API clearer - if the user wants to allocate a
spdk_copy_task directly, they need to allocate spdk_copy_task_size()
bytes.

Also change the return type to size_t for consistency.

Change-Id: I0f3757056757c510421d680c5b4532edd9bc2561
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2016-11-16 14:23:57 -07:00
parent 945217d2b2
commit 5b63b8a448
5 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/spdk/copy_engine.h
View File

@ -38,6 +38,7 @@
#ifndef SPDK_COPY_ENGINE_H #ifndef SPDK_COPY_ENGINE_H
#define SPDK_COPY_ENGINE_H #define SPDK_COPY_ENGINE_H
#include <stddef.h>
#include <stdint.h> #include <stdint.h>
typedef void (*spdk_copy_completion_cb)(void *ref, int status); typedef void (*spdk_copy_completion_cb)(void *ref, int status);
@ -51,6 +52,6 @@ int64_t spdk_copy_submit(struct spdk_copy_task *copy_req, struct spdk_io_channel
void *src, uint64_t nbytes, spdk_copy_completion_cb cb); void *src, uint64_t nbytes, spdk_copy_completion_cb cb);
int64_t spdk_copy_submit_fill(struct spdk_copy_task *copy_req, struct spdk_io_channel *ch, int64_t spdk_copy_submit_fill(struct spdk_copy_task *copy_req, struct spdk_io_channel *ch,
void *dst, uint8_t fill, uint64_t nbytes, spdk_copy_completion_cb cb); void *dst, uint8_t fill, uint64_t nbytes, spdk_copy_completion_cb cb);
int spdk_copy_module_get_max_ctx_size(void); size_t spdk_copy_task_size(void);
#endif #endif

2
include/spdk_internal/copy_engine.h
View File

@ -74,7 +74,7 @@ struct spdk_copy_module_if {
*/ */
void (*config_text)(FILE *fp); void (*config_text)(FILE *fp);
int (*get_ctx_size)(void); size_t (*get_ctx_size)(void);
TAILQ_ENTRY(spdk_copy_module_if) tailq; TAILQ_ENTRY(spdk_copy_module_if) tailq;
}; };

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

@ -97,7 +97,7 @@ static void blockdev_malloc_get_spdk_running_config(FILE *fp);
static int static int
blockdev_malloc_get_ctx_size(void) blockdev_malloc_get_ctx_size(void)
{ {
return sizeof(struct malloc_task) + spdk_copy_module_get_max_ctx_size(); return sizeof(struct malloc_task) + spdk_copy_task_size();
} }
SPDK_BDEV_MODULE_REGISTER(blockdev_malloc_initialize, blockdev_malloc_finish, SPDK_BDEV_MODULE_REGISTER(blockdev_malloc_initialize, blockdev_malloc_finish,

7
lib/copy/copy_engine.c
View File

@ -154,16 +154,17 @@ static struct spdk_io_channel *mem_get_io_channel(uint32_t priority)
return spdk_get_io_channel(&memcpy_copy_engine, priority, false, NULL); return spdk_get_io_channel(&memcpy_copy_engine, priority, false, NULL);
} }
static int static size_t
copy_engine_mem_get_ctx_size(void) copy_engine_mem_get_ctx_size(void)
{ {
return sizeof(struct spdk_copy_task); return sizeof(struct spdk_copy_task);
} }
int spdk_copy_module_get_max_ctx_size(void) size_t
spdk_copy_task_size(void)
{ {
struct spdk_copy_module_if *copy_engine; struct spdk_copy_module_if *copy_engine;
int max_copy_module_size = 0; size_t max_copy_module_size = 0;
TAILQ_FOREACH(copy_engine, &spdk_copy_module_list, tailq) { TAILQ_FOREACH(copy_engine, &spdk_copy_module_list, tailq) {
if (copy_engine->get_ctx_size && copy_engine->get_ctx_size() > max_copy_module_size) { if (copy_engine->get_ctx_size && copy_engine->get_ctx_size() > max_copy_module_size) {

2
lib/copy/ioat/copy_engine_ioat.c
View File

@ -111,7 +111,7 @@ struct ioat_task {
static int copy_engine_ioat_init(void); static int copy_engine_ioat_init(void);
static void copy_engine_ioat_exit(void); static void copy_engine_ioat_exit(void);
static int static size_t
copy_engine_ioat_get_ctx_size(void) copy_engine_ioat_get_ctx_size(void)
{ {
return sizeof(struct ioat_task) + sizeof(struct spdk_copy_task); return sizeof(struct ioat_task) + sizeof(struct spdk_copy_task);