loader: Flag module as declined in all cases where it fails to load.

This has no effect on startup since AST_MODULE_LOAD_FAILURE aborts
startup, but it's possible for this code to be returned on manual load
of a module after startup.

It is an error for a module to not have a load callback but this is not
a fatal system error.  In this case flag the module as declined, return
AST_MODULE_LOAD_FAILURE only if a required module is broken.

Expand doxygen documentation for AST_MODULE_LOAD_*.

Change-Id: I3c030bb917f6e5a0dfd9d91491a4661b348cabf8

diff --git a/include/asterisk/module.h b/include/asterisk/module.h
index 08b4c4317ce7e95bb2055067700dabe15f1f4ac8..2720d0e04a79d94e248d3af7ac6c90d517f00283 100644 (file)
--- a/include/asterisk/module.h
+++ b/include/asterisk/module.h
@@ -66,11 +66,40 @@ enum ast_module_unload_mode {
 };
 
 enum ast_module_load_result {
-       AST_MODULE_LOAD_SUCCESS = 0,    /*!< Module loaded and configured */
-       AST_MODULE_LOAD_DECLINE = 1,    /*!< Module is not configured */
-       AST_MODULE_LOAD_SKIP = 2,       /*!< Module was skipped for some reason (For loader.c use only. Should never be returned by modules)*/
-       AST_MODULE_LOAD_PRIORITY = 3,   /*!< Module is not loaded yet, but is added to priority list */
-       AST_MODULE_LOAD_FAILURE = -1,   /*!< Module could not be loaded properly */
+       /*! Module is loaded and configured. */
+       AST_MODULE_LOAD_SUCCESS = 0,
+       /*!
+        * \brief Module has failed to load, may be in an inconsistent state.
+        *
+        * This value is used when a module fails to start but does not risk
+        * system-wide stability.  Declined modules will prevent any other
+        * dependent module from starting.
+        */
+       AST_MODULE_LOAD_DECLINE = 1,
+       /*! \internal
+        * \brief Module was skipped for some reason.
+        *
+        * \note For loader.c use only. Should never be returned by modules.
+        */
+       AST_MODULE_LOAD_SKIP = 2,
+       /*! \internal
+        * \brief Module is not loaded yet, but is added to priority list.
+        *
+        * \note For loader.c use only. Should never be returned by modules.
+        */
+       AST_MODULE_LOAD_PRIORITY = 3,
+       /*!
+        * \brief Module could not be loaded properly.
+        *
+        * This return should only be returned by modules for unrecoverable
+        * failures that cause the whole system to become unstable.  In almost
+        * all cases \ref AST_MODULE_LOAD_DECLINE should be used instead.
+        *
+        * \warning Returning this code from any module will cause startup to abort.
+        * If startup is already completed this code has the same effect as
+        * \ref AST_MODULE_LOAD_DECLINE.
+        */
+       AST_MODULE_LOAD_FAILURE = -1,
 };
 
 /*!

diff --git a/main/loader.c b/main/loader.c
index 865346f609679f9ee395a01e8819577701d999e9..3749c9599359b75be2b3dcdbbc554db0d94765f1 100644 (file)
--- a/main/loader.c
+++ b/main/loader.c
@@ -1545,7 +1545,9 @@ static enum ast_module_load_result start_resource(struct ast_module *mod)
        }
 
        if (!mod->info->load) {
-               return AST_MODULE_LOAD_FAILURE;
+               mod->flags.declined = 1;
+
+               return mod->flags.required ? AST_MODULE_LOAD_FAILURE : AST_MODULE_LOAD_DECLINE;
        }
 
        if (module_deps_reference(mod, NULL)) {
@@ -1593,6 +1595,8 @@ static enum ast_module_load_result start_resource(struct ast_module *mod)
                }
                break;
        case AST_MODULE_LOAD_FAILURE:
+               mod->flags.declined = 1;
+               break;
        case AST_MODULE_LOAD_SKIP: /* modules should never return this value */
        case AST_MODULE_LOAD_PRIORITY:
                break;