diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-05 15:54:36 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-06-05 15:54:36 +0000 |
commit | 3e6e0efc4fbd96edef25ef77fa724a30315f9342 (patch) | |
tree | 299f09a143a0dc32fe4717f35700fca9c04113df /main | |
parent | 838b92749ff4672195e8fad549405b7812513a08 (diff) |
Merged revisions 67308 via svnmerge from
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: http://svn.digium.com/svn/asterisk/trunk@67310 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r-- | main/asterisk.c | 4 | ||||
-rw-r--r-- | main/loader.c | 25 |
2 files changed, 29 insertions, 0 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index efb6403d9..18a121339 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -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")) diff --git a/main/loader.c b/main/loader.c index 53b557f11..c1b7597c9 100644 --- a/main/loader.c +++ b/main/loader.c @@ -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; |