Resolve conflict and reset automerge.

git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@377980 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2012-12-13 16:39:40 +00:00
parent 7b5f4748fb
commit ece4c95798
10 changed files with 936 additions and 1031 deletions

View File

@@ -224,10 +224,15 @@ static const struct ast_taskprocessor_listener_callbacks default_listener_callba
.destroy = default_listener_destroy,
};
/*! \internal \brief Clean up resources on Asterisk shutdown */
/*!
* \internal
* \brief Clean up resources on Asterisk shutdown
*/
static void tps_shutdown(void)
{
ast_cli_unregister_multiple(taskprocessor_clis, ARRAY_LEN(taskprocessor_clis));
ao2_t_ref(tps_singletons, -1, "Unref tps_singletons in shutdown");
tps_singletons = NULL;
}
/* initialize the taskprocessor container and register CLI operations */