diff options
| author | Vijay Bellur <vbellur@redhat.com> | 2013-02-16 22:51:10 +0530 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2013-02-17 16:55:37 -0800 |
| commit | fc501a57bc595ec1d65fa466cfd7d34f28f2012b (patch) | |
| tree | 1fb687c25ce4c249f2fe02e17e8e2ac776e16e3e /glusterfsd/src/glusterfsd.c | |
| parent | fcc230c99dd7318c2bee54beaa152b5a8c66f186 (diff) | |
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>
Diffstat (limited to 'glusterfsd/src/glusterfsd.c')
| -rw-r--r-- | glusterfsd/src/glusterfsd.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 |