This rather large commit changes the way modules are loaded.

 
As partly documented in loader.c and include/asterisk/module.h,
modules are now expected to return all of their methods and flags
into a structure 'mod_data', and are normally loaded with RTLD_NOW
| RTLD_LOCAL, so symbols are resolved immediately and conflicts
should be less likely.  Only in a small number of cases (res_*,
typically) modules are loaded RTLD_GLOBAL, so they can export
symbols.
 
The core of the change is only the two files loader.c and
include/asterisk/module.h, all the rest is simply adaptation of the
existing modules to the new API, a rather mechanical (but believe
me, time and finger-consuming!) process whose detail you can figure
out by svn diff'ing any single module.

Expect some minor compilation issue after this change, please
report it on mantis http://bugs.digium.com/view.php?id=6968
so we collect all the feedback in one place.

I am just sorry that this change missed SVN version number 20000!



git-svn-id: http://svn.digium.com/svn/asterisk/trunk@20003 f38db490-d61c-443f-a65b-d21fe96a405b

6 files changed, 46 insertions, 77 deletions

diff --git a/pbx/pbx_ael.c b/pbx/pbx_ael.c
index d6617d5b8..e16b7f694 100644
--- a/pbx/pbx_ael.c
+++ b/pbx/pbx_ael.c
@@ -71,7 +71,6 @@ static void FREE(void *ptr)
 
 static int aeldebug = 0;
 
-static char *dtext = "Asterisk Extension Language Compiler";
 static char *config = "extensions.ael";
 static char *registrar = "pbx_ael";
 
@@ -1248,7 +1247,7 @@ static struct ast_cli_entry  ael_cli[] = {
 /*
  * Standard module functions ...
  */
-int unload_module(void)
+static int unload_module(void *mod)
 {
 	ast_context_destroy(NULL, registrar);
 	ast_cli_unregister_multiple(ael_cli, sizeof(ael_cli)/ sizeof(ael_cli[0]));
@@ -1256,29 +1255,26 @@ int unload_module(void)
 }
 
 
-int load_module(void)
+static int load_module(void *mod)
 {
 	ast_cli_register_multiple(ael_cli, sizeof(ael_cli)/ sizeof(ael_cli[0]));
 	return (pbx_load_module());
 }
 
-int reload(void)
+static int reload(void *mod)
 {
 	ast_context_destroy(NULL, registrar);
 	return pbx_load_module();
 }
 
-int usecount(void)
+static const char *description(void)
 {
-	return 0;
+	return "Asterisk Extension Language Compiler";
 }
 
-const char *description(void)
-{
-	return dtext;
-}
-
-const char *key(void)
+static const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
+
+STD_MOD(MOD_1 | NO_USECOUNT, reload, NULL, NULL);
diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index 21316deb0..2fc9fcd63 100644
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -30,8 +30,6 @@
 #include <ctype.h>
 #include <errno.h>
 
-#define STATIC_MODULE
-
 #include "asterisk.h"
 
 ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
@@ -53,7 +51,6 @@ static void FREE(void *ptr)
 #define FREE free
 #endif
 
-static char *dtext = "Text Extension Configuration";
 static char *config = "extensions.conf";
 static char *registrar = "pbx_config";
 
@@ -1326,7 +1323,7 @@ static struct ast_cli_entry reload_extensions_cli =
 /*!
  * Standard module functions ...
  */
-STATIC_MODULE int unload_module(void)
+static int unload_module(void *mod)
 {
 	ast_cli_unregister(&context_add_extension_cli);
 	if (static_config && !write_protect_config)
@@ -1515,7 +1512,7 @@ static int pbx_load_module(void)
 	return 0;
 }
 
-STATIC_MODULE int load_module(void)
+static int load_module(void *mod)
 {
 	if (pbx_load_module())
 		return -1;
@@ -1533,7 +1530,7 @@ STATIC_MODULE int load_module(void)
 	return 0;
 }
 
-STATIC_MODULE int reload(void)
+static int reload(void *mod)
 {
 	if (clearglobalvars_config)
 		pbx_builtin_clear_globals();
@@ -1541,19 +1538,15 @@ STATIC_MODULE int reload(void)
 	return 0;
 }
 
-STATIC_MODULE int usecount(void)
-{
-	return 0;
-}
-
-STATIC_MODULE const char *description(void)
+static const char *description(void)
 {
-	return dtext;
+	return "Text Extension Configuration";
 }
 
-STATIC_MODULE const char *key(void)
+static const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
 
-STD_MOD(MOD_1, reload, NULL, NULL);
+/* XXX really no usecount ? */
+STD_MOD(MOD_1 | NO_USECOUNT, reload, NULL, NULL);
diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index 9e30b8654..88fa3d7d1 100644
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -77,7 +77,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 extern char ast_config_AST_KEY_DIR[];
 
-static char *tdesc = "Distributed Universal Number Discovery (DUNDi)";
 
 #define DUNDI_MODEL_INBOUND		(1 << 0)
 #define DUNDI_MODEL_OUTBOUND	(1 << 1)
@@ -4603,7 +4602,7 @@ static int set_config(char *config_file, struct sockaddr_in* sin)
 	return 0;
 }
 
