diff options
| author | Amar Tumballi <amarts@redhat.com> | 2012-08-02 13:14:25 +0530 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2012-08-03 02:01:52 -0700 |
| commit | ed4b76ba9c545f577287c0e70ae3cc853a0d5f3f (patch) | |
| tree | deffb91a0cee620ac7fcc8c7914dbca73668574e /libglusterfs/src/ctx.c | |
| parent | 66205114267ec659b4ad8084c7e9497009529c61 (diff) | |
core: reduce the usage of global variables
* move all the 'logging' related global variables into ctx
* make gf_fop_list a 'const' global array, hence no init(),
no edits.
* make sure ctx is allocated without any dependancy on
memory-accounting infrastructure, so it can be the first
one to get allocated
* globals_init() should happen with ctx as argument
not yet fixed below in this patchset:
* anything with 'THIS' related globals
* anything related to compat_errno related globals as its
one time init'd and not changed later on.
* statedump related globals
Change-Id: Iab8fc30d4bfdbded6741d66ff1ed670fdc7b7ad2
Signed-off-by: Amar Tumballi <amarts@redhat.com>
BUG: 764890
Reviewed-on: http://review.gluster.com/3767
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'libglusterfs/src/ctx.c')
| -rw-r--r-- | libglusterfs/src/ctx.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libglusterfs/src/ctx.c b/libglusterfs/src/ctx.c index 22591317d86..01489fbe0e4 100644 --- a/libglusterfs/src/ctx.c +++ b/libglusterfs/src/ctx.c @@ -16,8 +16,6 @@ #include <pthread.h> #include "glusterfs.h" -#include "mem-pool.h" - glusterfs_ctx_t * glusterfs_ctx_new () @@ -27,7 +25,7 @@ glusterfs_ctx_new () /* no GF_CALLOC here, gf_acct_mem_set_enable is not yet decided at this point */ - ctx = CALLOC (1, sizeof (*ctx)); + ctx = calloc (1, sizeof (*ctx)); if (!ctx) { ret = -1; goto out; @@ -38,7 +36,7 @@ glusterfs_ctx_new () ret = pthread_mutex_init (&ctx->lock, NULL); if (ret) { - FREE (ctx); + free (ctx); ctx = NULL; } out: |