kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-04 20:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 67308 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r67308 | russell | 2007-06-05 10:51:53 -0500 (Tue, 05 Jun 2007) | 5 lines

When shutting down "gracefully", go through and run the unload() callbacks for
all of the modules.  "stop now" is considered a non-graceful shutdown and will
not go through this process.
(issue #9804, reported by chrisost, patch by me)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@67310 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-06-05 15:54:36 +00:00
parent 72cd0474f6
commit 508d36f5ad
3 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/asterisk/module.h
View File

@@ -141,6 +141,13 @@ int ast_loader_register(int (*updater)(void));
*/
int ast_loader_unregister(int (*updater)(void));
/*!
* \brief Run the unload() callback for all loaded modules
*
* This function should be called when Asterisk is shutting down gracefully.
*/
void ast_module_shutdown(void);
/*!
* \brief Match modules names for the Asterisk cli.
* \param line Unused by this function, but this should be the line we are

4
main/asterisk.c
View File

@@ -126,6 +126,7 @@ int daemon(int, int); /* defined in libresolv of all places */
#include "asterisk/version.h"
#include "asterisk/linkedlists.h"
#include "asterisk/devicestate.h"
#include "asterisk/module.h"
#include "asterisk/doxyref.h" /* Doxygen documentation */
@@ -1244,6 +1245,9 @@ static void quit_handler(int num, int nice, int safeshutdown, int restart)
ast_verbose("Asterisk %s cancelled.\n", restart ? "restart" : "shutdown");
return;
}
if (nice)
ast_module_shutdown();
}
if (ast_opt_console || ast_opt_remote) {
if (getenv("HOME"))

25
main/loader.c
View File

@@ -428,6 +428,31 @@ static struct ast_module *load_dynamic_module(const char *resource_in, unsigned
}
#endif
void ast_module_shutdown(void)
{
struct ast_module *mod;
AST_LIST_HEAD_NOLOCK_STATIC(local_module_list, ast_module);
/* We have to call the unload() callbacks in reverse order that the modules
* exist in the module list so it is the reverse order of how they were
* loaded. */
AST_LIST_LOCK(&module_list);
while ((mod = AST_LIST_REMOVE_HEAD(&module_list, entry)))
AST_LIST_INSERT_HEAD(&local_module_list, mod, entry);
AST_LIST_UNLOCK(&module_list);
while ((mod = AST_LIST_REMOVE_HEAD(&local_module_list, entry))) {
if (mod->info->unload)
mod->info->unload();
/* Since this should only be called when shutting down "gracefully",
* all channels should be down before we get to this point, meaning
* there will be no module users left. */
AST_LIST_HEAD_DESTROY(&mod->users);
free(mod);
}
}
int ast_unload_resource(const char *resource_name, enum ast_module_unload_mode force)
{
struct ast_module *mod;