dect
/
asterisk
Archived
13
0
Fork 0
Code Releases Activity

Merged revisions 124965 via svnmerge from 

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r124965 | tilghman | 2008-06-24 19:46:24 -0500 (Tue, 24 Jun 2008) | 7 lines

Pvt deadlock causes some channels to get stuck in Reserved status.
(closes issue #12621)
 Reported by: fabianoheringer
 Patches: 
       20080612__bug12621.diff.txt uploaded by Corydon76 (license 14)
 Tested by: fabianoheringer

........


git-svn-id: http://svn.digium.com/svn/asterisk/trunk@124966 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
tilghman 2008-06-25 01:08:37 +00:00
parent 6f29ea12b4
commit e8943c25e5
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
channels/chan_dahdi.c
View File

@ -5196,10 +5196,11 @@ static struct ast_frame *dahdi_read(struct ast_channel *ast)
int index;
void *readbuf;
struct ast_frame *f;
ast_mutex_lock(&p->lock);
while (ast_mutex_trylock(&p->lock)) {
CHANNEL_DEADLOCK_AVOIDANCE(ast);
}
index = dahdi_get_index(ast, p, 0);
/* Hang up if we don't really exist */

19
include/asterisk/lock.h
View File

@ -261,6 +261,20 @@ int ast_find_lock_info(void *lock_addr, const char **filename, int *lineno, cons
* used during deadlock avoidance, to preserve the original location where
* a lock was originally acquired.
*/
#define CHANNEL_DEADLOCK_AVOIDANCE(chan) \
do { \
const char *__filename, *__func, *__mutex_name; \
int __lineno; \
int __res = ast_find_lock_info(&chan->lock_dont_use, &__filename, &__lineno, &__func, &__mutex_name); \
ast_channel_unlock(chan); \
usleep(1); \
if (__res < 0) { /* Shouldn't ever happen, but just in case... */ \
ast_channel_lock(chan); \
} else { \
__ast_pthread_mutex_lock(__filename, __lineno, __func, __mutex_name, &chan->lock_dont_use); \
} \
} while (0)
#define DEADLOCK_AVOIDANCE(lock) \
do { \
const char *__filename, *__func, *__mutex_name; \
@ -1405,6 +1419,11 @@ static inline int _ast_rwlock_trywrlock(ast_rwlock_t *t, const char *name,
#else /* !DEBUG_THREADS */
#define CHANNEL_DEADLOCK_AVOIDANCE(chan) \
ast_channel_lock(chan); \
usleep(1); \
ast_channel_unlock(chan);
#define DEADLOCK_AVOIDANCE(lock) \
ast_mutex_lock(lock); \
usleep(1); \