diff options
| author | Corey Farrell <git@cfware.com> | 2015-02-11 15:51:33 +0000 |
|---|---|---|
| committer | Corey Farrell <git@cfware.com> | 2015-02-11 15:51:33 +0000 |
| commit | 2531f750576542037e93f4c4e087f9dbced1897d (patch) | |
| tree | 2a97bf142cabc28c23cf3257ecd45908004fe3f3 /bridges | |
| parent | 4d8ab20a8abac76c680a40605bb6e6e8e675afde (diff) | |
Enable REF_DEBUG for ast_module_ref / ast_module_unref.
Add ast_module_shutdown_ref for use by modules that can
only be unloaded during graceful shutdown.
When REF_DEBUG is enabled:
* Add an empty ao2 object to struct ast_module.
* Allocate ao2 object when the module is loaded.
* Perform an ao2_ref in each place where mod->usecount is manipulated.
* ao2_cleanup on module unload.
ASTERISK-24479 #close
Reported by: Corey Farrell
Review: https://reviewboard.asterisk.org/r/4141/
........
Merged revisions 431662 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/13@431663 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/bridge_builtin_features.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bridges/bridge_builtin_features.c b/bridges/bridge_builtin_features.c index 8ba9a693d..d09a7a2ec 100644 --- a/bridges/bridge_builtin_features.c +++ b/bridges/bridge_builtin_features.c @@ -499,6 +499,10 @@ static int feature_hangup(struct ast_bridge_channel *bridge_channel, void *hook_ static int unload_module(void) { + ast_bridge_features_unregister(AST_BRIDGE_BUILTIN_HANGUP); + ast_bridge_features_unregister(AST_BRIDGE_BUILTIN_AUTOMON); + ast_bridge_features_unregister(AST_BRIDGE_BUILTIN_AUTOMIXMON); + return 0; } @@ -508,8 +512,8 @@ static int load_module(void) ast_bridge_features_register(AST_BRIDGE_BUILTIN_AUTOMON, feature_automonitor, NULL); ast_bridge_features_register(AST_BRIDGE_BUILTIN_AUTOMIXMON, feature_automixmonitor, NULL); - /* Bump up our reference count so we can't be unloaded */ - ast_module_ref(ast_module_info->self); + /* This module cannot be unloaded until shutdown */ + ast_module_shutdown_ref(ast_module_info->self); return AST_MODULE_LOAD_SUCCESS; } |