Add load priority order, such that preload becomes unnecessary in most cases

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

15 files changed, 42 insertions, 15 deletions

diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index c12900582..b8e142d04 100644
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -2479,8 +2479,9 @@ static int unload_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Agent Proxy Channel",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Agent Proxy Channel",
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
+		.load_pri = AST_MODPRI_CHANNEL_DRIVER,
 	       );
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c
index 3f8d26d5a..120987ae4 100644
--- a/channels/chan_alsa.c
+++ b/channels/chan_alsa.c
@@ -1009,4 +1009,8 @@ static int unload_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "ALSA Console Channel Driver");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "ALSA Console Channel Driver",
+		.load = load_module,
+		.unload = unload_module,
+		.load_pri = AST_MODPRI_CHANNEL_DRIVER,
+	);
diff --git a/channels/chan_bridge.c b/channels/chan_bridge.c
index db2646654..8218bdceb 100644
--- a/channels/chan_bridge.c
+++ b/channels/chan_bridge.c
@@ -242,4 +242,8 @@ static int unload_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Bridge Interaction Channel");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Bridge Interaction Channel",
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_CHANNEL_DRIVER,
+);
diff --git a/channels/chan_console.c b/channels/chan_console.c
index 99b673b6c..13f1bba8f 100644
--- a/channels/chan_console.c
+++ b/channels/chan_console.c
@@ -1521,8 +1521,9 @@ static int reload(void)
 	return load_config(1);
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Console Channel Driver",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Console Channel Driver",
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
+		.load_pri = AST_MODPRI_CHANNEL_DRIVER,
 );
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 333da603c..be237eaf1 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -17858,8 +17858,9 @@ static int reload(void)
  * AST_MODULE_INFO(, , "DAHDI Telephony"
  */
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, tdesc,
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, tdesc,
 	.load = load_module,
 	.unload = unload_module,
 	.reload = reload,
+	.load_pri = AST_MODPRI_CHANNEL_DRIVER,
 	);
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index 4101d52f9..47eed7e08 100644
--- a/channels/chan_gtalk.c
+++ b/channels/chan_gtalk.c
@@ -2154,8 +2154,9 @@ static int unload_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Gtalk Channel Driver",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Gtalk Channel Driver",
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
+		.load_pri = AST_MODPRI_CHANNEL_DRIVER,
 	       );
diff --git a/channels/chan_h323.c b/channels/chan_h323.c
index 2907b3fcd..2362d9a49 100644
--- a/channels/chan_h323.c
+++ b/channels/chan_h323.c
@@ -3433,8 +3433,9 @@ static int unload_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "The NuFone Network's OpenH323 Channel Driver",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "The NuFone Network's OpenH323 Channel Driver",
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
+		.load_pri = AST_MODPRI_CHANNEL_DRIVER,
 );
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 92f070be2..ad7033bcc 100644
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -14534,8 +14534,9 @@ static int load_module(void)
 	return AST_MODULE_LOAD_SUCCESS;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Inter Asterisk eXchange (Ver 2)",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Inter Asterisk eXchange (Ver 2)",
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
+		.load_pri = AST_MODPRI_CHANNEL_DRIVER,
 		);
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c
index bdf01203b..25b4d7e45 100644
--- a/channels/chan_jingle.c
+++ b/channels/chan_jingle.c
@@ -1966,8 +1966,9 @@ static int unload_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Jingle Channel Driver",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Jingle Channel Driver",
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
+		.load_pri = AST_MODPRI_CHANNEL_DRIVER,
 	       );
diff --git a/channels/chan_local.c b/channels/chan_local.c
index 20db5d04a..95adfcab7 100644
--- a/channels/chan_local.c
+++ b/channels/chan_local.c
@@ -1031,4 +1031,8 @@ static int unload_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Local Proxy Channel (Note: used internally by other modules)");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Local Proxy Channel (Note: used internally by other modules)",
+		.load = load_module,
+		.unload = unload_module,
+		.load_pri = AST_MODPRI_CHANNEL_DRIVER,
+	);
diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index 2f4aa4aea..485b39aad 100644
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -4910,8 +4910,9 @@ static int unload_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Media Gateway Control Protocol (MGCP)",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Media Gateway Control Protocol (MGCP)",
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
+		.load_pri = AST_MODPRI_CHANNEL_DRIVER,
 	       );
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c
index 302c8541c..8b31ed23a 100644
--- a/channels/chan_misdn.c
+++ b/channels/chan_misdn.c
@@ -12372,8 +12372,9 @@ static void chan_misdn_log(int level, int port, char *tmpl, ...)
 	}
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Channel driver for mISDN Support (BRI/PRI)",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Channel driver for mISDN Support (BRI/PRI)",
 	.load = load_module,
 	.unload = unload_module,
 	.reload = reload,
+	.load_pri = AST_MODPRI_CHANNEL_DRIVER,
 );
diff --git a/channels/chan_multicast_rtp.c b/channels/chan_multicast_rtp.c
index f385d4467..e3414d2f3 100644
--- a/channels/chan_multicast_rtp.c
+++ b/channels/chan_multicast_rtp.c
@@ -184,4 +184,8 @@ static int unload_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Multicast RTP Paging Channel");
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Multicast RTP Paging Channel",
+	.load = load_module,
+	.unload = unload_module,
+	.load_pri = AST_MODPRI_CHANNEL_DRIVER,
+);
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 7970cbc33..e2db51a3b 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -28505,8 +28505,9 @@ static int unload_module(void)
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Session Initiation Protocol (SIP)",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Session Initiation Protocol (SIP)",
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
+		.load_pri = AST_MODPRI_CHANNEL_DRIVER,
 	       );
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c
index 6d4968a7b..4edbc4ab9 100644
--- a/channels/chan_skinny.c
+++ b/channels/chan_skinny.c
@@ -7488,8 +7488,9 @@ static int reload(void)
 	return 0;
 }
 
-AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Skinny Client Control Protocol (Skinny)",
+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Skinny Client Control Protocol (Skinny)",
 		.load = load_module,
 		.unload = unload_module,
 		.reload = reload,
+		.load_pri = AST_MODPRI_CHANNEL_DRIVER,
 );