summaryrefslogtreecommitdiffstats
path: root/glusterfsd
diff options
context:
space:
mode:
authorAnand Avati <avati@redhat.com>2014-03-29 06:59:39 -0700
committerAnand Avati <avati@redhat.com>2014-05-05 17:28:29 -0700
commit7fba3a88f1ced610eca0c23516a1e720d75160cd (patch)
tree245bc7bda320b7894a0f7806087175faaf1bbce7 /glusterfsd
parent71ad38b3f86bdb0c4e9120b58ff451a6711ead9d (diff)
mem-accounting: enable memory accounting by default
memory accounting are constant time operations which involve a few pointer dereferences and integer increments (no loops or searches etc.) benefits of having memory usage info outweigh the minor accounting overheads Change-Id: If9bc6db5ffd0e00f0fd64b2f6eed094bf3543996 BUG: 1089216 Signed-off-by: Anand Avati <avati@redhat.com> Reviewed-on: http://review.gluster.org/7543 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Harshavardhana <harsha@harshavardhana.net>
Diffstat (limited to 'glusterfsd')
-rw-r--r--glusterfsd/src/glusterfsd.c20
1 files changed, 1 insertions, 19 deletions
diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c
index e971426..1163660 100644
--- a/glusterfsd/src/glusterfsd.c
+++ b/glusterfsd/src/glusterfsd.c
@@ -212,7 +212,7 @@ static struct argp_option gf_options[] = {
{"volfile-check", ARGP_VOLFILE_CHECK_KEY, 0, 0,
"Enable strict volume file checking"},
{"mem-accounting", ARGP_MEM_ACCOUNTING_KEY, 0, OPTION_HIDDEN,
- "Enable internal memory accounting"},
+ "Enable internal memory accounting (enabled by default, obsolete)"},
{"fuse-mountopts", ARGP_FUSE_MOUNTOPTS_KEY, "OPTIONS", OPTION_HIDDEN,
"Extra mount options to pass to FUSE"},
{"use-readdirp", ARGP_FUSE_USE_READDIRP_KEY, "BOOL", OPTION_ARG_OPTIONAL,
@@ -1478,17 +1478,6 @@ logging_init (glusterfs_ctx_t *ctx, const char *progpath)
return 0;
}
-void
-gf_check_and_set_mem_acct (glusterfs_ctx_t *ctx, int argc, char *argv[])
-{
- int i = 0;
- for (i = 0; i < argc; i++) {
- if (strcmp (argv[i], "--mem-accounting") == 0) {
- gf_mem_acct_enable_set (ctx);
- break;
- }
- }
-}
int
parse_cmdline (int argc, char *argv[], glusterfs_ctx_t *ctx)
@@ -1978,13 +1967,6 @@ main (int argc, char *argv[])
}
glusterfsd_ctx = ctx;
-#ifdef DEBUG
- gf_mem_acct_enable_set (ctx);
-#else
- /* Enable memory accounting on the fly based on argument */
- gf_check_and_set_mem_acct (ctx, argc, argv);
-#endif
-
ret = glusterfs_globals_init (ctx);
if (ret)
return ret;