From bc858473db1e1091b15d3f3d69ac6ba5d20b58e7 Mon Sep 17 00:00:00 2001 From: Humble Devassy Chirammal Date: Mon, 18 May 2015 17:37:14 +0530 Subject: libgfapi: introduce bit flags for pthread mutex and cond variables At present stage, the initialization and destroy of conditional and mutex variables of glfs struct happen in different places and there is no uniform way of destroying these variables incase there is a failure when initializing these. The fs mutex and conditional variables are getting destroyed from glfs_free_from_ctx(). However this destroy is not done by a conditional check inside destroy function. By introducing bit flags in glfs object, we can make use of the same (if there is a failure in initialization) in glfs_fini() which is evolving as one and only function to free fs and ctx resources. This patch introduce the flags field and set the flags according to the initialization flow of the mutex and conditional variables of struct glfs members. Without this patch we are compelled to use the goto lables and other hacks in init functions to make sure the resources are freed if there is an error path. Change-Id: I86e2719fb7ce437419a05699b4f06c14b02d0e69 BUG: 1208482 Signed-off-by: Humble Devassy Chirammal Signed-off-by: Poornima G Reviewed-on: http://review.gluster.org/10120 Reviewed-by: Niels de Vos Tested-by: Gluster Build System Tested-by: NetBSD Build System Reviewed-by: Shyamsundar Ranganathan --- api/src/glfs-internal.h | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) (limited to 'api/src/glfs-internal.h') diff --git a/api/src/glfs-internal.h b/api/src/glfs-internal.h index 384050be8ad..71c83755ec3 100644 --- a/api/src/glfs-internal.h +++ b/api/src/glfs-internal.h @@ -21,6 +21,55 @@ #define DEFAULT_REVAL_COUNT 1 +/* + * According to pthread mutex and conditional variable ( cond, child_down_count, + * upcall mutex and mutex) initialization of struct glfs members, + * below GLFS_INIT_* flags are set in 'pthread_flags' member of struct glfs. + * The flags are set from glfs_init() and glfs_new_from_ctx() functions + * as part of fs inititialization. + * + * These flag bits are validated in glfs_fini() to destroy all or partially + * initialized mutex and conditional variables of glfs object. + * If you introduce new pthread mutex or conditional variable in glfs object, + * please make sure you have a flag bit intorduced here for proper cleanup + * in glfs_fini(). + * + */ + +#define PTHREAD_MUTEX_INIT(mutex, attr, flags, mask, label) do { \ + int __ret = -1; \ + __ret = pthread_mutex_init (mutex, attr); \ + if (__ret == 0) \ + flags |= mask; \ + else \ + goto label; \ +} while (0) + +#define PTHREAD_MUTEX_DESTROY(mutex, flags, mask) do { \ + if (flags & mask) \ + (void) pthread_mutex_destroy (mutex); \ +} while (0) + +#define PTHREAD_COND_INIT(cond, attr, flags, mask, label) do { \ + int __ret = -1; \ + __ret = pthread_cond_init (cond, attr); \ + if (__ret == 0) \ + flags |= mask; \ + else \ + goto label; \ +} while (0) + +#define PTHREAD_COND_DESTROY(cond, flags, mask) do { \ + if (flags & mask) \ + (void) pthread_cond_destroy (cond); \ +} while (0) + +#define GLFS_INIT_MUTEX 0x00000001 /* pthread_mutex_flag */ +#define GLFS_INIT_COND 0x00000002 /* pthread_cond_flag */ +#define GLFS_INIT_COND_CHILD 0x00000004 /* pthread_cond_child_down_flag */ +#define GLFS_INIT_MUTEX_UPCALL 0x00000008 /* pthread_mutex_upcall_flag */ + + #ifndef GF_DARWIN_HOST_OS #ifndef GFAPI_PUBLIC #define GFAPI_PUBLIC(sym, ver) /**/ @@ -154,6 +203,7 @@ struct glfs { pthread_mutex_t upcall_list_mutex; /* mutex for upcall entry list */ uint32_t pin_refcnt; + uint32_t pthread_flags; /* GLFS_INIT_* # defines set this flag */ }; struct glfs_fd { -- cgit