summaryrefslogtreecommitdiffstats
path: root/xlators/performance/stat-prefetch
diff options
context:
space:
mode:
authorRaghavendra G <raghavendra@gluster.com>2009-10-07 10:09:28 +0000
committerAnand V. Avati <avati@dev.gluster.com>2009-10-07 23:05:48 -0700
commit39f147cca50a3b700c2f069c36964fe5811a3e1a (patch)
tree81a1871f076c4a54bf4fb5d37d78d8b97d4d1960 /xlators/performance/stat-prefetch
parentcc36c4ae0c4aef08b04f3b320a72a6abd2bd276d (diff)
performance/stat-prefetch: do lookup on path in removexattr if it is not already looked up.
Signed-off-by: Anand V. Avati <avati@dev.gluster.com> 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
Diffstat (limited to 'xlators/performance/stat-prefetch')
-rw-r--r--xlators/performance/stat-prefetch/src/stat-prefetch.c81
1 files changed, 71 insertions, 10 deletions
diff --git a/xlators/performance/stat-prefetch/src/stat-prefetch.c b/xlators/performance/stat-prefetch/src/stat-prefetch.c
index 0476ef8f4..923bdcc0d 100644
--- a/xlators/performance/stat-prefetch/src/stat-prefetch.c
+++ b/xlators/performance/stat-prefetch/src/stat-prefetch.c
@@ -2908,17 +2908,63 @@ out:
int32_t
+sp_removexattr_helper (call_frame_t *frame, xlator_t *this, loc_t *loc,
+ const char *name)
+{
+ 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->removexattr, loc, name);
+
+ return 0;
+
+unwind:
+ SP_STACK_UNWIND (frame, -1, op_errno);
+ return 0;
+}
+
+
+int32_t
sp_removexattr (call_frame_t *frame, xlator_t *this, loc_t *loc,
const char *name)
{
- sp_cache_t *cache = NULL;
- int32_t op_errno = -1;
+ sp_cache_t *cache = NULL;
+ 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, unwind, op_errno,
+ GF_VALIDATE_OR_GOTO_WITH_ERROR (this->name, loc, out, op_errno,
EINVAL);
- GF_VALIDATE_OR_GOTO_WITH_ERROR (this->name, loc->parent, unwind,
+ GF_VALIDATE_OR_GOTO_WITH_ERROR (this->name, loc->parent, out,
op_errno, EINVAL);
- GF_VALIDATE_OR_GOTO_WITH_ERROR (this->name, loc->name, unwind,
+ GF_VALIDATE_OR_GOTO_WITH_ERROR (this->name, loc->name, out,
+ op_errno, EINVAL);
+ GF_VALIDATE_OR_GOTO_WITH_ERROR (this->name, loc->inode, out,
op_errno, EINVAL);
cache = sp_get_cache_inode (this, loc->parent, frame->root->pid);
@@ -2926,12 +2972,27 @@ sp_removexattr (call_frame_t *frame, xlator_t *this, loc_t *loc,
sp_cache_remove_entry (cache, (char *)loc->name, 0);
}
- STACK_WIND (frame, sp_err_cbk, FIRST_CHILD(this),
- FIRST_CHILD(this)->fops->removexattr, loc, name);
- return 0;
+ stub = fop_removexattr_stub (frame, sp_removexattr_helper, loc, name);
+ if (stub == NULL) {
+ op_errno = ENOMEM;
+ gf_log (this->name, GF_LOG_ERROR, "out of memory");
+ goto out;
+ }
-unwind:
- SP_STACK_UNWIND (frame, -1, op_errno);
+ 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->removexattr, loc, name);
+ }
+
return 0;
}