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

Merged revisions 85158 via svnmerge from

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

........
r85158 | tilghman | 2007-10-09 16:55:06 -0500 (Tue, 09 Oct 2007) | 5 lines

This commit fixes the following issues:
- Deadlock in ast_write (issue #10406)
- Deadlock in ast_read (issue #10406)
- Possible mutex initialization error in lock.h (issue #10571)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@85176 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2007-10-09 22:21:49 +00:00
parent 7adbd6bb16
commit e9221b062e
3 changed files with 61 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
main/utils.c
View File

@@ -549,7 +549,7 @@ struct thr_lock_info {
int times_locked;
enum ast_lock_type type;
/*! This thread is waiting on this lock */
unsigned int pending:1;
int pending:2;
} locks[AST_MAX_LOCKS];
/*! This is the number of locks currently held by this thread.
* The index (num_locks - 1) has the info on the last one in the
@@ -645,6 +645,19 @@ void ast_mark_lock_acquired(void)
pthread_mutex_unlock(&lock_info->lock);
}
void ast_mark_lock_failed(void)
{
struct thr_lock_info *lock_info;
if (!(lock_info = ast_threadstorage_get(&thread_lock_info, sizeof(*lock_info))))
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--;
pthread_mutex_unlock(&lock_info->lock);
}
void ast_remove_lock_info(void *lock_addr)
{
struct thr_lock_info *lock_info;
@@ -730,7 +743,7 @@ static char *handle_show_locks(struct ast_cli_entry *e, int cmd, struct ast_cli_
pthread_mutex_lock(&lock_info->lock);
for (i = 0; i < lock_info->num_locks; i++) {
ast_cli(a->fd, "=== ---> %sLock #%d (%s): %s %d %s %s %p (%d)\n",
lock_info->locks[i].pending ? "Waiting for " : "", i,
lock_info->locks[i].pending > 0 ? "Waiting for " : lock_info->locks[i].pending < 0 ? "Tried and failed to get " : "", i,
lock_info->locks[i].file,
locktype2str(lock_info->locks[i].type),
lock_info->locks[i].line_num,