kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-19 11:42:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor deadlock detect fix (bug #3531)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4986 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-02-08 18:48:01 +00:00
parent 4b485062ee
commit 89131204fd
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -86,7 +86,7 @@ DEBUG=-g #-pg
#OPTIONS += -DLOW_MEMORY #OPTIONS += -DLOW_MEMORY
# Optional debugging parameters # Optional debugging parameters
DEBUG_THREADS = #-DDEBUG_THREADS #-DDO_CRASH DEBUG_THREADS = #-DDEBUG_THREADS #-DDO_CRASH #-DDETECT_DEADLOCKS
# Uncomment next one to enable ast_frame tracing (for debugging) # Uncomment next one to enable ast_frame tracing (for debugging)
TRACE_FRAMES = #-DTRACE_FRAMES TRACE_FRAMES = #-DTRACE_FRAMES

10
include/asterisk/lock.h
View File

@@ -194,17 +194,19 @@ static inline int __ast_pthread_mutex_lock(char *filename, int lineno, char *fun
filename, lineno, func, mutex_name); filename, lineno, func, mutex_name);
#endif #endif
ast_mutex_init(t); ast_mutex_init(t);
} }
#endif /* definded(AST_MUTEX_INIT_W_CONSTRUCTORS) || defined(AST_MUTEX_INIT_ON_FIRST_USE) */ #endif /* definded(AST_MUTEX_INIT_W_CONSTRUCTORS) || defined(AST_MUTEX_INIT_ON_FIRST_USE) */
#ifdef DETECT_DEADLOCKS #ifdef DETECT_DEADLOCKS
{ {
time_t seconds seconds = time(NULL); time_t seconds = time(NULL);
time_t current;
do { do {
res = pthread_mutex_trylock(&t->mutex); res = pthread_mutex_trylock(&t->mutex);
if (res == EBUSY) { if (res == EBUSY) {
if ((time(NULL) - seconds) % 5) { current = time(NULL);
if ((current - seconds) && (!((current - seconds) % 5))) {
fprintf(stderr, "%s line %d (%s): Deadlock? waited %d sec for mutex '%s'?\n", fprintf(stderr, "%s line %d (%s): Deadlock? waited %d sec for mutex '%s'?\n",
filename, lineno, func, (time(NULL) - seconds), mutex_name); filename, lineno, func, (int)(current - seconds), mutex_name);
fprintf(stderr, "%s line %d (%s): '%s' was locked here.\n", fprintf(stderr, "%s line %d (%s): '%s' was locked here.\n",
t->file, t->lineno, t->func, mutex_name); t->file, t->lineno, t->func, mutex_name);
} }