core: utilize mempool for frame->local allocations

in each translator, which uses 'frame->local', we are using
GF_CALLOC/GF_FREE, which would be costly considering the
number of allocation happening in a lifetime of 'fop'. It
would be good to utilize the mem pool framework for xlator's
local structures, so there is no allocation overhead.

Change-Id: Ida6e65039a24d9c219b380aa1c3559f36046dc94
Signed-off-by: Amar Tumballi <amar@gluster.com>
BUG: 765336
Reviewed-on: http://review.gluster.com/2772
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>

6 files changed, 48 insertions, 55 deletions

diff --git a/xlators/features/marker/src/marker-mem-types.h b/xlators/features/marker/src/marker-mem-types.h
index f2723dc26e9..2f49c0d9d4e 100644
--- a/xlators/features/marker/src/marker-mem-types.h
+++ b/xlators/features/marker/src/marker-mem-types.h
@@ -23,14 +23,12 @@
 #include "mem-types.h"
 
 enum gf_marker_mem_types_ {
-        gf_marker_mt_marker_local_t = gf_common_mt_end + 1,
-        gf_marker_mt_marker_conf_t,
+        gf_marker_mt_marker_conf_t = gf_common_mt_end + 1,
         gf_marker_mt_loc_t,
         gf_marker_mt_volume_mark,
         gf_marker_mt_int64_t,
         gf_marker_mt_quota_inode_ctx_t,
         gf_marker_mt_marker_inode_ctx_t,
-        gf_marker_mt_quota_local_t,
         gf_marker_mt_inode_contribution_t,
         gf_marker_mt_end
 };
diff --git a/xlators/features/marker/src/marker-quota-helper.c b/xlators/features/marker/src/marker-quota-helper.c
index 7b7c3026f90..8d4ff7786a6 100644
--- a/xlators/features/marker/src/marker-quota-helper.c
+++ b/xlators/features/marker/src/marker-quota-helper.c
@@ -328,21 +328,15 @@ mq_inode_ctx_new (inode_t * inode, xlator_t *this)
 quota_local_t *
 mq_local_new ()
 {
-        int32_t         ret     = -1;
         quota_local_t  *local   = NULL;
 
-        QUOTA_ALLOC (local, quota_local_t, ret);
-        if (ret < 0)
+        local = mem_get0 (THIS->local_pool);
+        if (!local)
                 goto out;
 
         local->ref = 1;
-        local->delta = 0;
-        local->err = 0;
         LOCK_INIT (&local->lock);
 
-        memset (&local->loc, 0, sizeof (loc_t));
-        memset (&local->parent_loc, 0, sizeof (loc_t));
-
         local->ctx = NULL;
         local->contri = NULL;
 
@@ -384,7 +378,7 @@ mq_local_unref (xlator_t *this, quota_local_t *local)
 
         LOCK_DESTROY (&local->lock);
 
-        GF_FREE (local);
+        mem_put (local);
 out:
         return 0;
 }
diff --git a/xlators/features/marker/src/marker-quota-helper.h b/xlators/features/marker/src/marker-quota-helper.h
index 56080f0dc21..e019fbd52ad 100644
--- a/xlators/features/marker/src/marker-quota-helper.h
+++ b/xlators/features/marker/src/marker-quota-helper.h
@@ -23,7 +23,7 @@
 #include "config.h"
 #endif
 
-#include "marker-quota.h"
+#include "marker.h"
 
 #define QUOTA_FREE_CONTRIBUTION_NODE(_contribution)     \
         do {                                            \
diff --git a/xlators/features/marker/src/marker-quota.h b/xlators/features/marker/src/marker-quota.h
index 7a90b28b7ed..30ee4426449 100644
--- a/xlators/features/marker/src/marker-quota.h
+++ b/xlators/features/marker/src/marker-quota.h
@@ -24,7 +24,6 @@
 #include "config.h"
 #endif
 
-#include "marker.h"
 #include "xlator.h"
 #include "marker-mem-types.h"
 
@@ -104,28 +103,6 @@ struct inode_contribution {
 };
 typedef struct inode_contribution inode_contribution_t;
 
-struct quota_local {
-        int64_t delta;
-        int64_t d_off;
-        int32_t err;
-        int32_t ref;
-        int64_t sum;
-        int64_t size;
-        int32_t hl_count;
-        int32_t dentry_child_count;
-
-        fd_t         *fd;
-        call_frame_t *frame;
-        gf_lock_t     lock;
-
-        loc_t loc;
-        loc_t parent_loc;
-
-        quota_inode_ctx_t    *ctx;
-        inode_contribution_t *contri;
-};
-typedef struct quota_local quota_local_t;
-
 int32_t
 mq_get_lock_on_parent (call_frame_t *, xlator_t *);
 
diff --git a/xlators/features/marker/src/marker.c b/xlators/features/marker/src/marker.c
index 54a7e1a28f3..6e384f0b9b4 100644
--- a/xlators/features/marker/src/marker.c
+++ b/xlators/features/marker/src/marker.c
@@ -177,7 +177,7 @@ marker_local_unref (marker_local_t *local)
                 marker_local_unref (local->oplocal);
                 local->oplocal = NULL;
         }
