From 09d70bbbfa1cba9be7e6cd22efe1fe5fa1da68b6 Mon Sep 17 00:00:00 2001 From: Raghavendra G Date: Wed, 7 Oct 2009 10:09:29 +0000 Subject: performance/stat-prefetch: implement sp_inodelk. - sp_inodelk has to send lookup on the path if it is not already looked up. Signed-off-by: Anand V. Avati BUG: 284 (performance actually decreases for 'ls -l' on a directory containing large number of files with stat-prefetch loaded) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=284 --- .../performance/stat-prefetch/src/stat-prefetch.c | 84 +++++++++++++++++++++- 1 file changed, 83 insertions(+), 1 deletion(-) (limited to 'xlators/performance/stat-prefetch/src') diff --git a/xlators/performance/stat-prefetch/src/stat-prefetch.c b/xlators/performance/stat-prefetch/src/stat-prefetch.c index 923bdcc0d..bf8fdfc3a 100644 --- a/xlators/performance/stat-prefetch/src/stat-prefetch.c +++ b/xlators/performance/stat-prefetch/src/stat-prefetch.c @@ -3538,6 +3538,88 @@ out: } +int32_t +sp_inodelk_helper (call_frame_t *frame, xlator_t *this, const char *volume, + loc_t *loc, int32_t cmd, struct flock *lock) +{ + uint64_t value = 0; + sp_inode_ctx_t *inode_ctx = NULL; + int32_t ret = 0, op_ret = -1, op_errno = -1; + + ret = inode_ctx_get (loc->inode, this, &value); + if (ret == -1) { + gf_log (this->name, GF_LOG_DEBUG, "context not set in inode " + "(%p)", loc->inode); + op_errno = EINVAL; + goto unwind; + } + + inode_ctx = (sp_inode_ctx_t *)(long) value; + GF_VALIDATE_OR_GOTO_WITH_ERROR (this->name, inode_ctx, unwind, op_errno, + EINVAL); + + LOCK (&inode_ctx->lock); + { + op_ret = inode_ctx->op_ret; + op_errno = inode_ctx->op_errno; + } + UNLOCK (&inode_ctx->lock); + + if (op_ret == -1) { + goto unwind; + } + + STACK_WIND (frame, sp_err_cbk, FIRST_CHILD(this), + FIRST_CHILD(this)->fops->inodelk, volume, loc, cmd, lock); + + return 0; + +unwind: + SP_STACK_UNWIND (frame, -1, op_errno); + return 0; +} + + +int32_t +sp_inodelk (call_frame_t *frame, xlator_t *this, const char *volume, loc_t *loc, + int32_t cmd, struct flock *lock) +{ + int32_t op_errno = -1; + call_stub_t *stub = NULL; + char can_wind = 0, need_lookup = 0, need_unwind = 1; + + GF_VALIDATE_OR_GOTO_WITH_ERROR (this->name, loc, out, op_errno, + EINVAL); + GF_VALIDATE_OR_GOTO_WITH_ERROR (this->name, loc->inode, out, + op_errno, EINVAL); + + stub = fop_inodelk_stub (frame, sp_inodelk_helper, volume, loc, cmd, + lock); + if (stub == NULL) { + op_errno = ENOMEM; + gf_log (this->name, GF_LOG_ERROR, "out of memory"); + goto out; + } + + sp_process_inode_ctx (frame, this, loc, stub, &need_unwind, + &need_lookup, &can_wind, &op_errno); + +out: + if (need_unwind) { + SP_STACK_UNWIND (frame, -1, op_errno); + } else if (need_lookup) { + STACK_WIND (frame, sp_lookup_cbk, FIRST_CHILD(this), + FIRST_CHILD(this)->fops->lookup, loc, NULL); + } else if (can_wind) { + STACK_WIND (frame, sp_err_cbk, FIRST_CHILD(this), + FIRST_CHILD(this)->fops->inodelk, volume, loc, cmd, + lock); + } + + return 0; +} + + int32_t sp_release (xlator_t *this, fd_t *fd) { @@ -3562,7 +3644,6 @@ sp_release (xlator_t *this, fd_t *fd) } - int32_t init (xlator_t *this) { @@ -3621,6 +3702,7 @@ struct xlator_fops fops = { .fxattrop = sp_fxattrop, .stat = sp_stat, .access = sp_access, + .inodelk = sp_inodelk, }; struct xlator_mops mops = { -- cgit