[asterisk-commits] tilghman: branch tilghman/auto_preload r278131 - in /team/tilghman/auto_prelo...

[SVN commits to the Asterisk project]

Author: tilghman
Date: Tue Jul 20 13:50:21 2010
New Revision: 278131

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=278131
Log:
Timing is really a channel dependency

Modified:
    team/tilghman/auto_preload/include/asterisk/module.h
    team/tilghman/auto_preload/res/res_timing_dahdi.c
    team/tilghman/auto_preload/res/res_timing_kqueue.c
    team/tilghman/auto_preload/res/res_timing_pthread.c
    team/tilghman/auto_preload/res/res_timing_timerfd.c

Modified: team/tilghman/auto_preload/include/asterisk/module.h
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/include/asterisk/module.h?view=diff&rev=278131&r1=278130&r2=278131
==============================================================================
--- team/tilghman/auto_preload/include/asterisk/module.h (original)
+++ team/tilghman/auto_preload/include/asterisk/module.h Tue Jul 20 13:50:21 2010
@@ -194,9 +194,8 @@
 };
 
 enum ast_module_load_priority {
-	AST_MODPRI_TIMING =             10,  /*!< Provides a timing interface */
-	AST_MODPRI_REALTIME_DEPEND =    20,  /*!< Dependency for a realtime driver */
-	AST_MODPRI_REALTIME_DEPEND2 =   25,  /*!< Second level dependency for a realtime driver (func_curl needs res_curl, but is needed by res_config_curl) */
+	AST_MODPRI_REALTIME_DEPEND =    10,  /*!< Dependency for a realtime driver */
+	AST_MODPRI_REALTIME_DEPEND2 =   20,  /*!< Second level dependency for a realtime driver (func_curl needs res_curl, but is needed by res_config_curl) */
 	AST_MODPRI_REALTIME_DRIVER =    30,  /*!< A realtime driver, which provides configuration services for other modules */
 	AST_MODPRI_CHANNEL_DEPEND =     50,  /*!< Channel driver dependency (may depend upon realtime, e.g. MOH) */
 	AST_MODPRI_CHANNEL_DRIVER =     60,  /*!< Channel drivers (provide devicestate) */

Modified: team/tilghman/auto_preload/res/res_timing_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/res/res_timing_dahdi.c?view=diff&rev=278131&r1=278130&r2=278131
==============================================================================
--- team/tilghman/auto_preload/res/res_timing_dahdi.c (original)
+++ team/tilghman/auto_preload/res/res_timing_dahdi.c Tue Jul 20 13:50:21 2010
@@ -202,5 +202,5 @@
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "DAHDI Timing Interface",
 		.load = load_module,
 		.unload = unload_module,
-		.load_pri = 10,
+		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
 		);

Modified: team/tilghman/auto_preload/res/res_timing_kqueue.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/res/res_timing_kqueue.c?view=diff&rev=278131&r1=278130&r2=278131
==============================================================================
--- team/tilghman/auto_preload/res/res_timing_kqueue.c (original)
+++ team/tilghman/auto_preload/res/res_timing_kqueue.c Tue Jul 20 13:50:21 2010
@@ -390,5 +390,5 @@
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "KQueue Timing Interface",
 		.load = load_module,
 		.unload = unload_module,
-		.load_pri = 10,
+		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
 		);

Modified: team/tilghman/auto_preload/res/res_timing_pthread.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/res/res_timing_pthread.c?view=diff&rev=278131&r1=278130&r2=278131
==============================================================================
--- team/tilghman/auto_preload/res/res_timing_pthread.c (original)
+++ team/tilghman/auto_preload/res/res_timing_pthread.c Tue Jul 20 13:50:21 2010
@@ -524,5 +524,5 @@
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "pthread Timing Interface",
 		.load = load_module,
 		.unload = unload_module,
-		.load_pri = 10,
+		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
 		);

Modified: team/tilghman/auto_preload/res/res_timing_timerfd.c
URL: http://svnview.digium.com/svn/asterisk/team/tilghman/auto_preload/res/res_timing_timerfd.c?view=diff&rev=278131&r1=278130&r2=278131
==============================================================================
--- team/tilghman/auto_preload/res/res_timing_timerfd.c (original)
+++ team/tilghman/auto_preload/res/res_timing_timerfd.c Tue Jul 20 13:50:21 2010
@@ -299,5 +299,5 @@
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Timerfd Timing Interface",
 		.load = load_module,
 		.unload = unload_module,
-		.load_pri = 10,
+		.load_pri = AST_MODPRI_CHANNEL_DEPEND,
 		);