[asterisk-commits] russell: branch 1.4 r87396 - in /branches/1.4: include/asterisk/ main/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon Oct 29 15:22:08 CDT 2007
Author: russell
Date: Mon Oct 29 15:22:07 2007
New Revision: 87396
URL: http://svn.digium.com/view/asterisk?view=rev&rev=87396
Log:
Add some more details to the output of "core show locks". When a thread
is waiting for a lock, this will now show the details about who currently
has it locked.
(inspired by issue #11100)
Modified:
branches/1.4/include/asterisk/lock.h
branches/1.4/main/utils.c
Modified: branches/1.4/include/asterisk/lock.h
URL: http://svn.digium.com/view/asterisk/branches/1.4/include/asterisk/lock.h?view=diff&rev=87396&r1=87395&r2=87396
==============================================================================
--- branches/1.4/include/asterisk/lock.h (original)
+++ branches/1.4/include/asterisk/lock.h Mon Oct 29 15:22:07 2007
@@ -167,17 +167,17 @@
memset(&empty_mutex, 0, sizeof(empty_mutex));
}
-static inline void reentrancy_lock_cs(ast_mutex_t *p_ast_mutex)
+static inline void ast_reentrancy_lock(ast_mutex_t *p_ast_mutex)
{
pthread_mutex_lock(&p_ast_mutex->reentr_mutex);
}
-static inline void reentrancy_unlock_cs(ast_mutex_t *p_ast_mutex)
+static inline void ast_reentrancy_unlock(ast_mutex_t *p_ast_mutex)
{
pthread_mutex_unlock(&p_ast_mutex->reentr_mutex);
}
-static inline void init_reentrancy_cs(ast_mutex_t *p_ast_mutex)
+static inline void ast_reentrancy_init(ast_mutex_t *p_ast_mutex)
{
int i;
static pthread_mutexattr_t reentr_attr;
@@ -225,7 +225,7 @@
}
#endif
- init_reentrancy_cs(t);
+ ast_reentrancy_init(t);
t->track = track;
return pthread_mutex_init(&t->mutex, attr);
@@ -272,10 +272,10 @@
case EBUSY:
__ast_mutex_logger("%s line %d (%s): Error: attempt to destroy locked mutex '%s'.\n",
filename, lineno, func, mutex_name);
- reentrancy_lock_cs(t);
+ ast_reentrancy_lock(t);
__ast_mutex_logger("%s line %d (%s): Error: '%s' was locked here.\n",
t->file[t->reentrancy-1], t->lineno[t->reentrancy-1], t->func[t->reentrancy-1], mutex_name);
- reentrancy_unlock_cs(t);
+ ast_reentrancy_unlock(t);
break;
}
@@ -286,13 +286,13 @@
else
t->mutex = PTHREAD_MUTEX_INIT_VALUE;
#endif
- reentrancy_lock_cs(t);
+ ast_reentrancy_lock(t);
t->file[0] = filename;
t->lineno[0] = lineno;
t->func[0] = func;
t->reentrancy = 0;
t->thread[0] = 0;
- reentrancy_unlock_cs(t);
+ ast_reentrancy_unlock(t);
delete_reentrancy_cs(t);
return res;
@@ -335,11 +335,11 @@
if ((current - seconds) && (!((current - seconds) % 5))) {
__ast_mutex_logger("%s line %d (%s): Deadlock? waited %d sec for mutex '%s'?\n",
filename, lineno, func, (int)(current - seconds), mutex_name);
- reentrancy_lock_cs(t);
+ ast_reentrancy_lock(t);
__ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n",
t->file[t->reentrancy-1], t->lineno[t->reentrancy-1],
t->func[t->reentrancy-1], mutex_name);
- reentrancy_unlock_cs(t);
+ ast_reentrancy_unlock(t);
}
usleep(200);
}
@@ -356,7 +356,7 @@
#endif /* DETECT_DEADLOCKS */
if (!res) {
- reentrancy_lock_cs(t);
+ ast_reentrancy_lock(t);
if (t->reentrancy < AST_MAX_REENTRANCY) {
t->file[t->reentrancy] = filename;
t->lineno[t->reentrancy] = lineno;
@@ -367,7 +367,7 @@
__ast_mutex_logger("%s line %d (%s): '%s' really deep reentrancy!\n",
filename, lineno, func, mutex_name);
}
- reentrancy_unlock_cs(t);
+ ast_reentrancy_unlock(t);
if (t->track)
ast_mark_lock_acquired();
} else {
@@ -401,7 +401,7 @@
ast_store_lock_info(AST_MUTEX, filename, lineno, func, mutex_name, &t->mutex);
if (!(res = pthread_mutex_trylock(&t->mutex))) {
- reentrancy_lock_cs(t);
+ ast_reentrancy_lock(t);
if (t->reentrancy < AST_MAX_REENTRANCY) {
t->file[t->reentrancy] = filename;
t->lineno[t->reentrancy] = lineno;
@@ -412,7 +412,7 @@
__ast_mutex_logger("%s line %d (%s): '%s' really deep reentrancy!\n",
filename, lineno, func, mutex_name);
}
- reentrancy_unlock_cs(t);
+ ast_reentrancy_unlock(t);
if (t->track)
ast_mark_lock_acquired();
} else if (t->track) {
@@ -437,7 +437,7 @@
}
#endif
- reentrancy_lock_cs(t);
+ ast_reentrancy_lock(t);
if (t->reentrancy && (t->thread[t->reentrancy-1] != pthread_self())) {
__ast_mutex_logger("%s line %d (%s): attempted unlock mutex '%s' without owning it!\n",
filename, lineno, func, mutex_name);
@@ -458,7 +458,7 @@
t->func[t->reentrancy] = NULL;
t->thread[t->reentrancy] = 0;
}
- reentrancy_unlock_cs(t);
+ ast_reentrancy_unlock(t);
if (t->track)
ast_remove_lock_info(&t->mutex);
@@ -511,7 +511,7 @@
}
#endif
- reentrancy_lock_cs(t);
+ ast_reentrancy_lock(t);
if (t->reentrancy && (t->thread[t->reentrancy-1] != pthread_self())) {
__ast_mutex_logger("%s line %d (%s): attempted unlock mutex '%s' without owning it!\n",
filename, lineno, func, mutex_name);
@@ -532,7 +532,7 @@
t->func[t->reentrancy] = NULL;
t->thread[t->reentrancy] = 0;
}
- reentrancy_unlock_cs(t);
+ ast_reentrancy_unlock(t);
if (t->track)
ast_remove_lock_info(&t->mutex);
@@ -542,7 +542,7 @@
filename, lineno, func, strerror(res));
DO_THREAD_CRASH;
} else {
- reentrancy_lock_cs(t);
+ ast_reentrancy_lock(t);
if (t->reentrancy < AST_MAX_REENTRANCY) {
t->file[t->reentrancy] = filename;
t->lineno[t->reentrancy] = lineno;
@@ -553,7 +553,7 @@
__ast_mutex_logger("%s line %d (%s): '%s' really deep reentrancy!\n",
filename, lineno, func, mutex_name);
}
- reentrancy_unlock_cs(t);
+ ast_reentrancy_unlock(t);
if (t->track)
ast_store_lock_info(AST_MUTEX, filename, lineno, func, mutex_name, &t->mutex);
@@ -577,7 +577,7 @@
}
#endif
- reentrancy_lock_cs(t);
+ ast_reentrancy_lock(t);
if (t->reentrancy && (t->thread[t->reentrancy-1] != pthread_self())) {
__ast_mutex_logger("%s line %d (%s): attempted unlock mutex '%s' without owning it!\n",
filename, lineno, func, mutex_name);
@@ -598,7 +598,7 @@
t->func[t->reentrancy] = NULL;
t->thread[t->reentrancy] = 0;
}
- reentrancy_unlock_cs(t);
+ ast_reentrancy_unlock(t);
if (t->track)
ast_remove_lock_info(&t->mutex);
@@ -608,7 +608,7 @@
filename, lineno, func, strerror(res));
DO_THREAD_CRASH;
} else {
- reentrancy_lock_cs(t);
+ ast_reentrancy_lock(t);
if (t->reentrancy < AST_MAX_REENTRANCY) {
t->file[t->reentrancy] = filename;
t->lineno[t->reentrancy] = lineno;
@@ -619,7 +619,7 @@
__ast_mutex_logger("%s line %d (%s): '%s' really deep reentrancy!\n",
filename, lineno, func, mutex_name);
}
- reentrancy_unlock_cs(t);
+ ast_reentrancy_unlock(t);
if (t->track)
ast_store_lock_info(AST_MUTEX, filename, lineno, func, mutex_name, &t->mutex);
Modified: branches/1.4/main/utils.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/utils.c?view=diff&rev=87396&r1=87395&r2=87396
==============================================================================
--- branches/1.4/main/utils.c (original)
+++ branches/1.4/main/utils.c Mon Oct 29 15:22:07 2007
@@ -727,6 +727,9 @@
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_dynamic_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,
@@ -736,6 +739,18 @@
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)
+ continue;
+
+ lock = lock_info->locks[i].lock_addr;
+
+ ast_reentrancy_lock(lock);
+ for (j = 0; str && j < lock->reentrancy; j++) {
+ ast_dynamic_str_append(&str, 0, "=== --- ---> Locked Here: %s line %d (%s)\n",
+ lock->file[j], lock->lineno[j], lock->func[j]);
+ }
+ ast_reentrancy_unlock(lock);
}
pthread_mutex_unlock(&lock_info->lock);
if (!str)
More information about the asterisk-commits
mailing list