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

blobfs: change read to use spdk_fs_request as input parameter

Browse Source 
Change-Id: I778f054c82e786c8010d5fa9d4082af739855337
Signed-off-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/450720
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Changpeng Liu 2019-04-09 23:59:42 -04:00 committed by Jim Harris
parent 824cda201d
commit 0d4735eaf3
1 changed files with 25 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
lib/blobfs/blobfs.c
View File

@ -1924,20 +1924,6 @@ __file_cache_finish_sync(void *ctx, int bserrno)
pthread_spin_unlock(&file->lock); pthread_spin_unlock(&file->lock);
} }
static void
__free_args(struct spdk_fs_cb_args *args)
{
struct spdk_fs_request *req;
if (!args->from_request) {
free(args);
} else {
/* Depends on args being at the start of the spdk_fs_request structure. */
req = (struct spdk_fs_request *)args;
free_fs_request(req);
}
}
static void static void
__check_sync_reqs(struct spdk_file *file) __check_sync_reqs(struct spdk_file *file)
{ {
@ -2092,50 +2078,54 @@ __file_extend_blob(void *_args)
} }
static void static void
__rw_from_file_done(void *arg, int bserrno) __rw_from_file_done(void *ctx, int bserrno)
{ {
struct spdk_fs_cb_args *args = arg; struct spdk_fs_request *req = ctx;
__wake_caller(args, bserrno); __wake_caller(&req->args, bserrno);
__free_args(args); free_fs_request(req);
} }
static void static void
__rw_from_file(void *_args) __rw_from_file(void *ctx)
{ {
struct spdk_fs_cb_args *args = _args; struct spdk_fs_request *req = ctx;
struct spdk_fs_cb_args *args = &req->args;
struct spdk_file *file = args->file; struct spdk_file *file = args->file;
if (args->op.rw.is_read) { if (args->op.rw.is_read) {
spdk_file_read_async(file, file->fs->sync_target.sync_io_channel, args->op.rw.user_buf, spdk_file_read_async(file, file->fs->sync_target.sync_io_channel, args->op.rw.user_buf,
args->op.rw.offset, args->op.rw.length, args->op.rw.offset, args->op.rw.length,
__rw_from_file_done, args); __rw_from_file_done, req);
} else { } else {
spdk_file_write_async(file, file->fs->sync_target.sync_io_channel, args->op.rw.user_buf, spdk_file_write_async(file, file->fs->sync_target.sync_io_channel, args->op.rw.user_buf,
args->op.rw.offset, args->op.rw.length, args->op.rw.offset, args->op.rw.length,
__rw_from_file_done, args); __rw_from_file_done, req);
} }
} }
static int static int
__send_rw_from_file(struct spdk_file *file, sem_t *sem, void *payload, __send_rw_from_file(struct spdk_file *file, void *payload,
uint64_t offset, uint64_t length, bool is_read) uint64_t offset, uint64_t length, bool is_read,
struct spdk_fs_channel *channel)
{ {
struct spdk_fs_request *req;
struct spdk_fs_cb_args *args; struct spdk_fs_cb_args *args;
args = calloc(1, sizeof(*args)); req = alloc_fs_request(channel);
if (args == NULL) { if (req == NULL) {
sem_post(sem); sem_post(&channel->sem);
return -ENOMEM; return -ENOMEM;
} }
args = &req->args;
args->file = file; args->file = file;
args->sem = sem; args->sem = &channel->sem;
args->op.rw.user_buf = payload; args->op.rw.user_buf = payload;
args->op.rw.offset = offset; args->op.rw.offset = offset;
args->op.rw.length = length; args->op.rw.length = length;
args->op.rw.is_read = is_read; args->op.rw.is_read = is_read;
file->fs->send_request(__rw_from_file, args); file->fs->send_request(__rw_from_file, req);
return 0; return 0;
} }
@ -2173,8 +2163,7 @@ spdk_file_write(struct spdk_file *file, struct spdk_fs_thread_ctx *ctx,
file->append_pos += length; file->append_pos += length;
pthread_spin_unlock(&file->lock); pthread_spin_unlock(&file->lock);
rc = __send_rw_from_file(file, &channel->sem, payload, rc = __send_rw_from_file(file, payload, offset, length, false, channel);
offset, length, false);
sem_wait(&channel->sem); sem_wait(&channel->sem);
return rc; return rc;
} }
@ -2330,7 +2319,8 @@ check_readahead(struct spdk_file *file, uint64_t offset,
} }
static int static int
__file_read(struct spdk_file *file, void *payload, uint64_t offset, uint64_t length, sem_t *sem) __file_read(struct spdk_file *file, void *payload, uint64_t offset, uint64_t length,
struct spdk_fs_channel *channel)
{ {
struct cache_buffer *buf; struct cache_buffer *buf;
int rc; int rc;
@ -2338,7 +2328,7 @@ __file_read(struct spdk_file *file, void *payload, uint64_t offset, uint64_t len
buf = spdk_tree_find_filled_buffer(file->tree, offset); buf = spdk_tree_find_filled_buffer(file->tree, offset);
if (buf == NULL) { if (buf == NULL) {
pthread_spin_unlock(&file->lock); pthread_spin_unlock(&file->lock);
rc = __send_rw_from_file(file, sem, payload, offset, length, true); rc = __send_rw_from_file(file, payload, offset, length, true, channel);
pthread_spin_lock(&file->lock); pthread_spin_lock(&file->lock);
return rc; return rc;
} }
@ -2357,7 +2347,7 @@ __file_read(struct spdk_file *file, void *payload, uint64_t offset, uint64_t len
pthread_spin_unlock(&g_caches_lock); pthread_spin_unlock(&g_caches_lock);
} }
sem_post(sem); sem_post(&channel->sem);
return 0; return 0;
} }
@ -2402,7 +2392,7 @@ spdk_file_read(struct spdk_file *file, struct spdk_fs_thread_ctx *ctx,
if (length > (final_offset - offset)) { if (length > (final_offset - offset)) {
length = final_offset - offset; length = final_offset - offset;
} }
rc = __file_read(file, payload, offset, length, &channel->sem); rc = __file_read(file, payload, offset, length, channel);
if (rc == 0) { if (rc == 0) {
final_length += length; final_length += length;
} else { } else {