-        GF_FREE (local);
+        mem_put (local);
 out:
         return 0;
 }
@@ -509,7 +509,7 @@ marker_mkdir (call_frame_t *frame, xlator_t *this, loc_t *loc, mode_t mode,
         if (priv->feature_enabled == 0)
                 goto wind;
 
-        ALLOCATE_OR_GOTO (local, marker_local_t, err);
+        local = mem_get0 (this->local_pool);
 
         MARKER_INIT_LOCAL (frame, local);
 
@@ -580,7 +580,7 @@ marker_create (call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t flags,
         if (priv->feature_enabled == 0)
                 goto wind;
 
-        ALLOCATE_OR_GOTO (local, marker_local_t, err);
+        local = mem_get0 (this->local_pool);
 
         MARKER_INIT_LOCAL (frame, local);
 
@@ -655,7 +655,7 @@ marker_writev (call_frame_t *frame,
         if (priv->feature_enabled == 0)
                 goto wind;
 
-        ALLOCATE_OR_GOTO (local, marker_local_t, err);
+        local = mem_get0 (this->local_pool);
 
         MARKER_INIT_LOCAL (frame, local);
 
@@ -723,7 +723,7 @@ marker_rmdir (call_frame_t *frame, xlator_t *this, loc_t *loc, int flags)
         if (priv->feature_enabled == 0)
                 goto wind;
 
-        ALLOCATE_OR_GOTO (local, marker_local_t, err);
+        local = mem_get0 (this->local_pool);
 
         MARKER_INIT_LOCAL (frame, local);
 
@@ -820,7 +820,7 @@ marker_unlink (call_frame_t *frame, xlator_t *this, loc_t *loc)
         if (priv->feature_enabled == 0)
                 goto unlink_wind;
 
-        ALLOCATE_OR_GOTO (local, marker_local_t, err);
+        local = mem_get0 (this->local_pool);
 
         MARKER_INIT_LOCAL (frame, local);
 
@@ -897,7 +897,7 @@ marker_link (call_frame_t *frame, xlator_t *this, loc_t *oldloc, loc_t *newloc)
         if (priv->feature_enabled == 0)
                 goto wind;
 
-        ALLOCATE_OR_GOTO (local, marker_local_t, err);
+        local = mem_get0 (this->local_pool);
 
         MARKER_INIT_LOCAL (frame, local);
 
@@ -1412,11 +1412,11 @@ marker_rename (call_frame_t *frame, xlator_t *this, loc_t *oldloc,
         if (priv->feature_enabled == 0)
                 goto rename_wind;
 
-        ALLOCATE_OR_GOTO (local, marker_local_t, err);
+        local = mem_get0 (this->local_pool);
 
         MARKER_INIT_LOCAL (frame, local);
 
-        ALLOCATE_OR_GOTO (oplocal, marker_local_t, err);
+        oplocal = mem_get0 (this->local_pool);
 
         MARKER_INIT_LOCAL (frame, oplocal);
 
@@ -1533,7 +1533,7 @@ marker_truncate (call_frame_t *frame, xlator_t *this, loc_t *loc, off_t offset)
         if (priv->feature_enabled == 0)
                 goto wind;
 
-        ALLOCATE_OR_GOTO (local, marker_local_t, err);
+        local = mem_get0 (this->local_pool);
 
         MARKER_INIT_LOCAL (frame, local);
 
@@ -1600,7 +1600,7 @@ marker_ftruncate (call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset)
         if (priv->feature_enabled == 0)
                 goto wind;
 
-        ALLOCATE_OR_GOTO (local, marker_local_t, err);
+        local = mem_get0 (this->local_pool);
 
         MARKER_INIT_LOCAL (frame, local);
 
@@ -1669,7 +1669,7 @@ marker_symlink (call_frame_t *frame, xlator_t *this, const char *linkpath,
         if (priv->feature_enabled == 0)
                 goto wind;
 
-        ALLOCATE_OR_GOTO (local, marker_local_t, err);
+        local = mem_get0 (this->local_pool);
 
         MARKER_INIT_LOCAL (frame, local);
 
@@ -1739,7 +1739,7 @@ marker_mknod (call_frame_t *frame, xlator_t *this, loc_t *loc, mode_t mode,
         if (priv->feature_enabled == 0)
                 goto wind;
 
-        ALLOCATE_OR_GOTO (local, marker_local_t, err);
+        local = mem_get0 (this->local_pool);
 
         MARKER_INIT_LOCAL (frame, local);
 
@@ -1869,7 +1869,7 @@ marker_setxattr (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *dict,
         if (ret == 0)
                 return 0;
 
-        ALLOCATE_OR_GOTO (local, marker_local_t, err);
+        local = mem_get0 (this->local_pool);
 
         MARKER_INIT_LOCAL (frame, local);
 
@@ -1936,7 +1936,7 @@ marker_fsetxattr (call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *dict,
         if (ret == 0)
                 return 0;
 
-        ALLOCATE_OR_GOTO (local, marker_local_t, err);
+        local = mem_get0 (this->local_pool);
 
         MARKER_INIT_LOCAL (frame, local);
 
@@ -2002,7 +2002,7 @@ marker_fsetattr (call_frame_t *frame, xlator_t *this, fd_t *fd,
         if (priv->feature_enabled == 0)
                 goto wind;
 
-        ALLOCATE_OR_GOTO (local, marker_local_t, err);
+        local = mem_get0 (this->local_pool);
 
         MARKER_INIT_LOCAL (frame, local);
 
@@ -2070,7 +2070,7 @@ marker_setattr (call_frame_t *frame, xlator_t *this, loc_t *loc,
         if (priv->feature_enabled == 0)
                 goto wind;
 
-        ALLOCATE_OR_GOTO (local, marker_local_t, err);
+        local = mem_get0 (this->local_pool);
 
         MARKER_INIT_LOCAL (frame, local);
 
@@ -2133,7 +2133,7 @@ marker_removexattr (call_frame_t *frame, xlator_t *this, loc_t *loc,
         if (priv->feature_enabled == 0)
                 goto wind;
 
-        ALLOCATE_OR_GOTO (local, marker_local_t, err);
+        local = mem_get0 (this->local_pool);
 
         MARKER_INIT_LOCAL (frame, local);
 
@@ -2203,7 +2203,7 @@ marker_lookup (call_frame_t *frame, xlator_t *this,
         if (priv->feature_enabled == 0)
                 goto wind;
 
-        ALLOCATE_OR_GOTO (local, marker_local_t, err);
+        local = mem_get0 (this->local_pool);
 
         MARKER_INIT_LOCAL (frame, local);
 
@@ -2241,6 +2241,7 @@ unwind:
 
         return 0;
 }
+
 int
 marker_readdirp (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size,
                  off_t offset, dict_t *dict)
@@ -2503,6 +2504,13 @@ init (xlator_t *this)
                 }
         }
 
+        this->local_pool = mem_pool_new (marker_local_t, 1024);
+        if (!this->local_pool) {
+                gf_log (this->name, GF_LOG_ERROR,
+                        "failed to create local_t's memory pool");
+                goto err;
+        }
+
         return 0;
 err:
         marker_priv_cleanup (this);
diff --git a/xlators/features/marker/src/marker.h b/xlators/features/marker/src/marker.h
index f5ed9df399e..3dcb41f8ad3 100644
--- a/xlators/features/marker/src/marker.h
+++ b/xlators/features/marker/src/marker.h
@@ -103,9 +103,25 @@ struct marker_local{
         call_stub_t    *stub;
         int64_t         contribution;
         struct marker_local *oplocal;
+
+        /* marker quota specific */
+        int64_t delta;
+        int64_t d_off;
+        int64_t sum;
+        int64_t size;
+        int32_t hl_count;
+        int32_t dentry_child_count;
+
+        fd_t         *fd;
+        call_frame_t *frame;
+
+        quota_inode_ctx_t    *ctx;
+        inode_contribution_t *contri;
 };
 typedef struct marker_local marker_local_t;
 
+#define quota_local_t marker_local_t
+
 struct marker_inode_ctx {
         struct quota_inode_ctx *quota_ctx;
 };