From 2cad4fea1ae8c8478005bf5d46708e6329071164 Mon Sep 17 00:00:00 2001
From: Steve Murphy <murf@digium.com>
Date: Tue, 31 Jul 2007 03:32:04 +0000
Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/trunk@77810 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
channels/chan_sip.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index fd0ef4e7b0..8ca5b3bab1 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -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.
--
GitLab