diff options
| author | Mark Michelson <mmichelson@digium.com> | 2012-12-13 16:39:40 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2012-12-13 16:39:40 +0000 |
| commit | ece4c957988c3926f679f805294072c31de59bda (patch) | |
| tree | 18addab5cab2b5c8c7b1f120bf78c7114735ea63 /main/taskprocessor.c | |
| parent | 7b5f4748fb368d81d588ae61a54d7a37c2f906ee (diff) | |
Resolve conflict and reset automerge.
git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@377980 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/taskprocessor.c')
| -rw-r--r-- | main/taskprocessor.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/main/taskprocessor.c b/main/taskprocessor.c index a1e54a3b4..3ba544292 100644 --- a/main/taskprocessor.c +++ b/main/taskprocessor.c @@ -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 */ |