[asterisk-commits] tilghman: branch 1.6.0 r187485 - in /branches/1.6.0: ./ include/asterisk/ main/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Thu Apr 9 13:53:02 CDT 2009
Author: tilghman
Date: Thu Apr 9 13:52:58 2009
New Revision: 187485
URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=187485
Log:
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
........
................
Modified:
branches/1.6.0/ (props changed)
branches/1.6.0/include/asterisk/linkedlists.h
branches/1.6.0/include/asterisk/lock.h
branches/1.6.0/main/manager.c
Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.0/include/asterisk/linkedlists.h
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/include/asterisk/linkedlists.h?view=diff&rev=187485&r1=187484&r2=187485
==============================================================================
--- branches/1.6.0/include/asterisk/linkedlists.h (original)
+++ branches/1.6.0/include/asterisk/linkedlists.h Thu Apr 9 13:52:58 2009
@@ -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
@@ -63,6 +75,19 @@
#define AST_RWLIST_RDLOCK(head) \
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
Modified: branches/1.6.0/include/asterisk/lock.h
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/include/asterisk/lock.h?view=diff&rev=187485&r1=187484&r2=187485
==============================================================================
--- branches/1.6.0/include/asterisk/lock.h (original)
+++ branches/1.6.0/include/asterisk/lock.h Thu Apr 9 13:52:58 2009
@@ -883,6 +883,8 @@
#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 @@
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 @@
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);
@@ -1130,6 +1196,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)
Modified: branches/1.6.0/main/manager.c
URL: http://svn.digium.com/svn-view/asterisk/branches/1.6.0/main/manager.c?view=diff&rev=187485&r1=187484&r2=187485
==============================================================================
--- branches/1.6.0/main/manager.c (original)
+++ branches/1.6.0/main/manager.c Thu Apr 9 13:52:58 2009
@@ -3140,8 +3140,12 @@
int ast_manager_unregister(char *action)
{
struct manager_action *cur;
-
- AST_RWLIST_WRLOCK(&actions);
+ struct timespec tv = { 5, };
+
+ if (AST_RWLIST_TIMEDWRLOCK(&actions, &tv)) {
+ ast_log(LOG_ERROR, "Could not obtain lock on manager list\n");
+ return -1;
+ }
AST_RWLIST_TRAVERSE_SAFE_BEGIN(&actions, cur, list) {
if (!strcasecmp(action, cur->action)) {
AST_RWLIST_REMOVE_CURRENT(list);
@@ -3150,7 +3154,7 @@
break;
}
}
- AST_RWLIST_TRAVERSE_SAFE_END;
+ AST_RWLIST_TRAVERSE_SAFE_END
AST_RWLIST_UNLOCK(&actions);
return 0;
@@ -3169,8 +3173,12 @@
static int ast_manager_register_struct(struct manager_action *act)
{
struct manager_action *cur, *prev = NULL;
-
- AST_RWLIST_WRLOCK(&actions);
+ struct timespec tv = { 5, };
+
+ if (AST_RWLIST_TIMEDWRLOCK(&actions, &tv)) {
+ ast_log(LOG_ERROR, "Could not obtain lock on manager list\n");
+ return -1;
+ }
AST_RWLIST_TRAVERSE(&actions, cur, list) {
int ret = strcasecmp(cur->action, act->action);
if (ret == 0) {
@@ -3183,8 +3191,8 @@
break;
}
}
-
- if (prev)
+
+ if (prev)
AST_RWLIST_INSERT_AFTER(&actions, prev, act, list);
else
AST_RWLIST_INSERT_HEAD(&actions, act, list);
@@ -3211,7 +3219,10 @@
cur->synopsis = synopsis;
cur->description = description;
- ast_manager_register_struct(cur);
+ if (ast_manager_register_struct(cur)) {
+ ast_free(cur);
+ return -1;
+ }
return 0;
}
More information about the asterisk-commits
mailing list