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

1 files changed, 12 insertions, 5 deletions

diff --git a/res/res_config_pgsql.c b/res/res_config_pgsql.c
index cf3838654..ecdce4dd1 100644
--- a/res/res_config_pgsql.c
+++ b/res/res_config_pgsql.c
@@ -547,7 +547,7 @@ static struct ast_config_engine pgsql_engine = {
 	.update_func = update_pgsql
 };
 
-int load_module(void)
+static int load_module(void *mod)
 {
 	parse_config();
 
@@ -571,7 +571,7 @@ int load_module(void)
 	return 0;
 }
 
-int unload_module(void)
+static int unload_module(void *mod)
 {
 	/* Aquire control before doing anything to the module itself. */
 	ast_mutex_lock(&pgsql_lock);
@@ -594,7 +594,7 @@ int unload_module(void)
 	return 0;
 }
 
-int reload(void)
+static int reload(void *mod)
 {
 	/* Aquire control before doing anything to the module itself. */
 	ast_mutex_lock(&pgsql_lock);
@@ -691,14 +691,15 @@ int parse_config(void)
 	return 1;
 }
 
-const char *description(void)
+static const char *description(void)
 {
 	return "Postgresql RealTime Configuration Driver";
 
 }
 
-int usecount(void)
+static int usecount(void)
 {
+	/* XXX check this... */
 	/* Try and get a lock. If unsuccessful, than that means another thread is using the pgsql object. */
 	if (ast_mutex_trylock(&pgsql_lock)) {
 		ast_log(LOG_DEBUG, "Postgresql RealTime: Module usage count is 1.\n");
@@ -708,11 +709,17 @@ int usecount(void)
 	return 0;
 }
 
+<<<<<<< .mine
+static const char *key(void)
+=======
 const char *key(void)
+>>>>>>> .r19220
 {
 	return ASTERISK_GPL_KEY;
 }
 
+STD_MOD(MOD_0, NULL, NULL, NULL);
+
 static int pgsql_reconnect(const char *database)
 {
 	char my_database[50];