diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index a715e60e534aa61799af37057416ed125bd4a7fd..18b232587a3029dad73d6fbbcf13566e895e274d 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -1143,7 +1143,7 @@ static struct ast_register_list {
} regl;
/*! \brief A per-thread temporary pvt structure */
-AST_THREADSTORAGE(ts_temp_pvt, temp_pvt_init);
+AST_THREADSTORAGE(ts_temp_pvt);
/*! \todo Move the sip_auth list to AST_LIST */
static struct sip_auth *authl = NULL; /*!< Authentication list for realm authentication */
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 20b7152631ff9d39ff010540082ec50deae85595..fdd8389efb029c0bc3b296d2fd8b85fd2f922fdf 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -135,10 +135,10 @@ static struct ast_jb_conf default_jbconf =
};
static struct ast_jb_conf global_jbconf;
-AST_THREADSTORAGE(device2str_threadbuf, device2str_threadbuf_init);
+AST_THREADSTORAGE(device2str_threadbuf);
#define DEVICE2STR_BUFSIZE 15
-AST_THREADSTORAGE(control2str_threadbuf, control2str_threadbuf_init);
+AST_THREADSTORAGE(control2str_threadbuf);
#define CONTROL2STR_BUFSIZE 100
/*********************
diff --git a/channels/iax2-parser.c b/channels/iax2-parser.c
index 0a524e253fb09d8592a0e650b5614ba66864545f..09e04c4325bc5695d9cfbbc9d6d02deb8ca106a1 100644
--- a/channels/iax2-parser.c
+++ b/channels/iax2-parser.c
@@ -53,7 +53,7 @@ static int oframes = 0;
static void frame_cache_cleanup(void *data);
/*! \brief A per-thread cache of iax_frame structures */
-AST_THREADSTORAGE_CUSTOM(frame_cache, frame_cache_init, frame_cache_cleanup);
+AST_THREADSTORAGE_CUSTOM(frame_cache, NULL, frame_cache_cleanup);
/*! \brief This is just so iax_frames, a list head struct for holding a list of
* iax_frame structures, is defined. */
diff --git a/include/asterisk/threadstorage.h b/include/asterisk/threadstorage.h
index 14c6d65b94942cbf5be61a4ac55ae2a78a471aca..6964839cb860c6ad34050c259ec5fc4873a6d7b5 100644
--- a/include/asterisk/threadstorage.h
+++ b/include/asterisk/threadstorage.h
@@ -41,35 +41,51 @@ struct ast_threadstorage {
pthread_key_t key;
/*! The function that initializes the key */
void (*key_init)(void);
+ /*! Custom initialization function specific to the object */
+ void (*custom_init)(void *);
};
/*!
* \brief Define a thread storage variable
*
- * \arg name The name of the thread storage
- * \arg name_init This is a name used to create the function that gets called
- * to initialize this thread storage. It can be anything since it will not
- * be referred to anywhere else
+ * \arg name The name of the thread storage object
*
* This macro would be used to declare an instance of thread storage in a file.
*
* Example usage:
* \code
- * AST_THREADSTORAGE(my_buf, my_buf_init);
+ * AST_THREADSTORAGE(my_buf);
+ * \endcode
+ */
+#define AST_THREADSTORAGE(name) \
+ AST_THREADSTORAGE_CUSTOM(name, NULL, NULL)
+
+/*!
+ * \brief Define a thread storage variable, with custom initialization and cleanup
+ *
+ * \arg name The name of the thread storage object
+ * \arg init This is a custom that will be called after each thread specific
+ * object is allocated, with the allocated block of memory passed
+ * as the argument.
+ * \arg cleanup This is a custom function that will be called instead of ast_free
+ * when the thread goes away. Note that if this is used, it *MUST*
+ * call free on the allocated memory.
+ *
+ * Example usage:
+ * \code
+ * AST_THREADSTORAGE(my_buf, my_init, my_cleanup);
* \endcode
*/
-#define AST_THREADSTORAGE(name, name_init) \
- AST_THREADSTORAGE_CUSTOM(name, name_init, ast_free)
-
-#define AST_THREADSTORAGE_CUSTOM(name, name_init, cleanup) \
-static void name_init(void); \
-static struct ast_threadstorage name = { \
- .once = PTHREAD_ONCE_INIT, \
- .key_init = name_init, \
-}; \
-static void name_init(void) \
-{ \
- pthread_key_create(&(name).key, cleanup); \
+#define AST_THREADSTORAGE_CUSTOM(name, c_init, c_cleanup) \
+static void init_##name(void); \
+static struct ast_threadstorage name = { \
+ .once = PTHREAD_ONCE_INIT, \
+ .key_init = init_##name, \
+ .custom_init = c_init, \
+}; \
+static void init_##name(void) \
+{ \
+ pthread_key_create(&(name).key, c_cleanup); \
}
/*!
@@ -111,6 +127,8 @@ void *ast_threadstorage_get(struct ast_threadstorage *ts, size_t init_size),
if (!(buf = pthread_getspecific(ts->key))) {
if (!(buf = ast_calloc(1, init_size)))
return NULL;
+ if (ts->custom_init)
+ ts->custom_init(buf);
pthread_setspecific(ts->key, buf);
}
@@ -118,6 +136,8 @@ void *ast_threadstorage_get(struct ast_threadstorage *ts, size_t init_size),
}
)
+void __ast_threadstorage_cleanup(void *);
+
/*!
* \brief A dynamic length string
*/
diff --git a/main/channel.c b/main/channel.c
index 1a4f55dfdec0313ad49690964bb971d49c58a43f..9a53205ce0129abe386f37f23333af5bdd2aa1bf 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -100,7 +100,7 @@ static int uniqueint = 0;
unsigned long global_fin = 0, global_fout = 0;
-AST_THREADSTORAGE(state2str_threadbuf, state2str_threadbuf_init);
+AST_THREADSTORAGE(state2str_threadbuf);
#define STATE2STR_BUFSIZE 32
/* XXX 100ms ... this won't work with wideband support */
diff --git a/main/cli.c b/main/cli.c
index 51807d969e10016ebc0aaae0ae33a008e4bd2c3a..7f1b67d582e3f96a69f1a70086f289e34fff8a8f 100644
--- a/main/cli.c
+++ b/main/cli.c
@@ -51,7 +51,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
extern unsigned long global_fin, global_fout;
-AST_THREADSTORAGE(ast_cli_buf, ast_cli_buf_init);
+AST_THREADSTORAGE(ast_cli_buf);
/*! \brief Initial buffer size for resulting strings in ast_cli() */
#define AST_CLI_INITLEN 256
diff --git a/main/frame.c b/main/frame.c
index dc060e11326b3665f6de68e321782f29e5a43310..f797f55fad48b55b2a22f112e8ae8cf9f2049540 100644
--- a/main/frame.c
+++ b/main/frame.c
@@ -52,7 +52,7 @@ static AST_LIST_HEAD_STATIC(headerlist, ast_frame);
static void frame_cache_cleanup(void *data);
/*! \brief A per-thread cache of frame headers */
-AST_THREADSTORAGE_CUSTOM(frame_cache, frame_cache_init, frame_cache_cleanup);
+AST_THREADSTORAGE_CUSTOM(frame_cache, NULL, frame_cache_cleanup);
/*!
* \brief Maximum ast_frame cache size
diff --git a/main/logger.c b/main/logger.c
index a8e5c37003758a857cb6c8aa7f526e436663b66e..bd876317a6a1276ea35a5e379e9d406474b40248 100644
--- a/main/logger.c
+++ b/main/logger.c
@@ -137,10 +137,10 @@ static int colors[] = {
COLOR_BRGREEN
};
-AST_THREADSTORAGE(verbose_buf, verbose_buf_init);
+AST_THREADSTORAGE(verbose_buf);
#define VERBOSE_BUF_INIT_SIZE 128
-AST_THREADSTORAGE(log_buf, log_buf_init);
+AST_THREADSTORAGE(log_buf);
#define LOG_BUF_INIT_SIZE 128
static int make_components(char *s, int lineno)
diff --git a/main/manager.c b/main/manager.c
index 98a2b2ad1593b3759ae45a4fca95ccdbe684a7fb..b30506444747afba52949b0d91d4d6b190f45f11 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -101,10 +101,10 @@ struct eventqent *master_eventq = NULL;
* has one event in it (Placeholder) in init_manager().
*/
-AST_THREADSTORAGE(manager_event_buf, manager_event_buf_init);
+AST_THREADSTORAGE(manager_event_buf);
#define MANAGER_EVENT_BUF_INITSIZE 256
-AST_THREADSTORAGE(astman_append_buf, astman_append_buf_init);
+AST_THREADSTORAGE(astman_append_buf);
#define ASTMAN_APPEND_BUF_INITSIZE 256
/*! \brief Descriptor for an AMI session, either a regular one
diff --git a/main/utils.c b/main/utils.c
index ceb049f3a5a18b44de151156683ff80d6999d77a..482bb3eaf17d74014607c3cf6e84a51ff45a83a2 100644
--- a/main/utils.c
+++ b/main/utils.c
@@ -65,7 +65,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
static char base64[64];
static char b2a[256];
-AST_THREADSTORAGE(inet_ntoa_buf, inet_ntoa_buf_init);
+AST_THREADSTORAGE(inet_ntoa_buf);
#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined( __NetBSD__ ) || defined(__APPLE__) || defined(__CYGWIN__)