kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't attempt to access private data members of the pthread_mutex_t object,

Browse Source 
because this does not work on all linux systems.  Instead, just access
the reentrancy field in the ast_mutex_info struct when DEBUG_THREADS is
enabled.  If DEBUG_CHANNEL_LOCKS is enabled, the developer probably has
DEBUG_THREADS on as well.
(issue #8139, me)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@45441 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-10-18 02:41:36 +00:00
parent 8273d95be3
commit 0a78fea2ac
1 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
main/channel.c
View File

@@ -4468,17 +4468,9 @@ int ast_channel_unlock(struct ast_channel *chan)
res = ast_mutex_unlock(&chan->lock);
if (option_debug > 2) {
/* Try to find counter if possible on your platform
I've only found out how to do this on Linux
DEBUG_THREADS changes the lock structure
*/
#ifdef __linux__
int count = 0;
#ifdef DEBUG_THREADS
if ((count = chan->lock.mutex.__data.__count))
#else
if ((count = chan->lock.__data.__count))
#endif
int count = 0;
if ((count = chan->lock.reentrancy))
ast_log(LOG_DEBUG, ":::=== Still have %d locks (recursive)\n", count);
#endif
if (!res)
@@ -4508,13 +4500,9 @@ int ast_channel_lock(struct ast_channel *chan)
res = ast_mutex_lock(&chan->lock);
if (option_debug > 3) {
#ifdef __linux__
int count = 0;
#ifdef DEBUG_THREADS
if ((count = chan->lock.mutex.__data.__count))
#else
if ((count = chan->lock.__data.__count))
#endif
int count = 0;
if ((count = chan->lock.reentrancy))
ast_log(LOG_DEBUG, ":::=== Now have %d locks (recursive)\n", count);
#endif
if (!res)
@@ -4544,13 +4532,9 @@ int ast_channel_trylock(struct ast_channel *chan)
res = ast_mutex_trylock(&chan->lock);
if (option_debug > 2) {
#ifdef __linux__
int count = 0;
#ifdef DEBUG_THREADS
if ((count = chan->lock.mutex.__data.__count))
#else
if ((count = chan->lock.__data.__count))
#endif
int count = 0;
if ((count = chan->lock.reentrancy))
ast_log(LOG_DEBUG, ":::=== Now have %d locks (recursive)\n", count);
#endif
if (!res)