[Asterisk-cvs] asterisk/include/asterisk lock.h,1.20,1.21 utils.h,1.2,1.3 vmodem.h,1.10,1.11
markster at lists.digium.com
markster at lists.digium.com
Tue Jun 22 13:56:19 CDT 2004
- Previous message: [Asterisk-cvs] asterisk/channels chan_agent.c,1.74,1.75 chan_h323.c,1.59,1.60 chan_iax.c,1.59,1.60 chan_iax2.c,1.155,1.156 chan_local.c,1.29,1.30 chan_mgcp.c,1.54,1.55 chan_sip.c,1.420,1.421 chan_skinny.c,1.46,1.47 chan_vpb.c,1.26,1.27 chan_zap.c,1.278,1.279
- Next message: [Asterisk-cvs] asterisk/codecs/lpc10 Makefile,1.10,1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /usr/cvsroot/asterisk/include/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv21170/include/asterisk
Modified Files:
lock.h utils.h vmodem.h
Log Message:
Merge major BSD mutex and symbol conflict patches (bug #1816) (link patch still pending)
Index: lock.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/lock.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- lock.h 9 Jun 2004 13:49:42 -0000 1.20
+++ lock.h 22 Jun 2004 17:42:14 -0000 1.21
@@ -16,6 +16,8 @@
#include <pthread.h>
#include <netdb.h>
+#include <time.h>
+#include <sys/param.h>
#define AST_PTHREADT_NULL (pthread_t) -1
#define AST_PTHREADT_STOP (pthread_t) -2
@@ -28,13 +30,23 @@
0x20 } }
#endif
-#ifdef __FreeBSD__
+#ifdef BSD
#ifdef __GNUC__
#define AST_MUTEX_INIT_W_CONSTRUCTORS
#else
#define AST_MUTEX_INIT_ON_FIRST_USE
#endif
-#endif /* __FreeBSD__ */
+#endif /* BSD */
+
+/* From now on, Asterisk REQUIRES Recursive (not error checking) mutexes
+ and will not run without them. */
+#ifdef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+#define PTHREAD_MUTEX_INIT_VALUE PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+#define AST_MUTEX_KIND PTHREAD_MUTEX_RECURSIVE_NP
+#else
+#define PTHREAD_MUTEX_INIT_VALUE PTHREAD_MUTEX_INITIALIZER
+#define AST_MUTEX_KIND PTHREAD_MUTEX_RECURSIVE
+#endif /* PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP */
#ifdef DEBUG_THREADS
@@ -47,15 +59,7 @@
#include <stdio.h>
#include <unistd.h>
-/* From now on, Asterisk REQUIRES Recursive (not error checking) mutexes
- and will not run without them. */
-#ifdef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
-#define AST_MUTEX_INIT_VAULE { PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP, NULL, 0, NULL, 0 }
-#define AST_MUTEX_KIND PTHREAD_MUTEX_RECURSIVE_NP
-#else
-#define AST_MUTEX_INIT_VAULE { PTHREAD_MUTEX_INITIALIZER, NULL, 0, NULL, 0 }
-#define AST_MUTEX_KIND PTHREAD_MUTEX_RECURSIVE
-#endif /* PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP */
+#define AST_MUTEX_INIT_VALUE { PTHREAD_MUTEX_INIT_VALUE, NULL, 0, NULL, 0 }
struct ast_mutex_info {
pthread_mutex_t mutex;
@@ -67,28 +71,88 @@
typedef struct ast_mutex_info ast_mutex_t;
-static inline int ast_pthread_mutex_init(ast_mutex_t *t, pthread_mutexattr_t *attr)
+static inline int __ast_pthread_mutex_init_attr(char *filename, int lineno, char *func,
+ char* mutex_name, ast_mutex_t *t,
+ pthread_mutexattr_t *attr)
{
- t->file = NULL;
- t->lineno = 0;
- t->func = 0;
+#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
+ if((t->mutex) != ((pthread_mutex_t)PTHREAD_MUTEX_INITIALIZER)) {
+ fprintf(stderr, "%s line %d (%s): Error: mutex '%s' is already initialized.\n",
+ filename, lineno, func, mutex_name);
+ fprintf(stderr, "%s line %d (%s): Error: previously initialization of mutex '%s'.\n",
+ t->file, t->lineno, t->func, mutex_name);
+#ifdef THREAD_CRASH
+ DO_THREAD_CRASH;
+#endif
+ return 0;
+ }
+#endif
+ t->file = filename;
+ t->lineno = lineno;
+ t->func = func;
t->thread = 0;
return pthread_mutex_init(&t->mutex, attr);
}
-static inline int ast_mutex_init(ast_mutex_t *t)
+static inline int __ast_pthread_mutex_init(char *filename, int lineno, char *func,
+ char* mutex_name, ast_mutex_t *t)
{
static pthread_mutexattr_t attr;
pthread_mutexattr_init(&attr);
pthread_mutexattr_settype(&attr, AST_MUTEX_KIND);
- return ast_pthread_mutex_init(t, &attr);
+ return __ast_pthread_mutex_init_attr(filename, lineno, func, mutex_name, t, &attr);
}
+#define ast_mutex_init(pmutex) __ast_pthread_mutex_init(__FILE__, __LINE__, __PRETTY_FUNCTION__, #pmutex, pmutex)
+#define ast_pthread_mutex_init(pmutex,attr) __ast_pthread_mutex_init_attr(__FILE__, __LINE__, __PRETTY_FUNCTION__, #pmutex, pmutex, attr)
+
+static inline int __ast_pthread_mutex_destroy(char *filename, int lineno, char *func,
+ char* mutex_name, ast_mutex_t *t)
+{
+ int res;
+#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
+ if((t->mutex) == ((pthread_mutex_t)PTHREAD_MUTEX_INITIALIZER)) {
+ fprintf(stderr, "%s line %d (%s): Error: mutex '%s' is uninitialized.\n",
+ filename, lineno, func, mutex_name);
+ }
+#endif
+ res = pthread_mutex_trylock(&t->mutex);
+ switch( res ) {
+ case 0:
+ pthread_mutex_unlock(&t->mutex);
+ break;
+ case EINVAL:
+ fprintf(stderr, "%s line %d (%s): Error: attempt to destroy invalid mutex '%s'.\n",
+ filename, lineno, func, mutex_name);
+ break;
+ case EBUSY:
+ fprintf(stderr, "%s line %d (%s): Error: attemp to destroy locked mutex '%s'.\n",
+ filename, lineno, func, mutex_name);
+ fprintf(stderr, "%s line %d (%s): Error: '%s' was locked here.\n",
+ t->file, t->lineno, t->func, mutex_name);
+ break;
+ }
+ res = pthread_mutex_destroy(&t->mutex);
+ if (res)
+ fprintf(stderr, "%s line %d (%s): Error destroying mutex: %s\n",
+ filename, lineno, func, strerror(res));
+#ifndef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+ else
+ t->mutex = PTHREAD_MUTEX_INIT_VALUE;
+#endif
+ t->file = filename;
+ t->lineno = lineno;
+ t->func = func;
+ return res;
+}
+
+#define ast_mutex_destroy(a) __ast_pthread_mutex_destroy(__FILE__, __LINE__, __PRETTY_FUNCTION__, #a, a)
+
#if defined(AST_MUTEX_INIT_W_CONSTRUCTORS)
/* if AST_MUTEX_INIT_W_CONSTRUCTORS is defined, use file scope
- constrictors/destructors to create/destroy mutexes. */
+ constrictors/destructors to create/destroy mutexes. */
#define __AST_MUTEX_DEFINE(scope,mutex) \
- scope ast_mutex_t mutex = AST_MUTEX_INIT_VAULE; \
+ scope ast_mutex_t mutex = AST_MUTEX_INIT_VALUE; \
static void __attribute__ ((constructor)) init_##mutex(void) \
{ \
ast_mutex_init(&mutex); \
@@ -97,24 +161,54 @@
{ \
ast_mutex_destroy(&mutex); \
}
-#elif defined(AST_MUTEX_INIT_ON_FIRST_USE) || !defined(AST_MUTEX_INIT_W_CONSTRUCTORS)
+#elif defined(AST_MUTEX_INIT_ON_FIRST_USE)
/* if AST_MUTEX_INIT_ON_FIRST_USE is defined, mutexes are created on
first use. The performance impact on FreeBSD should be small since
the pthreads library does this itself to initialize errror checking
(defaulty type) mutexes. If nither is defined, the pthreads librariy
does the initialization itself on first use. */
#define __AST_MUTEX_DEFINE(scope,mutex) \
- scope ast_mutex_t mutex = AST_MUTEX_INIT_VAULE
+ scope ast_mutex_t mutex = AST_MUTEX_INIT_VALUE
+#else /* AST_MUTEX_INIT_W_CONSTRUCTORS */
+/* By default, use static initialization of mutexes.*/
+#define __AST_MUTEX_DEFINE(scope,mutex) \
+ scope ast_mutex_t mutex = AST_MUTEX_INIT_VALUE
#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
-static inline int __ast_pthread_mutex_lock(char *filename, int lineno, char *func, ast_mutex_t *t)
+
+
+static inline int __ast_pthread_mutex_lock(char *filename, int lineno, char *func,
+ char* mutex_name, ast_mutex_t *t)
{
int res;
-#ifdef AST_MUTEX_INIT_ON_FIRST_USE
- if(*t->mutex == (ast_mutex_t)AST_MUTEX_KIND)
- ast_mutex_init(t->mutex);
+#if defined(AST_MUTEX_INIT_W_CONSTRUCTORS) || defined(AST_MUTEX_INIT_ON_FIRST_USE)
+ if((t->mutex) == ((pthread_mutex_t)PTHREAD_MUTEX_INITIALIZER)) {
+#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
+ fprintf(stderr, "%s line %d (%s): Error: mutex '%s' is uninitialized.\n",
+ filename, lineno, func, mutex_name);
#endif
- res = pthread_mutex_lock(&t->mutex);
+ ast_mutex_init(t);
+ }
+#endif /* definded(AST_MUTEX_INIT_W_CONSTRUCTORS) || defined(AST_MUTEX_INIT_ON_FIRST_USE) */
+#ifdef DETECT_DEADLOCKS
+ {
+ time_t seconds seconds = time(NULL);
+ do {
+ res = pthread_mutex_trylock(&t->mutex);
+ if(res == EBUSY) {
+ if((time(NULL) - seconds) % 5) {
+ fprintf(stderr, "%s line %d (%s): Deadlock? waited %d sec for mutex '%s'?\n",
+ filename, lineno, func, (time(NULL) - seconds), mutex_name);
+ fprintf(stderr, "%s line %d (%s): '%s' was locked here.\n",
+ t->file, t->lineno, t->func, mutex_name);
+ }
+ usleep(200);
+ }
+ } while (res == EBUSY);
+ }
+#else
+ res = pthread_mutex_lock(&t->mutex);
+#endif /* DETECT_DEADLOCKS */
if (!res) {
t->file = filename;
t->lineno = lineno;
@@ -130,14 +224,21 @@
return res;
}
-#define ast_mutex_lock(a) __ast_pthread_mutex_lock(__FILE__, __LINE__, __PRETTY_FUNCTION__, a)
+#define ast_mutex_lock(a) __ast_pthread_mutex_lock(__FILE__, __LINE__, __PRETTY_FUNCTION__, #a, a)
-static inline int __ast_pthread_mutex_trylock(char *filename, int lineno, char *func, ast_mutex_t *t) {
+static inline int __ast_pthread_mutex_trylock(char *filename, int lineno, char *func,
+ char* mutex_name, ast_mutex_t *t)
+{
int res;
-#ifdef AST_MUTEX_INIT_ON_FIRST_USE
- if(*t->mutex == (ast_mutex_t)AST_MUTEX_KIND)
- ast_mutex_init(t->mutex);
+#if defined(AST_MUTEX_INIT_W_CONSTRUCTORS) || defined(AST_MUTEX_INIT_ON_FIRST_USE)
+ if((t->mutex) == ((pthread_mutex_t)PTHREAD_MUTEX_INITIALIZER)) {
+#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
+ fprintf(stderr, "%s line %d (%s): Error: mutex '%s' is uninitialized.\n",
+ filename, lineno, func, mutex_name);
#endif
+ ast_mutex_init(t);
+ }
+#endif /* definded(AST_MUTEX_INIT_W_CONSTRUCTORS) || defined(AST_MUTEX_INIT_ON_FIRST_USE) */
res = pthread_mutex_trylock(&t->mutex);
if (!res) {
t->file = filename;
@@ -148,10 +249,17 @@
return res;
}
-#define ast_mutex_trylock(a) __ast_pthread_mutex_trylock(__FILE__, __LINE__, __PRETTY_FUNCTION__, a)
+#define ast_mutex_trylock(a) __ast_pthread_mutex_trylock(__FILE__, __LINE__, __PRETTY_FUNCTION__, #a, a)
-static inline int __ast_pthread_mutex_unlock(char *filename, int lineno, char *func, ast_mutex_t *t) {
+static inline int __ast_pthread_mutex_unlock(char *filename, int lineno, char *func,
+ char* mutex_name, ast_mutex_t *t) {
int res;
+#ifdef AST_MUTEX_INIT_W_CONSTRUCTORS
+ if((t->mutex) == ((pthread_mutex_t)PTHREAD_MUTEX_INITIALIZER)) {
+ fprintf(stderr, "%s line %d (%s): Error: mutex '%s' is uninitialized.\n",
+ filename, lineno, func, mutex_name);
+ }
+#endif
/* Assumes lock is actually held */
t->file = NULL;
t->lineno = 0;
@@ -168,23 +276,7 @@
return res;
}
-#define ast_mutex_unlock(a) __ast_pthread_mutex_unlock(__FILE__, __LINE__, __PRETTY_FUNCTION__, a)
-
-static inline int __ast_pthread_mutex_destroy(char *filename, int lineno, char *func, ast_mutex_t *t)
-{
- int res;
- t->file = NULL;
- t->lineno = 0;
- t->func = NULL;
- t->thread = 0;
- res = pthread_mutex_destroy(&t->mutex);
- if (res)
- fprintf(stderr, "%s line %d (%s): Error destroying mutex: %s\n",
- filename, lineno, func, strerror(res));
- return res;
-}
-
-#define ast_mutex_destroy(a) __ast_pthread_mutex_destroy(__FILE__, __LINE__, __PRETTY_FUNCTION__, a)
+#define ast_mutex_unlock(a) __ast_pthread_mutex_unlock(__FILE__, __LINE__, __PRETTY_FUNCTION__, #a, a)
#define pthread_mutex_t use_ast_mutex_t_instead_of_pthread_mutex_t
#define pthread_mutex_lock use_ast_mutex_lock_instead_of_pthread_mutex_lock
@@ -195,15 +287,9 @@
#else /* DEBUG_THREADS */
-/* From now on, Asterisk REQUIRES Recursive (not error checking) mutexes
- and will not run without them. */
-#ifdef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
-#define AST_MUTEX_INIT_VAULE PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
-#define AST_MUTEX_KIND PTHREAD_MUTEX_RECURSIVE_NP
-#else
-#define AST_MUTEX_INIT_VAULE PTHREAD_MUTEX_INITIALIZER
-#define AST_MUTEX_KIND PTHREAD_MUTEX_RECURSIVE
-#endif /* PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP */
+
+#define AST_MUTEX_INIT_VALUE PTHREAD_MUTEX_INIT_VALUE
+
typedef pthread_mutex_t ast_mutex_t;
@@ -222,7 +308,7 @@
/* if AST_MUTEX_INIT_W_CONSTRUCTORS is defined, use file scope
constrictors/destructors to create/destroy mutexes. */
#define __AST_MUTEX_DEFINE(scope,mutex) \
- scope ast_mutex_t mutex = AST_MUTEX_INIT_VAULE; \
+ scope ast_mutex_t mutex = AST_MUTEX_INIT_VALUE; \
static void __attribute__ ((constructor)) init_##mutex(void) \
{ \
ast_mutex_init(&mutex); \
@@ -241,7 +327,7 @@
the pthreads library does this itself to initialize errror checking
(defaulty type) mutexes.*/
#define __AST_MUTEX_DEFINE(scope,mutex) \
- scope ast_mutex_t mutex = AST_MUTEX_INIT_VAULE
+ scope ast_mutex_t mutex = AST_MUTEX_INIT_VALUE
static inline int ast_mutex_lock(ast_mutex_t *pmutex)
{
@@ -258,7 +344,7 @@
#else
/* By default, use static initialization of mutexes.*/
#define __AST_MUTEX_DEFINE(scope,mutex) \
- scope ast_mutex_t mutex = AST_MUTEX_INIT_VAULE
+ scope ast_mutex_t mutex = AST_MUTEX_INIT_VALUE
#define ast_mutex_lock(pmutex) pthread_mutex_lock(pmutex)
#define ast_mutex_trylock(pmutex) pthread_mutex_trylock(pmutex)
#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
@@ -270,6 +356,7 @@
#define AST_MUTEX_INITIALIZER __use_AST_MUTEX_DEFINE_STATIC_rather_than_AST_MUTEX_INITIALIZER__
+
#define gethostbyname __gethostbyname__is__not__reentrant__use__ast_gethostbyname__instead__
#endif
Index: utils.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/utils.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- utils.h 9 May 2004 08:22:15 -0000 1.2
+++ utils.h 22 Jun 2004 17:42:14 -0000 1.3
@@ -26,4 +26,6 @@
extern struct hostent *ast_gethostbyname(const char *host, struct ast_hostent *hp);
+extern int test_for_thread_safety(void);
+
#endif
Index: vmodem.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/vmodem.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- vmodem.h 22 Jun 2004 14:17:07 -0000 1.10
+++ vmodem.h 22 Jun 2004 17:42:14 -0000 1.11
@@ -5,7 +5,7 @@
*
* Copyright (C) 1999, Mark Spencer
*
- * Mark Spencer <markster at linux-support.net>
+ * Mark Spencer <markster at digium.com>
*
* This program is free software, distributed under the terms of
* the GNU General Public License
- Previous message: [Asterisk-cvs] asterisk/channels chan_agent.c,1.74,1.75 chan_h323.c,1.59,1.60 chan_iax.c,1.59,1.60 chan_iax2.c,1.155,1.156 chan_local.c,1.29,1.30 chan_mgcp.c,1.54,1.55 chan_sip.c,1.420,1.421 chan_skinny.c,1.46,1.47 chan_vpb.c,1.26,1.27 chan_zap.c,1.278,1.279
- Next message: [Asterisk-cvs] asterisk/codecs/lpc10 Makefile,1.10,1.11
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the svn-commits
mailing list