diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-09 18:52:58 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-09 18:52:58 +0000 |
commit | 49346599cbe22784c6b4d7c6da4b7de0e875da24 (patch) | |
tree | 3282312e3ec8c61a974729e27fa59ec13c052ebd /include | |
parent | 6e91593b539b4f469850be5a2b75eca6b77817b7 (diff) |
Merged revisions 187483 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r187483 | tilghman | 2009-04-09 13:40:01 -0500 (Thu, 09 Apr 2009) | 15 lines
Merged revisions 187428 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r187428 | tilghman | 2009-04-09 13:08:20 -0500 (Thu, 09 Apr 2009) | 8 lines
Race condition between ast_cli_command() and 'module unload' could cause a deadlock.
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@187485 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rw-r--r-- | include/asterisk/linkedlists.h | 25 | ||||
-rw-r--r-- | include/asterisk/lock.h | 71 |
2 files changed, 96 insertions, 0 deletions
diff --git a/include/asterisk/linkedlists.h b/include/asterisk/linkedlists.h index 1ce7ee2bd..3c89e7117 100644 --- a/include/asterisk/linkedlists.h +++ b/include/asterisk/linkedlists.h @@ -52,6 +52,18 @@ ast_rwlock_wrlock(&(head)->lock) /*! + \brief Write locks a list, with timeout. + \param head This is a pointer to the list head structure + \param tv Pointer to a timeval structure + + This macro attempts to place an exclusive write lock in the + list head structure pointed to by head. + \retval 0 on success + \retval non-zero on failure +*/ +#define AST_RWLIST_TIMEDWRLOCK(head,tv) ast_rwlock_timedwrlock(&(head)->lock, tv) + +/*! \brief Read locks a list. \param head This is a pointer to the list head structure @@ -64,6 +76,19 @@ ast_rwlock_rdlock(&(head)->lock) /*! + \brief Read locks a list, with timeout. + \param head This is a pointer to the list head structure + \param tv Pointer to a timeval structure + + This macro attempts to place a read lock in the + list head structure pointed to by head. + \retval 0 on success + \retval non-zero on failure +*/ +#define AST_RWLIST_TIMEDRDLOCK(head,tv) \ + ast_rwlock_timedrdlock(&(head)->lock, tv) + +/*! \brief Locks a list, without blocking if the list is locked. \param head This is a pointer to the list head structure diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h index d6313bbe6..757371ebd 100644 --- a/include/asterisk/lock.h +++ b/include/asterisk/lock.h @@ -883,6 +883,8 @@ typedef pthread_rwlock_t ast_rwlock_t; #define ast_rwlock_wrlock(a) _ast_rwlock_wrlock(a, # a, __FILE__, __LINE__, __PRETTY_FUNCTION__) #define ast_rwlock_tryrdlock(a) _ast_rwlock_tryrdlock(a, # a, __FILE__, __LINE__, __PRETTY_FUNCTION__) #define ast_rwlock_trywrlock(a) _ast_rwlock_trywrlock(a, # a, __FILE__, __LINE__, __PRETTY_FUNCTION__) +#define ast_rwlock_timedrdlock(a,b) _ast_rwlock_timedrdlock(a, # a, b, __FILE__, __LINE__, __PRETTY_FUNCTION__) +#define ast_rwlock_timedwrlock(a,b) _ast_rwlock_timedwrlock(a, # a, b, __FILE__, __LINE__, __PRETTY_FUNCTION__) static inline int __ast_rwlock_init(const char *filename, int lineno, const char *func, const char *rwlock_name, ast_rwlock_t *prwlock) @@ -1017,6 +1019,65 @@ static inline int _ast_rwlock_wrlock(ast_rwlock_t *lock, const char *name, return res; } +static inline int _ast_rwlock_timedrdlock(ast_rwlock_t *lock, const char *name, + struct timeval *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; +} + +static inline int _ast_rwlock_timedwrlock(ast_rwlock_t *lock, const char *name, + struct timeval *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; +} static inline int _ast_rwlock_tryrdlock(ast_rwlock_t *lock, const char *name, const char *file, int line, const char *func) @@ -1122,6 +1183,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); @@ -1132,6 +1198,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); |