diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-02-28 22:23:05 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-02-28 22:23:05 +0000 |
| commit | dc70203748f5c0afa54d449549d9200d0c11ea68 (patch) | |
| tree | 194e9a10bba4a163f43876568603e91233087932 /include | |
| parent | 1f27b5a4c9f5c823da260257d452fb933926d0b7 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.4@105116 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/lock.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index 2dcf9c4c8..8a3ed1d5f 100644 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -147,12 +147,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 @@ -371,7 +371,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); @@ -421,9 +421,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; @@ -900,7 +900,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; @@ -933,7 +933,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; @@ -966,7 +966,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; @@ -999,7 +999,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; |