From 7da06e6cb8b22d296062ab38cb2763cd7c1b5f41 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Thu, 28 Feb 2008 22:39:26 +0000 Subject: [PATCH] Merged revisions 105116 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r105116 | russell | 2008-02-28 16:23:05 -0600 (Thu, 28 Feb 2008) | 8 lines Fix a bug in the lock tracking code that was discovered by mmichelson. The issue is that if the lock history array was full, then the functions to mark a lock as acquired or not would adjust the stats for whatever lock is at the end of the array, which may not be itself. So, do a sanity check to make sure that we're updating lock info for the proper lock. (This explains the bizarre stats on lock #63 in BE-396, thanks Mark!) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@105144 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/lock.h | 18 +++++++++--------- main/utils.c | 14 +++++++++----- utils/check_expr.c | 4 ++-- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index f9a6a58311..5d6ef43bba 100644 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -154,12 +154,12 @@ void ast_store_lock_info(enum ast_lock_type type, const char *filename, /*! * \brief Mark the last lock as acquired */ -void ast_mark_lock_acquired(void); +void ast_mark_lock_acquired(void *lock_addr); /*! * \brief Mark the last lock as failed (trylock) */ -void ast_mark_lock_failed(void); +void ast_mark_lock_failed(void *lock_addr); /*! * \brief remove lock info for the current thread @@ -378,7 +378,7 @@ static inline int __ast_pthread_mutex_lock(const char *filename, int lineno, con } ast_reentrancy_unlock(t); if (t->track) - ast_mark_lock_acquired(); + ast_mark_lock_acquired(&t->mutex); } else { if (t->track) ast_remove_lock_info(&t->mutex); @@ -428,9 +428,9 @@ static inline int __ast_pthread_mutex_trylock(const char *filename, int lineno, } ast_reentrancy_unlock(t); if (t->track) - ast_mark_lock_acquired(); + ast_mark_lock_acquired(&t->mutex); } else if (t->track) { - ast_mark_lock_failed(); + ast_mark_lock_failed(&t->mutex); } return res; @@ -917,7 +917,7 @@ static inline int _ast_rwlock_rdlock(ast_rwlock_t *lock, const char *name, ast_store_lock_info(AST_RDLOCK, file, line, func, name, lock); res = pthread_rwlock_rdlock(lock); if (!res) - ast_mark_lock_acquired(); + ast_mark_lock_acquired(lock); else ast_remove_lock_info(lock); return res; @@ -948,7 +948,7 @@ static inline int _ast_rwlock_wrlock(ast_rwlock_t *lock, const char *name, ast_store_lock_info(AST_WRLOCK, file, line, func, name, lock); res = pthread_rwlock_wrlock(lock); if (!res) - ast_mark_lock_acquired(); + ast_mark_lock_acquired(lock); else ast_remove_lock_info(lock); return res; @@ -979,7 +979,7 @@ static inline int _ast_rwlock_tryrdlock(ast_rwlock_t *lock, const char *name, ast_store_lock_info(AST_RDLOCK, file, line, func, name, lock); res = pthread_rwlock_tryrdlock(lock); if (!res) - ast_mark_lock_acquired(); + ast_mark_lock_acquired(lock); else ast_remove_lock_info(lock); return res; @@ -1010,7 +1010,7 @@ static inline int _ast_rwlock_trywrlock(ast_rwlock_t *lock, const char *name, ast_store_lock_info(AST_WRLOCK, file, line, func, name, lock); res = pthread_rwlock_trywrlock(lock); if (!res) - ast_mark_lock_acquired(); + ast_mark_lock_acquired(lock); else ast_remove_lock_info(lock); return res; diff --git a/main/utils.c b/main/utils.c index fcdd527dd1..f8421b0c53 100644 --- a/main/utils.c +++ b/main/utils.c @@ -633,7 +633,7 @@ void ast_store_lock_info(enum ast_lock_type type, const char *filename, pthread_mutex_unlock(&lock_info->lock); } -void ast_mark_lock_acquired(void) +void ast_mark_lock_acquired(void *lock_addr) { struct thr_lock_info *lock_info; @@ -641,11 +641,13 @@ void ast_mark_lock_acquired(void) return; pthread_mutex_lock(&lock_info->lock); - lock_info->locks[lock_info->num_locks - 1].pending = 0; + if (lock_info->locks[lock_info->num_locks - 1].lock_addr == lock_addr) { + lock_info->locks[lock_info->num_locks - 1].pending = 0; + } pthread_mutex_unlock(&lock_info->lock); } -void ast_mark_lock_failed(void) +void ast_mark_lock_failed(void *lock_addr) { struct thr_lock_info *lock_info; @@ -653,8 +655,10 @@ void ast_mark_lock_failed(void) return; pthread_mutex_lock(&lock_info->lock); - lock_info->locks[lock_info->num_locks - 1].pending = -1; - lock_info->locks[lock_info->num_locks - 1].times_locked--; + if (lock_info->locks[lock_info->num_locks - 1].lock_addr == lock_addr) { + lock_info->locks[lock_info->num_locks - 1].pending = -1; + lock_info->locks[lock_info->num_locks - 1].times_locked--; + } pthread_mutex_unlock(&lock_info->lock); } diff --git a/utils/check_expr.c b/utils/check_expr.c index 00d00d802a..009fe86736 100644 --- a/utils/check_expr.c +++ b/utils/check_expr.c @@ -93,8 +93,8 @@ void ast_store_lock_info(enum ast_lock_type type, const char *filename, /* not a lot to do in a standalone w/o threading! */ } -void ast_mark_lock_acquired(void); -void ast_mark_lock_acquired(void) +void ast_mark_lock_acquired(void *); +void ast_mark_lock_acquired(void *foo) { /* not a lot to do in a standalone w/o threading! */ }