Sapian
/
asterisk
mirror of http://gerrit.asterisk.org/asterisk
3
0
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 304950 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r304950 | tilghman | 2011-01-31 00:41:36 -0600 (Mon, 31 Jan 2011) | 18 lines
  
  Change mutex tracking so that it only consumes memory in the core mutex object when it's actually being used.
  
  This reduces the overall size of a mutex which was 3016 bytes before this back
  down to 216 bytes (this is on 64-bit Linux with a glibc-implemented mutex).
  The exactness of the numbers here may vary slightly based upon how mutexes are
  implemented on a platform, but the long and short of it is that prior to this
  commit, chan_iax2 held down 98MB of memory on a 64-bit system for nothing more
  than a table of 32767 locks.  After this commit, the same table occupies a mere
  7MB of memory.
  
  (closes issue #18194)
   Reported by: job
   Patches: 
         20110124__issue18194.diff.txt uploaded by tilghman (license 14)
   Tested by: tilghman
   
  Review: https://reviewboard.asterisk.org/r/1066
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@304951 65c4cc65-6c06-0410-ace0-fbb531ad65f3
10-digiumphones
Tilghman Lesher 15 years ago
parent f9c3b26241
commit 16c3ea3d42
5 changed files with 316 additions and 245 deletions
Show Stats Download Patch File Download Diff File

2
.cleancount
Unescape View File

@ -1,3 +1,3 @@
38
39

59
include/asterisk/lock.h
Unescape View File

@ -91,11 +91,11 @@
#define AST_LOCK_TRACK_INIT_VALUE { { NULL }, { 0 }, 0, { NULL }, { 0 }, PTHREAD_MUTEX_INIT_VALUE }
#endif
#define AST_MUTEX_INIT_VALUE { AST_LOCK_TRACK_INIT_VALUE, 1, PTHREAD_MUTEX_INIT_VALUE }
#define AST_MUTEX_INIT_VALUE_NOTRACKING { AST_LOCK_TRACK_INIT_VALUE, 0, PTHREAD_MUTEX_INIT_VALUE }
#define AST_MUTEX_INIT_VALUE { PTHREAD_MUTEX_INIT_VALUE, NULL, 1 }
#define AST_MUTEX_INIT_VALUE_NOTRACKING { PTHREAD_MUTEX_INIT_VALUE, NULL, 0 }
#define AST_RWLOCK_INIT_VALUE { AST_LOCK_TRACK_INIT_VALUE, 1, __AST_RWLOCK_INIT_VALUE }
#define AST_RWLOCK_INIT_VALUE_NOTRACKING { AST_LOCK_TRACK_INIT_VALUE, 0, __AST_RWLOCK_INIT_VALUE }
#define AST_RWLOCK_INIT_VALUE { __AST_RWLOCK_INIT_VALUE, NULL, 1 }
#define AST_RWLOCK_INIT_VALUE_NOTRACKING { __AST_RWLOCK_INIT_VALUE, NULL, 0 }
#define AST_MAX_REENTRANCY 10
@ -119,10 +119,10 @@ struct ast_lock_track {
* The information will just be ignored in the core if a module does not request it..
*/
struct ast_mutex_info {
pthread_mutex_t mutex;
/*! Track which thread holds this mutex */
struct ast_lock_track track;
struct ast_lock_track *track;
unsigned int tracking:1;
pthread_mutex_t mutex;
};
/*! \brief Structure for rwlock and tracking information.
@ -131,10 +131,10 @@ struct ast_mutex_info {
* The information will just be ignored in the core if a module does not request it..
*/
struct ast_rwlock_info {
pthread_rwlock_t lock;
/*! Track which thread holds this lock */
struct ast_lock_track track;
struct ast_lock_track *track;
unsigned int tracking:1;
pthread_rwlock_t lock;
};
typedef struct ast_mutex_info ast_mutex_t;
@ -174,13 +174,13 @@ int __ast_cond_timedwait(const char *filename, int lineno, const char *func, con
int __ast_rwlock_init(int tracking, const char *filename, int lineno, const char *func, const char *rwlock_name, ast_rwlock_t *t);
int __ast_rwlock_destroy(const char *filename, int lineno, const char *func, const char *rwlock_name, ast_rwlock_t *t);
int __ast_rwlock_unlock(ast_rwlock_t *t, const char *name, const char *filename, int line, const char *func);
int __ast_rwlock_rdlock(ast_rwlock_t *t, const char *name, const char *filename, int line, const char *func);
int __ast_rwlock_wrlock(ast_rwlock_t *t, const char *name, const char *filename, int line, const char *func);
int __ast_rwlock_timedrdlock(ast_rwlock_t *t, const char *name, const struct timespec *abs_timeout, const char *filename, int line, const char *func);
int __ast_rwlock_timedwrlock(ast_rwlock_t *t, const char *name, const struct timespec *abs_timeout, const char *filename, int line, const char *func);
int __ast_rwlock_tryrdlock(ast_rwlock_t *t, const char *name, const char *filename, int line, const char *func);
int __ast_rwlock_trywrlock(ast_rwlock_t *t, const char *name, const char *filename, int line, const char *func);
int __ast_rwlock_unlock(const char *filename, int lineno, const char *func, ast_rwlock_t *t, const char *name);
int __ast_rwlock_rdlock(const char *filename, int lineno, const char *func, ast_rwlock_t *t, const char *name);
int __ast_rwlock_wrlock(const char *filename, int lineno, const char *func, ast_rwlock_t *t, const char *name);
int __ast_rwlock_timedrdlock(const char *filename, int lineno, const char *func, ast_rwlock_t *t, const char *name, const struct timespec *abs_timeout);
int __ast_rwlock_timedwrlock(const char *filename, int lineno, const char *func, ast_rwlock_t *t, const char *name, const struct timespec *abs_timeout);
int __ast_rwlock_tryrdlock(const char *filename, int lineno, const char *func, ast_rwlock_t *t, const char *name);
int __ast_rwlock_trywrlock(const char *filename, int lineno, const char *func, ast_rwlock_t *t, const char *name);
/*!
* \brief wrapper for rwlock with tracking enabled
@ -197,13 +197,13 @@ int __ast_rwlock_trywrlock(ast_rwlock_t *t, const char *name, const char *filena
#define ast_rwlock_init_notracking(rwlock) __ast_rwlock_init(0, __FILE__, __LINE__, __PRETTY_FUNCTION__, #rwlock, rwlock)
#define ast_rwlock_destroy(rwlock) __ast_rwlock_destroy(__FILE__, __LINE__, __PRETTY_FUNCTION__, #rwlock, rwlock)
#define ast_rwlock_unlock(a) __ast_rwlock_unlock(a, #a, __FILE__, __LINE__, __PRETTY_FUNCTION__)
#define ast_rwlock_rdlock(a) __ast_rwlock_rdlock(a, #a, __FILE__, __LINE__, __PRETTY_FUNCTION__)
#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__)
#define ast_rwlock_unlock(a) __ast_rwlock_unlock(__FILE__, __LINE__, __PRETTY_FUNCTION__, a, #a)
#define ast_rwlock_rdlock(a) __ast_rwlock_rdlock(__FILE__, __LINE__, __PRETTY_FUNCTION__, a, #a)
#define ast_rwlock_wrlock(a) __ast_rwlock_wrlock(__FILE__, __LINE__, __PRETTY_FUNCTION__, a, #a)
#define ast_rwlock_tryrdlock(a) __ast_rwlock_tryrdlock(__FILE__, __LINE__, __PRETTY_FUNCTION__, a, #a)
#define ast_rwlock_trywrlock(a) __ast_rwlock_trywrlock(__FILE__, __LINE__, __PRETTY_FUNCTION__, a, #a)
#define ast_rwlock_timedrdlock(a, b) __ast_rwlock_timedrdlock(__FILE__, __LINE__, __PRETTY_FUNCTION__, a, #a, b)
#define ast_rwlock_timedwrlock(a, b) __ast_rwlock_timedwrlock(__FILE__, __LINE__, __PRETTY_FUNCTION__, a, #a, b)
#define ROFFSET ((lt->reentrancy > 0) ? (lt->reentrancy-1) : 0)
@ -436,10 +436,15 @@ static inline void ast_reentrancy_unlock(struct ast_lock_track *lt)
pthread_mutex_unlock(&lt->reentr_mutex);
}
static inline void ast_reentrancy_init(struct ast_lock_track *lt)
static inline void ast_reentrancy_init(struct ast_lock_track **plt)
{
int i;
pthread_mutexattr_t reentr_attr;
struct ast_lock_track *lt = *plt;
if (!lt) {
lt = *plt = (struct ast_lock_track *) ast_calloc(1, sizeof(*lt));
}
for (i = 0; i < AST_MAX_REENTRANCY; i++) {
lt->file[i] = NULL;
@ -459,9 +464,15 @@ static inline void ast_reentrancy_init(struct ast_lock_track *lt)
pthread_mutexattr_destroy(&reentr_attr);
}
static inline void delete_reentrancy_cs(struct ast_lock_track *lt)
static inline void delete_reentrancy_cs(struct ast_lock_track **plt)
{
struct ast_lock_track *lt;
if (*plt) {
lt = *plt;
pthread_mutex_destroy(&lt->reentr_mutex);
ast_free(lt);
*plt = NULL;
}
}
#else /* !DEBUG_THREADS */

6
main/heap.c
Unescape View File

@ -308,15 +308,15 @@ size_t ast_heap_size(struct ast_heap *h)
int __ast_heap_wrlock(struct ast_heap *h, const char *file, const char *func, int line)
{
return __ast_rwlock_wrlock(&h->lock, "&h->lock", file, line, func);
return __ast_rwlock_wrlock(file, line, func, &h->lock, "&h->lock");
}
int __ast_heap_rdlock(struct ast_heap *h, const char *file, const char *func, int line)
{
return __ast_rwlock_rdlock(&h->lock, "&h->lock", file, line, func);
return __ast_rwlock_rdlock(file, line, func, &h->lock, "&h->lock");
}
int __ast_heap_unlock(struct ast_heap *h, const char *file, const char *func, int line)
{
return __ast_rwlock_unlock(&h->lock, "&h->lock", file, line, func);
return __ast_rwlock_unlock(file, line, func, &h->lock, "&h->lock");
}

202
main/lock.c
Unescape View File

@ -62,7 +62,6 @@ int __ast_pthread_mutex_init(int tracking, const char *filename, int lineno, con
#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
ast_reentrancy_init(&t->track);
t->tracking = tracking;
#endif /* DEBUG_THREADS */
pthread_mutexattr_init(&attr);
@ -96,7 +95,10 @@ int __ast_pthread_mutex_destroy(const char *filename, int lineno, const char *fu
}
#endif
lt = &t->track;
if (t->tracking && !t->track) {
ast_reentrancy_init(&t->track);
}
lt = t->track;
res = pthread_mutex_trylock(&t->mutex);
switch (res) {
@ -110,6 +112,7 @@ int __ast_pthread_mutex_destroy(const char *filename, int lineno, const char *fu
case EBUSY:
__ast_mutex_logger("%s line %d (%s): Error: attempt to destroy locked mutex '%s'.\n",
filename, lineno, func, mutex_name);
if (t->tracking) {
ast_reentrancy_lock(lt);
__ast_mutex_logger("%s line %d (%s): Error: '%s' was locked here.\n",
lt->file[ROFFSET], lt->lineno[ROFFSET], lt->func[ROFFSET], mutex_name);
@ -117,6 +120,7 @@ int __ast_pthread_mutex_destroy(const char *filename, int lineno, const char *fu
__dump_backtrace(&lt->backtrace[ROFFSET], canlog);
#endif
ast_reentrancy_unlock(lt);
}
break;
}
#endif /* DEBUG_THREADS */
@ -128,6 +132,7 @@ int __ast_pthread_mutex_destroy(const char *filename, int lineno, const char *fu
__ast_mutex_logger("%s line %d (%s): Error destroying mutex %s: %s\n",
filename, lineno, func, mutex_name, strerror(res));
}
if (t->tracking) {
ast_reentrancy_lock(lt);
lt->file[0] = filename;
lt->lineno[0] = lineno;
@ -138,7 +143,8 @@ int __ast_pthread_mutex_destroy(const char *filename, int lineno, const char *fu
memset(&lt->backtrace[0], 0, sizeof(lt->backtrace[0]));
#endif
ast_reentrancy_unlock(lt);
delete_reentrancy_cs(lt);
delete_reentrancy_cs(&t->track);
}
#endif /* DEBUG_THREADS */
return res;
@ -150,7 +156,7 @@ int __ast_pthread_mutex_lock(const char *filename, int lineno, const char *func,
int res;
#ifdef DEBUG_THREADS
struct ast_lock_track *lt = &t->track;
struct ast_lock_track *lt;
int canlog = strcmp(filename, "logger.c") & t->tracking;
#ifdef HAVE_BKTR
struct ast_bt *bt = NULL;
@ -171,6 +177,11 @@ int __ast_pthread_mutex_lock(const char *filename, int lineno, const char *func,
}
#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
if (t->tracking && !t->track) {
ast_reentrancy_init(&t->track);
}
lt = t->track;
if (t->tracking) {
#ifdef HAVE_BKTR
ast_reentrancy_lock(lt);
@ -231,7 +242,7 @@ int __ast_pthread_mutex_lock(const char *filename, int lineno, const char *func,
#endif /* !DETECT_DEADLOCKS || !DEBUG_THREADS */
#ifdef DEBUG_THREADS
if (!res) {
if (t->tracking && !res) {
ast_reentrancy_lock(lt);
if (lt->reentrancy < AST_MAX_REENTRANCY) {
lt->file[lt->reentrancy] = filename;
@ -247,7 +258,7 @@ int __ast_pthread_mutex_lock(const char *filename, int lineno, const char *func,
if (t->tracking) {
ast_mark_lock_acquired(t);
}
} else {
} else if (t->tracking) {
#ifdef HAVE_BKTR
if (lt->reentrancy) {
ast_reentrancy_lock(lt);
@ -256,14 +267,12 @@ int __ast_pthread_mutex_lock(const char *filename, int lineno, const char *func,
} else {
bt = NULL;
}
if (t->tracking) {
ast_remove_lock_info(t, bt);
}
#else
if (t->tracking) {
ast_remove_lock_info(t);
}
#endif
}
if (res) {
__ast_mutex_logger("%s line %d (%s): Error obtaining mutex: %s\n",
filename, lineno, func, strerror(res));
DO_THREAD_CRASH;
@ -279,7 +288,7 @@ int __ast_pthread_mutex_trylock(const char *filename, int lineno, const char *fu
int res;
#ifdef DEBUG_THREADS
struct ast_lock_track *lt= &t->track;
struct ast_lock_track *lt;
int canlog = strcmp(filename, "logger.c") & t->tracking;
#ifdef HAVE_BKTR
struct ast_bt *bt = NULL;
@ -300,6 +309,11 @@ int __ast_pthread_mutex_trylock(const char *filename, int lineno, const char *fu
}
#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
if (t->tracking && !t->track) {
ast_reentrancy_init(&t->track);
}
lt = t->track;
if (t->tracking) {
#ifdef HAVE_BKTR
ast_reentrancy_lock(lt);
@ -318,7 +332,7 @@ int __ast_pthread_mutex_trylock(const char *filename, int lineno, const char *fu
res = pthread_mutex_trylock(&t->mutex);
#ifdef DEBUG_THREADS
if (!res) {
if (t->tracking && !res) {
ast_reentrancy_lock(lt);
if (lt->reentrancy < AST_MAX_REENTRANCY) {
lt->file[lt->reentrancy] = filename;
@ -348,7 +362,7 @@ int __ast_pthread_mutex_unlock(const char *filename, int lineno, const char *fun
int res;
#ifdef DEBUG_THREADS
struct ast_lock_track *lt = &t->track;
struct ast_lock_track *lt;
int canlog = strcmp(filename, "logger.c") & t->tracking;
#ifdef HAVE_BKTR
struct ast_bt *bt = NULL;
@ -367,6 +381,12 @@ int __ast_pthread_mutex_unlock(const char *filename, int lineno, const char *fun
}
#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
if (t->tracking && !t->track) {
ast_reentrancy_init(&t->track);
}
lt = t->track;
if (t->tracking) {
ast_reentrancy_lock(lt);
if (lt->reentrancy && (lt->thread[ROFFSET] != pthread_self())) {
__ast_mutex_logger("%s line %d (%s): attempted unlock mutex '%s' without owning it!\n",
@ -399,7 +419,6 @@ int __ast_pthread_mutex_unlock(const char *filename, int lineno, const char *fun
#endif
ast_reentrancy_unlock(lt);
if (t->tracking) {
#ifdef HAVE_BKTR
ast_remove_lock_info(t, bt);
#else
@ -453,7 +472,7 @@ int __ast_cond_wait(const char *filename, int lineno, const char *func,
int res;
#ifdef DEBUG_THREADS
struct ast_lock_track *lt= &t->track;
struct ast_lock_track *lt;
int canlog = strcmp(filename, "logger.c") & t->tracking;
#ifdef HAVE_BKTR
struct ast_bt *bt = NULL;
@ -472,6 +491,12 @@ int __ast_cond_wait(const char *filename, int lineno, const char *func,
}
#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
if (t->tracking && !t->track) {
ast_reentrancy_init(&t->track);
}
lt = t->track;
if (t->tracking) {
ast_reentrancy_lock(lt);
if (lt->reentrancy && (lt->thread[ROFFSET] != pthread_self())) {
__ast_mutex_logger("%s line %d (%s): attempted unlock mutex '%s' without owning it!\n",
@ -504,7 +529,6 @@ int __ast_cond_wait(const char *filename, int lineno, const char *func,
#endif
ast_reentrancy_unlock(lt);
if (t->tracking) {
#ifdef HAVE_BKTR
ast_remove_lock_info(t, bt);
#else
@ -520,7 +544,7 @@ int __ast_cond_wait(const char *filename, int lineno, const char *func,
__ast_mutex_logger("%s line %d (%s): Error waiting on condition mutex '%s'\n",
filename, lineno, func, strerror(res));
DO_THREAD_CRASH;
} else {
} else if (t->tracking) {
ast_reentrancy_lock(lt);
if (lt->reentrancy < AST_MAX_REENTRANCY) {
lt->file[lt->reentrancy] = filename;
@ -538,14 +562,12 @@ int __ast_cond_wait(const char *filename, int lineno, const char *func,
}
ast_reentrancy_unlock(lt);
if (t->tracking) {
#ifdef HAVE_BKTR
ast_store_lock_info(AST_MUTEX, filename, lineno, func, mutex_name, t, bt);
#else
ast_store_lock_info(AST_MUTEX, filename, lineno, func, mutex_name, t);
#endif
}
}
#endif /* DEBUG_THREADS */
return res;
@ -558,7 +580,7 @@ int __ast_cond_timedwait(const char *filename, int lineno, const char *func,
int res;
#ifdef DEBUG_THREADS
struct ast_lock_track *lt = &t->track;
struct ast_lock_track *lt;
int canlog = strcmp(filename, "logger.c") & t->tracking;
#ifdef HAVE_BKTR
struct ast_bt *bt = NULL;
@ -577,6 +599,12 @@ int __ast_cond_timedwait(const char *filename, int lineno, const char *func,
}
#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
if (t->tracking && !t->track) {
ast_reentrancy_init(&t->track);
}
lt = t->track;
if (t->tracking) {
ast_reentrancy_lock(lt);
if (lt->reentrancy && (lt->thread[ROFFSET] != pthread_self())) {
__ast_mutex_logger("%s line %d (%s): attempted unlock mutex '%s' without owning it!\n",
@ -608,7 +636,6 @@ int __ast_cond_timedwait(const char *filename, int lineno, const char *func,
#endif
ast_reentrancy_unlock(lt);
if (t->tracking) {
#ifdef HAVE_BKTR
ast_remove_lock_info(t, bt);
#else
@ -624,7 +651,7 @@ int __ast_cond_timedwait(const char *filename, int lineno, const char *func,
__ast_mutex_logger("%s line %d (%s): Error waiting on condition mutex '%s'\n",
filename, lineno, func, strerror(res));
DO_THREAD_CRASH;
} else {
} else if (t->tracking) {
ast_reentrancy_lock(lt);
if (lt->reentrancy < AST_MAX_REENTRANCY) {
lt->file[lt->reentrancy] = filename;
@ -642,14 +669,12 @@ int __ast_cond_timedwait(const char *filename, int lineno, const char *func,
}
ast_reentrancy_unlock(lt);
if (t->tracking) {
#ifdef HAVE_BKTR
ast_store_lock_info(AST_MUTEX, filename, lineno, func, mutex_name, t, bt);
#else
ast_store_lock_info(AST_MUTEX, filename, lineno, func, mutex_name, t);
#endif
}
}
#endif /* DEBUG_THREADS */
return res;
@ -661,7 +686,6 @@ int __ast_rwlock_init(int tracking, const char *filename, int lineno, const char
pthread_rwlockattr_t attr;
#ifdef DEBUG_THREADS
struct ast_lock_track *lt= &t->track;
#if defined(AST_MUTEX_INIT_W_CONSTRUCTORS) && defined(CAN_COMPARE_MUTEX_TO_INIT_VALUE)
int canlog = strcmp(filename, "logger.c") & t->tracking;
@ -673,8 +697,9 @@ int __ast_rwlock_init(int tracking, const char *filename, int lineno, const char
}
#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
ast_reentrancy_init(lt);
t->tracking = tracking;
if ((t->tracking = tracking)) {
ast_reentrancy_init(&t->track);
}
#endif /* DEBUG_THREADS */
pthread_rwlockattr_init(&attr);
@ -693,7 +718,7 @@ int __ast_rwlock_destroy(const char *filename, int lineno, const char *func, con
int res;
#ifdef DEBUG_THREADS
struct ast_lock_track *lt = &t->track;
struct ast_lock_track *lt = t->track;
int canlog = strcmp(filename, "logger.c") & t->tracking;
#if defined(AST_MUTEX_INIT_W_CONSTRUCTORS) && defined(CAN_COMPARE_MUTEX_TO_INIT_VALUE)
@ -713,6 +738,7 @@ int __ast_rwlock_destroy(const char *filename, int lineno, const char *func, con
__ast_mutex_logger("%s line %d (%s): Error destroying rwlock %s: %s\n",
filename, lineno, func, rwlock_name, strerror(res));
}
if (t->tracking) {
ast_reentrancy_lock(lt);
lt->file[0] = filename;
lt->lineno[0] = lineno;
@ -723,19 +749,19 @@ int __ast_rwlock_destroy(const char *filename, int lineno, const char *func, con
memset(&lt->backtrace[0], 0, sizeof(lt->backtrace[0]));
#endif
ast_reentrancy_unlock(lt);
delete_reentrancy_cs(lt);
delete_reentrancy_cs(&t->track);
}
#endif /* DEBUG_THREADS */
return res;
}
int __ast_rwlock_unlock(ast_rwlock_t *t, const char *name,
const char *filename, int line, const char *func)
int __ast_rwlock_unlock(const char *filename, int line, const char *func, ast_rwlock_t *t, const char *name)
{
int res;
#ifdef DEBUG_THREADS
struct ast_lock_track *lt = &t->track;
struct ast_lock_track *lt;
int canlog = strcmp(filename, "logger.c") & t->tracking;
#ifdef HAVE_BKTR
struct ast_bt *bt = NULL;
@ -756,6 +782,12 @@ int __ast_rwlock_unlock(ast_rwlock_t *t, const char *name,
}
#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
if (t->tracking && !t->track) {
ast_reentrancy_init(&t->track);
}
lt = t->track;
if (t->tracking) {
ast_reentrancy_lock(lt);
if (lt->reentrancy) {
int i;
@ -789,7 +821,6 @@ int __ast_rwlock_unlock(ast_rwlock_t *t, const char *name,
ast_reentrancy_unlock(lt);
if (t->tracking) {
#ifdef HAVE_BKTR
ast_remove_lock_info(t, bt);
#else
@ -811,13 +842,12 @@ int __ast_rwlock_unlock(ast_rwlock_t *t, const char *name,
return res;
}
int __ast_rwlock_rdlock(ast_rwlock_t *t, const char *name,
const char *filename, int line, const char *func)
int __ast_rwlock_rdlock(const char *filename, int line, const char *func, ast_rwlock_t *t, const char *name)
{
int res;
#ifdef DEBUG_THREADS
struct ast_lock_track *lt = &t->track;
struct ast_lock_track *lt;
int canlog = strcmp(filename, "logger.c") & t->tracking;
#ifdef HAVE_BKTR
struct ast_bt *bt = NULL;
@ -838,6 +868,11 @@ int __ast_rwlock_rdlock(ast_rwlock_t *t, const char *name,
}
#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
if (t->tracking && !t->track) {
ast_reentrancy_init(&t->track);
}
lt = t->track;
if (t->tracking) {
#ifdef HAVE_BKTR
ast_reentrancy_lock(lt);
@ -864,6 +899,7 @@ int __ast_rwlock_rdlock(ast_rwlock_t *t, const char *name,
if (wait_time > reported_wait && (wait_time % 5) == 0) {
__ast_mutex_logger("%s line %d (%s): Deadlock? waited %d sec for readlock '%s'?\n",
filename, line, func, (int)wait_time, name);
if (t->tracking) {
ast_reentrancy_lock(lt);
#ifdef HAVE_BKTR
__dump_backtrace(&lt->backtrace[lt->reentrancy], canlog);
@ -875,6 +911,7 @@ int __ast_rwlock_rdlock(ast_rwlock_t *t, const char *name,
__dump_backtrace(&lt->backtrace[lt->reentrancy-1], canlog);
#endif
ast_reentrancy_unlock(lt);
}
reported_wait = wait_time;
}
usleep(200);
@ -886,7 +923,7 @@ int __ast_rwlock_rdlock(ast_rwlock_t *t, const char *name,
#endif /* !DETECT_DEADLOCKS || !DEBUG_THREADS */
#ifdef DEBUG_THREADS
if (!res) {
if (!res && t->tracking) {
ast_reentrancy_lock(lt);
if (lt->reentrancy < AST_MAX_REENTRANCY) {
lt->file[lt->reentrancy] = filename;
@ -899,7 +936,7 @@ int __ast_rwlock_rdlock(ast_rwlock_t *t, const char *name,
if (t->tracking) {
ast_mark_lock_acquired(t);
}
} else {
} else if (t->tracking) {
#ifdef HAVE_BKTR
if (lt->reentrancy) {
ast_reentrancy_lock(lt);
@ -908,14 +945,13 @@ int __ast_rwlock_rdlock(ast_rwlock_t *t, const char *name,
} else {
bt = NULL;
}
if (t->tracking) {
ast_remove_lock_info(t, bt);
}
#else
if (t->tracking) {
ast_remove_lock_info(t);
}
#endif
}
if (res) {
__ast_mutex_logger("%s line %d (%s): Error obtaining read lock: %s\n",
filename, line, func, strerror(res));
DO_THREAD_CRASH;
@ -925,13 +961,12 @@ int __ast_rwlock_rdlock(ast_rwlock_t *t, const char *name,
return res;
}
int __ast_rwlock_wrlock(ast_rwlock_t *t, const char *name,
const char *filename, int line, const char *func)
int __ast_rwlock_wrlock(const char *filename, int line, const char *func, ast_rwlock_t *t, const char *name)
{
int res;
#ifdef DEBUG_THREADS
struct ast_lock_track *lt = &t->track;
struct ast_lock_track *lt;
int canlog = strcmp(filename, "logger.c") & t->tracking;
#ifdef HAVE_BKTR
struct ast_bt *bt = NULL;
@ -952,6 +987,11 @@ int __ast_rwlock_wrlock(ast_rwlock_t *t, const char *name,
}
#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
if (t->tracking && !t->track) {
ast_reentrancy_init(&t->track);
}
lt = t->track;
if (t->tracking) {
#ifdef HAVE_BKTR
ast_reentrancy_lock(lt);
@ -978,6 +1018,7 @@ int __ast_rwlock_wrlock(ast_rwlock_t *t, const char *name,
if (wait_time > reported_wait && (wait_time % 5) == 0) {
__ast_mutex_logger("%s line %d (%s): Deadlock? waited %d sec for writelock '%s'?\n",
filename, line, func, (int)wait_time, name);
if (t->tracking) {
ast_reentrancy_lock(lt);
#ifdef HAVE_BKTR
__dump_backtrace(&lt->backtrace[lt->reentrancy], canlog);
@ -989,6 +1030,7 @@ int __ast_rwlock_wrlock(ast_rwlock_t *t, const char *name,
__dump_backtrace(&lt->backtrace[lt->reentrancy-1], canlog);
#endif
ast_reentrancy_unlock(lt);
}
reported_wait = wait_time;
}
usleep(200);
@ -1000,7 +1042,7 @@ int __ast_rwlock_wrlock(ast_rwlock_t *t, const char *name,
#endif /* !DETECT_DEADLOCKS || !DEBUG_THREADS */
#ifdef DEBUG_THREADS
if (!res) {
if (!res && t->tracking) {
ast_reentrancy_lock(lt);
if (lt->reentrancy < AST_MAX_REENTRANCY) {
lt->file[lt->reentrancy] = filename;
@ -1013,7 +1055,7 @@ int __ast_rwlock_wrlock(ast_rwlock_t *t, const char *name,
if (t->tracking) {
ast_mark_lock_acquired(t);
}
} else {
} else if (t->tracking) {
#ifdef HAVE_BKTR
if (lt->reentrancy) {
ast_reentrancy_lock(lt);
@ -1030,6 +1072,8 @@ int __ast_rwlock_wrlock(ast_rwlock_t *t, const char *name,
ast_remove_lock_info(t);
}
#endif
}
if (res) {
__ast_mutex_logger("%s line %d (%s): Error obtaining write lock: %s\n",
filename, line, func, strerror(res));
DO_THREAD_CRASH;
@ -1039,13 +1083,13 @@ int __ast_rwlock_wrlock(ast_rwlock_t *t, const char *name,
return res;
}
int __ast_rwlock_timedrdlock(ast_rwlock_t *t, const char *name,
const struct timespec *abs_timeout, const char *filename, int line, const char *func)
int __ast_rwlock_timedrdlock(const char *filename, int line, const char *func, ast_rwlock_t *t, const char *name,
const struct timespec *abs_timeout)
{
int res;
#ifdef DEBUG_THREADS
struct ast_lock_track *lt = &t->track;
struct ast_lock_track *lt;
int canlog = strcmp(filename, "logger.c") & t->tracking;
#ifdef HAVE_BKTR
struct ast_bt *bt = NULL;
@ -1066,6 +1110,11 @@ int __ast_rwlock_timedrdlock(ast_rwlock_t *t, const char *name,
}
#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
if (t->tracking && !t->track) {
ast_reentrancy_init(&t->track);
}
lt = t->track;
if (t->tracking) {
#ifdef HAVE_BKTR
ast_reentrancy_lock(lt);
@ -1100,7 +1149,7 @@ int __ast_rwlock_timedrdlock(ast_rwlock_t *t, const char *name,
#endif
#ifdef DEBUG_THREADS
if (!res) {
if (!res && t->tracking) {
ast_reentrancy_lock(lt);
if (lt->reentrancy < AST_MAX_REENTRANCY) {
lt->file[lt->reentrancy] = filename;
@ -1113,7 +1162,7 @@ int __ast_rwlock_timedrdlock(ast_rwlock_t *t, const char *name,
if (t->tracking) {
ast_mark_lock_acquired(t);
}
} else {
} else if (t->tracking) {
#ifdef HAVE_BKTR
if (lt->reentrancy) {
ast_reentrancy_lock(lt);
@ -1122,14 +1171,12 @@ int __ast_rwlock_timedrdlock(ast_rwlock_t *t, const char *name,
} else {
bt = NULL;
}
if (t->tracking) {
ast_remove_lock_info(t, bt);
}
#else
if (t->tracking) {
ast_remove_lock_info(t);
}
#endif
}
if (res) {
__ast_mutex_logger("%s line %d (%s): Error obtaining read lock: %s\n",
filename, line, func, strerror(res));
DO_THREAD_CRASH;
@ -1139,13 +1186,13 @@ int __ast_rwlock_timedrdlock(ast_rwlock_t *t, const char *name,
return res;
}
int __ast_rwlock_timedwrlock(ast_rwlock_t *t, const char *name,
const struct timespec *abs_timeout, const char *filename, int line, const char *func)
int __ast_rwlock_timedwrlock(const char *filename, int line, const char *func, ast_rwlock_t *t, const char *name,
const struct timespec *abs_timeout)
{
int res;
#ifdef DEBUG_THREADS
struct ast_lock_track *lt = &t->track;
struct ast_lock_track *lt;
int canlog = strcmp(filename, "logger.c") & t->tracking;
#ifdef HAVE_BKTR
struct ast_bt *bt = NULL;
@ -1166,6 +1213,11 @@ int __ast_rwlock_timedwrlock(ast_rwlock_t *t, const char *name,
}
#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
if (t->tracking && !t->track) {
ast_reentrancy_init(&t->track);
}
lt = t->track;
if (t->tracking) {
#ifdef HAVE_BKTR
ast_reentrancy_lock(lt);
@ -1200,7 +1252,7 @@ int __ast_rwlock_timedwrlock(ast_rwlock_t *t, const char *name,
#endif
#ifdef DEBUG_THREADS
if (!res) {
if (!res && t->tracking) {
ast_reentrancy_lock(lt);
if (lt->reentrancy < AST_MAX_REENTRANCY) {
lt->file[lt->reentrancy] = filename;
@ -1213,7 +1265,7 @@ int __ast_rwlock_timedwrlock(ast_rwlock_t *t, const char *name,
if (t->tracking) {
ast_mark_lock_acquired(t);
}
} else {
} else if (t->tracking) {
#ifdef HAVE_BKTR
if (lt->reentrancy) {
ast_reentrancy_lock(lt);
@ -1230,6 +1282,8 @@ int __ast_rwlock_timedwrlock(ast_rwlock_t *t, const char *name,
ast_remove_lock_info(t);
}
#endif
}
if (res) {
__ast_mutex_logger("%s line %d (%s): Error obtaining read lock: %s\n",
filename, line, func, strerror(res));
DO_THREAD_CRASH;
@ -1239,13 +1293,12 @@ int __ast_rwlock_timedwrlock(ast_rwlock_t *t, const char *name,
return res;
}
int __ast_rwlock_tryrdlock(ast_rwlock_t *t, const char *name,
const char *filename, int line, const char *func)
int __ast_rwlock_tryrdlock(const char *filename, int line, const char *func, ast_rwlock_t *t, const char *name)
{
int res;
#ifdef DEBUG_THREADS
struct ast_lock_track *lt = &t->track;
struct ast_lock_track *lt;
#ifdef HAVE_BKTR
struct ast_bt *bt = NULL;
#endif
@ -1266,6 +1319,11 @@ int __ast_rwlock_tryrdlock(ast_rwlock_t *t, const char *name,
}
#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
if (t->tracking && !t->track) {
ast_reentrancy_init(&t->track);
}
lt = t->track;
if (t->tracking) {
#ifdef HAVE_BKTR
ast_reentrancy_lock(lt);
@ -1284,7 +1342,7 @@ int __ast_rwlock_tryrdlock(ast_rwlock_t *t, const char *name,
res = pthread_rwlock_tryrdlock(&t->lock);
#ifdef DEBUG_THREADS
if (!res) {
if (!res && t->tracking) {
ast_reentrancy_lock(lt);
if (lt->reentrancy < AST_MAX_REENTRANCY) {
lt->file[lt->reentrancy] = filename;
@ -1305,13 +1363,12 @@ int __ast_rwlock_tryrdlock(ast_rwlock_t *t, const char *name,
return res;
}
int __ast_rwlock_trywrlock(ast_rwlock_t *t, const char *name,
const char *filename, int line, const char *func)
int __ast_rwlock_trywrlock(const char *filename, int line, const char *func, ast_rwlock_t *t, const char *name)
{
int res;
#ifdef DEBUG_THREADS
struct ast_lock_track *lt= &t->track;
struct ast_lock_track *lt;
#ifdef HAVE_BKTR
struct ast_bt *bt = NULL;
#endif
@ -1332,6 +1389,11 @@ int __ast_rwlock_trywrlock(ast_rwlock_t *t, const char *name,
}
#endif /* AST_MUTEX_INIT_W_CONSTRUCTORS */
if (t->tracking && !t->track) {
ast_reentrancy_init(&t->track);
}
lt = t->track;
if (t->tracking) {
#ifdef HAVE_BKTR
ast_reentrancy_lock(lt);
@ -1350,7 +1412,7 @@ int __ast_rwlock_trywrlock(ast_rwlock_t *t, const char *name,
res = pthread_rwlock_trywrlock(&t->lock);
#ifdef DEBUG_THREADS
if (!res) {
if (!res && t->tracking) {
ast_reentrancy_lock(lt);
if (lt->reentrancy < AST_MAX_REENTRANCY) {
lt->file[lt->reentrancy] = filename;
@ -1360,9 +1422,7 @@ int __ast_rwlock_trywrlock(ast_rwlock_t *t, const char *name,
lt->reentrancy++;
}
ast_reentrancy_unlock(lt);
if (t->tracking) {
ast_mark_lock_acquired(t);
}
} else if (t->tracking) {
ast_mark_lock_failed(t);
}

2
main/utils.c
Unescape View File

@ -819,7 +819,7 @@ static void append_lock_information(struct ast_str **str, struct thr_lock_info *
return;
lock = lock_info->locks[i].lock_addr;
lt = &lock->track;
lt = lock->track;
ast_reentrancy_lock(lt);
for (j = 0; *str && j < lt->reentrancy; j++) {
ast_str_append(str, 0, "=== --- ---> Locked Here: %s line %d (%s)\n",

Write Preview
Loading…
Cancel
Save