aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-12-07 21:17:52 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-12-07 21:17:52 +0000
commit3a09aaa3805da834a64cb3a4675b797783064087 (patch)
treebdf70eefdbfefdbdb2dbb55982cb073fd350c73b
parente129f64bc22b5d17388adb1e57212628b91901d2 (diff)
Merged revisions 91828 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r91828 | russell | 2007-12-07 15:17:24 -0600 (Fri, 07 Dec 2007) | 6 lines Fix another bug in the DEBUG_THREADS code. The ast_mutex_init() function had the mutex attribute object marked as static. This means that multiple threads initializing locks at the same time could step on each other and end up with improperly initialized locks. (found when tracking down locking issues related to issue #11080) ........ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@91829 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--include/asterisk/lock.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asterisk/lock.h b/include/asterisk/lock.h
index d4870b966..3695d23a7 100644
--- a/include/asterisk/lock.h
+++ b/include/asterisk/lock.h
@@ -213,7 +213,7 @@ static inline int __ast_pthread_mutex_init(int track, const char *filename, int
const char *mutex_name, ast_mutex_t *t)
{
int res;
- static pthread_mutexattr_t attr;
+ pthread_mutexattr_t attr;
#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS