diff options
author | Corey Farrell <git@cfware.com> | 2015-03-26 22:24:26 +0000 |
---|---|---|
committer | Corey Farrell <git@cfware.com> | 2015-03-26 22:24:26 +0000 |
commit | 3ddd92902af9eaa3018f7e25e430afcfe4322845 (patch) | |
tree | 1ab68bf8be8af553138e4b6019bd74f87f5f48c5 /main/stasis.c | |
parent | d7fc85e69d5dc23f27ec15dacaa03914ece64e42 (diff) |
Replace most uses of ast_register_atexit with ast_register_cleanup.
Since 'core stop now' and 'core restart now' do not stop modules,
it is unsafe for most of the core to run cleanups. Originally all
cleanups used ast_register_atexit, and were only changed when it
was shown to be unsafe. ast_register_atexit is now used only when
absolutely required to prevent corruption and close child processes.
Exceptions that need to use ast_register_atexit:
* CDR: Flush records.
* res_musiconhold: Kill external applications.
* AstDB: Close the DB.
* canary_exit: Kill canary process.
ASTERISK-24142 #close
Reported by: David Brillert
ASTERISK-24683 #close
Reported by: Peter Katzmann
ASTERISK-24805 #close
Reported by: Badalian Vyacheslav
ASTERISK-24881 #close
Reported by: Corey Farrell
Review: https://reviewboard.asterisk.org/r/4500/
Review: https://reviewboard.asterisk.org/r/4501/
........
Merged revisions 433495 from http://svn.asterisk.org/svn/asterisk/branches/11
........
Merged revisions 433497 from http://svn.asterisk.org/svn/asterisk/branches/13
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@433498 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/stasis.c')
-rw-r--r-- | main/stasis.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/main/stasis.c b/main/stasis.c index dbb6e4c12..c2d552e4b 100644 --- a/main/stasis.c +++ b/main/stasis.c @@ -1533,16 +1533,11 @@ STASIS_MESSAGE_TYPE_DEFN(ast_multi_user_event_type, /*! @} */ -/*! \brief Shutdown function */ -static void stasis_exit(void) -{ - ast_threadpool_shutdown(pool); - pool = NULL; -} - /*! \brief Cleanup function for graceful shutdowns */ static void stasis_cleanup(void) { + ast_threadpool_shutdown(pool); + pool = NULL; STASIS_MESSAGE_TYPE_CLEANUP(stasis_subscription_change_type); STASIS_MESSAGE_TYPE_CLEANUP(ast_multi_user_event_type); aco_info_destroy(&cfg_info); @@ -1557,7 +1552,6 @@ int stasis_init(void) /* Be sure the types are cleaned up after the message bus */ ast_register_cleanup(stasis_cleanup); - ast_register_atexit(stasis_exit); if (aco_info_init(&cfg_info)) { return -1; |