From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 5 May 2016 01:53:06 +0000 (-0600)
Subject: Fixup thread local storage destructors so they should always fire
X-Git-Tag: release_3_0_12~141
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=213194afd75b79e2a3613c370a36b492c3c93dc6;p=thirdparty%2Ffreeradius-server.git

Fixup thread local storage destructors so they should always fire
---

diff --git a/src/include/threads.h b/src/include/threads.h
index 4548b7bb95f..63703b77726 100644
--- a/src/include/threads.h
+++ b/src/include/threads.h
@@ -68,13 +68,19 @@ static inline _t __fr_thread_local_init_##_n(pthread_destructor_t func)\
 static pthread_key_t __fr_thread_local_key_##_n;\
 static pthread_once_t __fr_thread_local_once_##_n = PTHREAD_ONCE_INIT;\
 static pthread_destructor_t __fr_thread_local_destructor_##_n = NULL;\
-static inline void __fr_thread_local_key_init_##_n(void)\
+static void __fr_thread_local_destroy_##_n(UNUSED void *unused)\
 {\
-	(void) pthread_key_create(&__fr_thread_local_key_##_n, __fr_thread_local_destructor_##_n);\
+	__fr_thread_local_destructor_##_n(_n);\
 }\
-static inline _t __fr_thread_local_init_##_n(pthread_destructor_t func)\
+static void __fr_thread_local_key_init_##_n(void)\
+{\
+	(void) pthread_key_create(&__fr_thread_local_key_##_n, __fr_thread_local_destroy_##_n);\
+	(void) pthread_setspecific(__fr_thread_local_key_##_n, &(_n));\
+}\
+static _t __fr_thread_local_init_##_n(pthread_destructor_t func)\
 {\
 	__fr_thread_local_destructor_##_n = func;\
+	if (_n) return _n; \
 	(void) pthread_once(&__fr_thread_local_once_##_n, __fr_thread_local_key_init_##_n);\
 	return _n;\
 }
@@ -86,26 +92,22 @@ static inline _t __fr_thread_local_init_##_n(pthread_destructor_t func)\
 #  define fr_thread_local_setup(_t, _n) \
 static pthread_key_t __fr_thread_local_key_##_n;\
 static pthread_once_t __fr_thread_local_once_##_n = PTHREAD_ONCE_INIT;\
-static pthread_destructor_t __fr_thread_local_destructor_##_n = NULL; \
-static inline void __fr_thread_local_key_init_##_n(void)\
-{\
-	(void) pthread_key_create(&__fr_thread_local_key_##_n, __fr_thread_local_destructor_##_n);\
-}\
-static inline _t __fr_thread_local_init_##_n(pthread_destructor_t func)\
+static pthread_destructor_t __fr_thread_local_destructor_##_n = NULL;\
+static void __fr_thread_local_destroy_##_n(UNUSED void *unused)\
 {\
-	__fr_thread_local_destructor_##_n = func;\
-	(void) pthread_once(&__fr_thread_local_once_##_n, __fr_thread_local_key_init_##_n);\
-	return pthread_getspecific(__fr_thread_local_key_##_n);\
+	__fr_thread_local_destructor_##_n(_n);\
 }\
-DIAG_OFF(unused-function)\
-static inline _t __fr_thread_local_get_##_n(void)\
+static void __fr_thread_local_key_init_##_n(void)\
 {\
-	return pthread_getspecific(__fr_thread_local_key_##_n);\
+	(void) pthread_key_create(&__fr_thread_local_key_##_n, __fr_thread_local_destroy_##_n);\
+	(void) pthread_setspecific(__fr_thread_local_key_##_n, &(_n));\
 }\
-DIAG_ON(unused-function)\
-static inline int __fr_thread_local_set_##_n(_t val)\
+static _t __fr_thread_local_init_##_n(pthread_destructor_t func)\
 {\
-	return pthread_setspecific(__fr_thread_local_key_##_n, val);\
+	__fr_thread_local_destructor_##_n = func;\
+	if (_n) return _n; \
+	(void) pthread_once(&__fr_thread_local_once_##_n, __fr_thread_local_key_init_##_n);\
+	return _n;\
 }
 #  define fr_thread_local_init(_n, _f)			__fr_thread_local_init_##_n(_f)
 #  define fr_thread_local_set(_n, _v)			__fr_thread_local_set_##_n(_v)