kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-25 14:06:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Race condition between ast_cli_command() and 'module unload' could cause a deadlock.

Browse Source 
Add lock timeouts to avoid this potential deadlock.
(closes issue #14705)
 Reported by: jamessan
 Patches: 
       20090320__bug14705.diff.txt uploaded by tilghman (license 14)
 Tested by: jamessan


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@187428 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2009-04-09 18:08:20 +00:00
parent 1cb43cfa75
commit 34672a3919
2 changed files with 90 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
include/asterisk/lock.h
View File

@@ -993,6 +993,72 @@ static inline int _ast_rwlock_wrlock(ast_rwlock_t *lock, const char *name,
return res;
}
#define ast_rwlock_timedrdlock(a,b) \
_ast_rwlock_timedrdlock(a, # a, b, __FILE__, __LINE__, __PRETTY_FUNCTION__)
static inline int _ast_rwlock_rdlock(ast_rwlock_t *lock, const char *name,
const struct timespec *abs_timeout, const char *file, int line, const char *func)
{
int res;
#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
int canlog = strcmp(file, "logger.c");
if (*lock == ((ast_rwlock_t) AST_RWLOCK_INIT_VALUE)) {
/* Don't warn abount uninitialized lock.
* Simple try to initialize it.
* May be not needed in linux system.
*/
res = __ast_rwlock_init(file, line, func, name, lock);
if (*lock == ((ast_rwlock_t) AST_RWLOCK_INIT_VALUE)) {
__ast_mutex_logger("%s line %d (%s): Error: rwlock '%s' is uninitialized and unable to initialize.\n",
file, line, func, name);
return res;
}
}
#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
ast_store_lock_info(AST_RDLOCK, file, line, func, name, lock);
res = pthread_rwlock_timedrdlock(lock, abs_timeout);
if (!res)
ast_mark_lock_acquired(lock);
else
ast_remove_lock_info(lock);
return res;
}
#define ast_rwlock_timedwrlock(a,b) \
_ast_rwlock_timedwrlock(a, # a, b, __FILE__, __LINE__, __PRETTY_FUNCTION__)
static inline int _ast_rwlock_timedwrlock(ast_rwlock_t *lock, const char *name,
const struct timespec *abs_timeout, const char *file, int line, const char *func)
{
int res;
#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
int canlog = strcmp(file, "logger.c");
if (*lock == ((ast_rwlock_t) AST_RWLOCK_INIT_VALUE)) {
/* Don't warn abount uninitialized lock.
* Simple try to initialize it.
* May be not needed in linux system.
*/
res = __ast_rwlock_init(file, line, func, name, lock);
if (*lock == ((ast_rwlock_t) AST_RWLOCK_INIT_VALUE)) {
__ast_mutex_logger("%s line %d (%s): Error: rwlock '%s' is uninitialized and unable to initialize.\n",
file, line, func, name);
return res;
}
}
#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
ast_store_lock_info(AST_WRLOCK, file, line, func, name, lock);
res = pthread_rwlock_timedwrlock(lock, abs_timeout);
if (!res)
ast_mark_lock_acquired(lock);
else
ast_remove_lock_info(lock);
return res;
}
#define ast_rwlock_tryrdlock(a) \
_ast_rwlock_tryrdlock(a, # a, __FILE__, __LINE__, __PRETTY_FUNCTION__)
@@ -1092,6 +1158,11 @@ static inline int ast_rwlock_rdlock(ast_rwlock_t *prwlock)
return pthread_rwlock_rdlock(prwlock);
}
static inline int ast_rwlock_timedrdlock(ast_rwlock_t *prwlock, const struct timespec *abs_timeout)
{
return pthread_rwlock_timedrdlock(prwlock, abs_timeout);
}
static inline int ast_rwlock_tryrdlock(ast_rwlock_t *prwlock)
{
return pthread_rwlock_tryrdlock(prwlock);
@@ -1102,6 +1173,11 @@ static inline int ast_rwlock_wrlock(ast_rwlock_t *prwlock)
return pthread_rwlock_wrlock(prwlock);
}
static inline int ast_rwlock_timedwrlock(ast_rwlock_t *prwlock, const struct timespec *abs_timeout)
{
return pthread_rwlock_timedwrlock(prwlock, abs_timeout);
}
static inline int ast_rwlock_trywrlock(ast_rwlock_t *prwlock)
{
return pthread_rwlock_trywrlock(prwlock);