kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-07 10:28:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 115737 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
r115737 | mmichelson | 2008-05-12 12:55:08 -0500 (Mon, 12 May 2008) | 15 lines

Merged revisions 115735 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r115735 | mmichelson | 2008-05-12 12:51:14 -0500 (Mon, 12 May 2008) | 7 lines

If a thread holds no locks, do not print any information on the thread when issuing
a core show locks command. This will help to de-clutter output somewhat.

Russell said it would be fine to place this improvement in the 1.4 branch, so that's
why it's going here too.


........

................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@115738 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2008-05-12 17:57:03 +00:00
parent fc07d2e1b7
commit bc90252b89
1 changed files with 35 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
main/utils.c
View File

@@ -749,46 +749,48 @@ static char *handle_show_locks(struct ast_cli_entry *e, int cmd, struct ast_cli_
pthread_mutex_lock(&lock_infos_lock.mutex);
AST_LIST_TRAVERSE(&lock_infos, lock_info, entry) {
int i;
ast_str_append(&str, 0, "=== Thread ID: %d (%s)\n", (int) lock_info->thread_id,
lock_info->thread_name);
pthread_mutex_lock(&lock_info->lock);
for (i = 0; str && i < lock_info->num_locks; i++) {
int j;
ast_mutex_t *lock;
if (lock_info->num_locks) {
ast_str_append(&str, 0, "=== Thread ID: %d (%s)\n", (int) lock_info->thread_id,
lock_info->thread_name);
pthread_mutex_lock(&lock_info->lock);
for (i = 0; str && i < lock_info->num_locks; i++) {
int j;
ast_mutex_t *lock;
ast_str_append(&str, 0, "=== ---> %sLock #%d (%s): %s %d %s %s %p (%d)\n",
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,
lock_info->locks[i].func, lock_info->locks[i].lock_name,
lock_info->locks[i].lock_addr,
lock_info->locks[i].times_locked);
ast_str_append(&str, 0, "=== ---> %sLock #%d (%s): %s %d %s %s %p (%d)\n",
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,
lock_info->locks[i].func, lock_info->locks[i].lock_name,
lock_info->locks[i].lock_addr,
lock_info->locks[i].times_locked);
if (!lock_info->locks[i].pending || lock_info->locks[i].pending == -1)
continue;
if (!lock_info->locks[i].pending || lock_info->locks[i].pending == -1)
continue;
/* We only have further details for mutexes right now */
if (lock_info->locks[i].type != AST_MUTEX)
continue;
/* We only have further details for mutexes right now */
if (lock_info->locks[i].type != AST_MUTEX)
continue;
lock = lock_info->locks[i].lock_addr;
lock = lock_info->locks[i].lock_addr;
ast_reentrancy_lock(lock);
for (j = 0; str && j < lock->reentrancy; j++) {
ast_str_append(&str, 0, "=== --- ---> Locked Here: %s line %d (%s)\n",
lock->file[j], lock->lineno[j], lock->func[j]);
ast_reentrancy_lock(lock);
for (j = 0; str && j < lock->reentrancy; j++) {
ast_str_append(&str, 0, "=== --- ---> Locked Here: %s line %d (%s)\n",
lock->file[j], lock->lineno[j], lock->func[j]);
}
ast_reentrancy_unlock(lock);
}
ast_reentrancy_unlock(lock);
pthread_mutex_unlock(&lock_info->lock);
if (!str)
break;
ast_str_append(&str, 0, "=== -------------------------------------------------------------------\n"
"===\n");
if (!str)
break;
}
pthread_mutex_unlock(&lock_info->lock);
if (!str)
break;
ast_str_append(&str, 0, "=== -------------------------------------------------------------------\n"
"===\n");
if (!str)
break;
}
pthread_mutex_unlock(&lock_infos_lock.mutex);