-int unload_module(void)
+static int unload_module(void *mod)
 {
 	STANDARD_HANGUP_LOCALUSERS;
 
@@ -4629,19 +4628,20 @@ int unload_module(void)
 	return 0;
 }
 
-int reload(void)
+static int reload(void *mod)
 {
 	struct sockaddr_in sin;
 	set_config("dundi.conf",&sin);
 	return 0;
 }
 
-int load_module(void)
+static int load_module(void *mod)
 {
 	int res = 0;
 	struct sockaddr_in sin;
 	char iabuf[INET_ADDRSTRLEN];
-	
+
+	__mod_desc = mod;
 	dundi_set_output(dundi_debug_output);
 	dundi_set_error(dundi_error_output);
 	
@@ -4709,21 +4709,14 @@ int load_module(void)
 	return res;
 }
 
-const char *description(void)
+static const char *description(void)
 {
-	return tdesc;
+	return "Distributed Universal Number Discovery (DUNDi)";
 }
 
-int usecount(void)
-{
-	int res;
-	/* XXX DUNDi cannot be unloaded XXX */
-	return 1;
-	STANDARD_USECOUNT(res);
-	return res;
-}
-
-const char *key()
+static const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
+
+STD_MOD(MOD_1 | NO_USECOUNT | NO_UNLOAD, reload, NULL, NULL);
diff --git a/pbx/pbx_loopback.c b/pbx/pbx_loopback.c
index cadd73a14..a88f20e9f 100644
--- a/pbx/pbx_loopback.c
+++ b/pbx/pbx_loopback.c
@@ -52,7 +52,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/crypto.h"
 #include "asterisk/astdb.h"
 
-static char *tdesc = "Loopback Switch";
 
 /* Loopback switch substitutes ${EXTEN}, ${CONTEXT}, and ${PRIORITY} into
    the data passed to it to try to get a string of the form:
@@ -169,30 +168,27 @@ static struct ast_switch loopback_switch =
         matchmore:              loopback_matchmore,
 };
 
-const char *description(void)
+static const char *description(void)
 {
-	return tdesc;
+	return "Loopback Switch";
 }
 
-int usecount(void)
-{
-	return 1;
-}
-
-const char *key()
+static const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
 
-int unload_module(void)
+static int unload_module(void *mod)
 {
 	ast_unregister_switch(&loopback_switch);
 	return 0;
 }
 
-int load_module(void)
+static int load_module(void *mod)
 {
 	ast_register_switch(&loopback_switch);
 	return 0;
 }
 
+/* XXX really no unload ? */
+STD_MOD(MOD_1 | NO_USECOUNT | NO_UNLOAD, NULL, NULL, NULL);
diff --git a/pbx/pbx_realtime.c b/pbx/pbx_realtime.c
index 04d6fd0bd..1d9e803ed 100644
--- a/pbx/pbx_realtime.c
+++ b/pbx/pbx_realtime.c
@@ -61,7 +61,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #define EXT_DATA_SIZE 256
 
-static char *tdesc = "Realtime Switch";
 
 /* Realtime switch looks up extensions in the supplied realtime table.
 
@@ -246,30 +245,26 @@ static struct ast_switch realtime_switch =
         matchmore:              realtime_matchmore,
 };
 
-const char *description(void)
+static const char *description(void)
 {
-	return tdesc;
+	return "Realtime Switch";
 }
 
-int usecount(void)
-{
-	return 1;
-}
-
-const char *key()
+static const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
 
-int unload_module(void)
+static int unload_module(void *mod)
 {
 	ast_unregister_switch(&realtime_switch);
 	return 0;
 }
 
-int load_module(void)
+static int load_module(void *mod)
 {
 	ast_register_switch(&realtime_switch);
 	return 0;
 }
 
+STD_MOD(MOD_1 | NO_USECOUNT | NO_UNLOAD, NULL, NULL, NULL);
diff --git a/pbx/pbx_spool.c b/pbx/pbx_spool.c
index 122b2e5aa..e7136aa44 100644
--- a/pbx/pbx_spool.c
+++ b/pbx/pbx_spool.c
@@ -53,7 +53,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
  * The spool file contains a header 
  */
 
-static char *tdesc = "Outgoing Spool Support";
 static char qdir[255];
 
 struct outgoing {
@@ -404,12 +403,12 @@ static void *scan_thread(void *unused)
 	return NULL;
 }
 
-int unload_module(void)
+static int unload_module(void *mod)
 {
 	return -1;
 }
 
-int load_module(void)
+static int load_module(void *mod)
 {
 	pthread_t thread;
 	pthread_attr_t attr;
@@ -428,17 +427,14 @@ int load_module(void)
 	return 0;
 }
 
-const char *description(void)
+static const char *description(void)
 {
-	return tdesc;
+	return "Outgoing Spool Support";
 }
 
-int usecount(void)
-{
-	return 1;
-}
-
-const char *key()
+static const char *key(void)
 {
 	return ASTERISK_GPL_KEY;
 }
+
+STD_MOD(MOD_1 | NO_USECOUNT | NO_UNLOAD, NULL, NULL, NULL);