Archived
14
0
Fork 0

Discovered in experiments on core files: if you wrap the lock and unlock calls with sip_pvt_lock and sip_pvt_unlock, you lose the tracing info you would normally get via DETECT_DEADLOCKS; so I turn these two functions into macros when DETECT_DEADLOCKS is called. This way, you get meaningful stuff in the file and func slots in the lock_info struct.

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@77810 f38db490-d61c-443f-a65b-d21fe96a405b
This commit is contained in:
murf 2007-07-31 03:32:04 +00:00
parent 356721a45c
commit 323862f56b

View file

@ -1841,6 +1841,7 @@ static struct ast_rtp_protocol sip_rtp = {
get_codec: sip_get_codec,
};
#ifndef DETECT_DEADLOCKS
/*! \brief Helper function to lock, hiding the underlying locking mechanism. */
static void sip_pvt_lock(struct sip_pvt *pvt)
{
@ -1852,6 +1853,12 @@ static void sip_pvt_unlock(struct sip_pvt *pvt)
{
ast_mutex_unlock(&pvt->pvt_lock);
}
#else
/* we don't want to HIDE the information about where the lock was requested if trying to debug
* deadlocks! So, just make these macros! */
#define sip_pvt_lock(x) ast_mutex_lock(&x->pvt_lock)
#define sip_pvt_unlock(x) ast_mutex_unlock(&x->pvt_lock)
#endif
/*!
* helper functions to unreference various types of objects.