From fc501a57bc595ec1d65fa466cfd7d34f28f2012b Mon Sep 17 00:00:00 2001
From: Vijay Bellur <vbellur@redhat.com>
Date: Sat, 16 Feb 2013 22:51:10 +0530
Subject: Better mechanism to handle memory accounting

Memory accounting will now be enabled if:

1) Any glusterfs process is spawned with argument --mem-accounting.
2) DEBUG is defined.

Change-Id: I3345e114127a57ce61916be0e2c4e0049a4c3432
BUG: 834465
Signed-off-by: Vijay Bellur <vbellur@redhat.com>
Reviewed-on: http://review.gluster.org/4523
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
---
 api/src/glfs.c              |  2 ++
 cli/src/cli.c               |  2 ++
 glusterfsd/src/glusterfsd.c |  4 ++--
 libglusterfs/src/mem-pool.c | 13 ++-----------
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/api/src/glfs.c b/api/src/glfs.c
index 7be675da3b7..705702d0da0 100644
--- a/api/src/glfs.c
+++ b/api/src/glfs.c
@@ -368,7 +368,9 @@ glfs_new (const char *volname)
 		return NULL;
 	}
 
+#ifdef DEBUG
         gf_mem_acct_enable_set (ctx);
+#endif
 
 	/* first globals init, for gf_mem_acct_enable_set () */
 	ret = glusterfs_globals_init (ctx);
diff --git a/cli/src/cli.c b/cli/src/cli.c
index 082ba67c0e2..37015c33d35 100644
--- a/cli/src/cli.c
+++ b/cli/src/cli.c
@@ -572,7 +572,9 @@ main (int argc, char *argv[])
         if (!ctx)
                 return ENOMEM;
 
+#ifdef DEBUG
         gf_mem_acct_enable_set (ctx);
+#endif
 
         ret = glusterfs_globals_init (ctx);
         if (ret)
diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c
index cbb8c046bbd..28de24e8da6 100644
--- a/glusterfsd/src/glusterfsd.c
+++ b/glusterfsd/src/glusterfsd.c
@@ -1839,9 +1839,9 @@ main (int argc, char *argv[])
         }
 	glusterfsd_ctx = ctx;
 
+#ifdef DEBUG
         gf_mem_acct_enable_set (ctx);
-
-#ifndef DEBUG
+#else
         /* Enable memory accounting on the fly based on argument */
         gf_check_and_set_mem_acct (ctx, argc, argv);
 #endif
diff --git a/libglusterfs/src/mem-pool.c b/libglusterfs/src/mem-pool.c
index 755e739449b..e35a599e679 100644
--- a/libglusterfs/src/mem-pool.c
+++ b/libglusterfs/src/mem-pool.c
@@ -33,22 +33,13 @@
 void
 gf_mem_acct_enable_set (void *data)
 {
-        char            *opt = NULL;
-        long             val = -1;
         glusterfs_ctx_t *ctx = NULL;
 
         ctx = data;
 
-        if (ctx->mem_acct_enable) {
-                return;
-        }
+        GF_ASSERT (ctx);
 
-        opt = getenv (GLUSTERFS_ENV_MEM_ACCT_STR);
-        if (opt) {
-                val = strtol (opt, NULL, 0);
-                if (val)
-                        ctx->mem_acct_enable = 1;
-        }
+        ctx->mem_acct_enable = 1;
 
         return;
 }
-- 
cgit