diff options
Diffstat (limited to 'xlators/features')
| -rw-r--r-- | xlators/features/locks/src/entrylk.c | 31 | ||||
| -rw-r--r-- | xlators/features/locks/src/inodelk.c | 31 | ||||
| -rw-r--r-- | xlators/features/locks/src/locks.h | 5 | ||||
| -rw-r--r-- | xlators/features/locks/src/posix.c | 48 |
4 files changed, 115 insertions, 0 deletions
diff --git a/xlators/features/locks/src/entrylk.c b/xlators/features/locks/src/entrylk.c index 626541237b3..fa1b33045dc 100644 --- a/xlators/features/locks/src/entrylk.c +++ b/xlators/features/locks/src/entrylk.c @@ -19,11 +19,40 @@ #include "clear.h" #include "common.h" +static inline void +pl_private_inc_entrylk (posix_locks_private_t *private) +{ +#ifdef HAVE_ATOMIC_BUILTINS + __sync_fetch_and_add (&private->entrylk_count, 1); +#else + pthread_mutex_lock (&private->lock); + { + private->entrylk_count += 1; + } + pthread_mutex_unlock (&private->lock); +#endif +} + +static inline void +pl_private_dec_entrylk (posix_locks_private_t *private) +{ +#ifdef HAVE_ATOMIC_BUILTINS + __sync_fetch_and_sub (&private->entrylk_count, 1); +#else + pthread_mutex_lock (&private->lock); + { + private->entrylk_count -= 1; + } + pthread_mutex_unlock (&private->lock); +#endif +} + void __pl_entrylk_unref (pl_entry_lock_t *lock) { lock->ref--; if (!lock->ref) { + pl_private_dec_entrylk (lock->this->private); GF_FREE ((char *)lock->basename); GF_FREE (lock->connection_id); GF_FREE (lock); @@ -68,6 +97,8 @@ new_entrylk_lock (pl_inode_t *pinode, const char *basename, entrylk_type type, INIT_LIST_HEAD (&newlock->client_list); __pl_entrylk_ref (newlock); + + pl_private_inc_entrylk (newlock->this->private); out: return newlock; } diff --git a/xlators/features/locks/src/inodelk.c b/xlators/features/locks/src/inodelk.c index 275fb9d20e4..7d9f123e48e 100644 --- a/xlators/features/locks/src/inodelk.c +++ b/xlators/features/locks/src/inodelk.c @@ -19,6 +19,34 @@ #include "clear.h" #include "common.h" +static inline void +pl_private_inc_inodelk (posix_locks_private_t *private) +{ +#ifdef HAVE_ATOMIC_BUILTINS + __sync_fetch_and_add (&private->inodelk_count, 1); +#else + pthread_mutex_lock (&private->lock); + { + private->inodelk_count += 1; + } + pthread_mutex_unlock (&private->lock); +#endif +} + +static inline void +pl_private_dec_inodelk (posix_locks_private_t *private) +{ +#ifdef HAVE_ATOMIC_BUILTINS + __sync_fetch_and_sub (&private->inodelk_count, 1); +#else + pthread_mutex_lock (&private->lock); + { + private->inodelk_count -= 1; + } + pthread_mutex_unlock (&private->lock); +#endif +} + void __delete_inode_lock (pl_inode_lock_t *lock) { @@ -36,6 +64,7 @@ __pl_inodelk_unref (pl_inode_lock_t *lock) { lock->ref--; if (!lock->ref) { + pl_private_dec_inodelk (lock->this->private); GF_FREE (lock->connection_id); GF_FREE (lock); } @@ -744,6 +773,8 @@ new_inode_lock (struct gf_flock *flock, client_t *client, pid_t client_pid, return NULL; } + pl_private_inc_inodelk (this->private); + lock->fl_start = flock->l_start; lock->fl_type = flock->l_type; diff --git a/xlators/features/locks/src/locks.h b/xlators/features/locks/src/locks.h index 8eb35da44be..12ab157a3a7 100644 --- a/xlators/features/locks/src/locks.h +++ b/xlators/features/locks/src/locks.h @@ -187,6 +187,9 @@ struct __pl_metalk { typedef struct __pl_metalk pl_meta_lock_t; typedef struct { +#ifndef HAVE_ATOMIC_BUILTINS + pthread_mutex_t lock; /* lock for the private structure */ +#endif mlk_mode_t mandatory_mode; /* holds current mandatory locking mode */ gf_boolean_t trace; /* trace lock requests in and out */ char *brickname; @@ -194,6 +197,8 @@ typedef struct { uint32_t revocation_secs; gf_boolean_t revocation_clear_all; uint32_t revocation_max_blocked; + uint32_t inodelk_count; + uint32_t entrylk_count; } posix_locks_private_t; diff --git a/xlators/features/locks/src/posix.c b/xlators/features/locks/src/posix.c index 616be0f7cff..59d05e81bec 100644 --- a/xlators/features/locks/src/posix.c +++ b/xlators/features/locks/src/posix.c @@ -1005,6 +1005,7 @@ int32_t pl_getxattr (call_frame_t *frame, xlator_t *this, loc_t *loc, const char *name, dict_t *xdata) { + posix_locks_private_t *priv = this->private; int32_t op_errno = EINVAL; int op_ret = -1; int32_t bcount = 0; @@ -1015,10 +1016,49 @@ pl_getxattr (call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *dict = NULL; clrlk_args args = {0,}; char *brickname = NULL; + int ret = 0; if (!name) goto usual; + if (strncmp (name, GLUSTERFS_INODELK_COUNT, + strlen (GLUSTERFS_INODELK_COUNT)) == 0) { + dict = dict_new (); + if (!dict) { + op_errno = ENOMEM; + goto out; + } + + ret = dict_set_int32 (dict, GLUSTERFS_INODELK_COUNT, + priv->inodelk_count); + if (ret) { + op_errno = EIO; + goto out; + } + + op_ret = 0; + goto out; + } + + if (strncmp (name, GLUSTERFS_ENTRYLK_COUNT, + strlen (GLUSTERFS_ENTRYLK_COUNT)) == 0) { + dict = dict_new (); + if (!dict) { + op_errno = ENOMEM; + goto out; + } + + ret = dict_set_int32 (dict, GLUSTERFS_ENTRYLK_COUNT, + priv->entrylk_count); + if (ret) { + op_errno = EIO; + goto out; + } + + op_ret = 0; + goto out; + } + if (strncmp (name, GF_XATTR_CLRLK_CMD, strlen (GF_XATTR_CLRLK_CMD))) goto usual; @@ -3679,6 +3719,10 @@ init (xlator_t *this) priv = GF_CALLOC (1, sizeof (*priv), gf_locks_mt_posix_locks_private_t); +#ifndef HAVE_ATOMIC_BUILTINS + pthread_mutex_init (&priv->lock, NULL); +#endif + GF_OPTION_INIT ("mandatory-locking", tmp_str, str, out); if (!strcmp (tmp_str, "forced")) priv->mandatory_mode = MLK_FORCED; @@ -3735,6 +3779,10 @@ fini (xlator_t *this) GF_FREE (priv->brickname); GF_FREE (priv); +#ifndef HAVE_ATOMIC_BUILTINS + pthread_mutex_destroy (&priv->lock); +#endif + return 0; } |