From: Kevin P. Fleming <kpfleming@digium.com>
Date: Fri, 6 Oct 2006 21:28:03 +0000 (+0000)
Subject: ensure that mutex locks inside list heads are initialized properly on platforms that... 
X-Git-Tag: 1.4.0-beta3~62
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f804e2f15312b4af0b92b4e802d803c59e3479fb;p=thirdparty%2Fasterisk.git

ensure that mutex locks inside list heads are initialized properly on platforms that require constructor initialization (issue #8029, patch from timrobbins)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@44631 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/include/asterisk/linkedlists.h b/include/asterisk/linkedlists.h
index d7447d12f4..3264b9e1a1 100644
--- a/include/asterisk/linkedlists.h
+++ b/include/asterisk/linkedlists.h
@@ -145,12 +145,30 @@ struct name {								\
   This would define \c struct \c entry_list, intended to hold a list of
   type \c struct \c entry.
 */
+#if defined(AST_MUTEX_INIT_W_CONSTRUCTORS)
+#define AST_LIST_HEAD_STATIC(name, type)				\
+struct name {								\
+	struct type *first;						\
+	struct type *last;						\
+	ast_mutex_t lock;						\
+} name;									\
+static void  __attribute__ ((constructor)) init_##name(void)		\
+{									\
+        AST_LIST_HEAD_INIT(&name);					\
+}									\
+static void  __attribute__ ((destructor)) fini_##name(void)		\
+{									\
+        AST_LIST_HEAD_DESTROY(&name);					\
+}									\
+struct __dummy_##name
+#else
 #define AST_LIST_HEAD_STATIC(name, type)				\
 struct name {								\
 	struct type *first;						\
 	struct type *last;						\
 	ast_mutex_t lock;						\
 } name = AST_LIST_HEAD_INIT_VALUE
+#endif
 
 /*!
   \brief Defines a structure to be used to hold a list of specified type, statically initialized.