diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-20 19:35:02 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-07-20 19:35:02 +0000 |
| commit | 771cdeecd161c957e978308048906c8ac3508717 (patch) | |
| tree | 14b50e57a2595242548184d532cbeeedf416020a /main | |
| parent | a551cc79ac0419a2118ed04f54d3204e8315987c (diff) | |
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
Diffstat (limited to 'main')
| -rw-r--r-- | main/asterisk.c | 2 | ||||
| -rw-r--r-- | main/config.c | 4 | ||||
| -rw-r--r-- | main/loader.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/main/asterisk.c b/main/asterisk.c index 0fd171169..e82223d58 100644 --- a/main/asterisk.c +++ b/main/asterisk.c @@ -2826,7 +2826,7 @@ static void ast_readconfig(void) struct ast_variable *v; char *config = DEFAULT_CONFIG_FILE; char hostname[MAXHOSTNAMELEN] = ""; - struct ast_flags config_flags = { 0 }; + struct ast_flags config_flags = { CONFIG_FLAG_NOREALTIME }; struct { unsigned int dbdir:1; unsigned int keydir:1; diff --git a/main/config.c b/main/config.c index f65c69e53..1ed46b77c 100644 --- a/main/config.c +++ b/main/config.c @@ -1896,7 +1896,7 @@ int read_config_maps(void) struct ast_config *config, *configtmp; struct ast_variable *v; char *driver, *table, *database, *stringp, *tmp; - struct ast_flags flags = { 0 }; + struct ast_flags flags = { CONFIG_FLAG_NOREALTIME }; clear_config_maps(); @@ -2060,7 +2060,7 @@ struct ast_config *ast_config_internal_load(const char *filename, struct ast_con cfg->include_level++; - if (strcmp(filename, extconfig_conf) && strcmp(filename, "asterisk.conf") && config_engine_list) { + if (!ast_test_flag(&flags, CONFIG_FLAG_NOREALTIME) && config_engine_list) { struct ast_config_engine *eng; eng = find_engine(filename, db, sizeof(db), table, sizeof(table)); diff --git a/main/loader.c b/main/loader.c index 0249af9d8..17bb1f821 100644 --- a/main/loader.c +++ b/main/loader.c @@ -899,9 +899,9 @@ static int mod_load_cmp(void *a, void *b) struct ast_module *a_mod = (struct ast_module *) a; struct ast_module *b_mod = (struct ast_module *) b; int res = -1; - /* if load_pri is not set, default is 255. Lower is better*/ - unsigned char a_pri = ast_test_flag(a_mod->info, AST_MODFLAG_LOAD_ORDER) ? a_mod->info->load_pri : 255; - unsigned char b_pri = ast_test_flag(b_mod->info, AST_MODFLAG_LOAD_ORDER) ? b_mod->info->load_pri : 255; + /* if load_pri is not set, default is 128. Lower is better*/ + unsigned char a_pri = ast_test_flag(a_mod->info, AST_MODFLAG_LOAD_ORDER) ? a_mod->info->load_pri : 128; + unsigned char b_pri = ast_test_flag(b_mod->info, AST_MODFLAG_LOAD_ORDER) ? b_mod->info->load_pri : 128; if (a_pri == b_pri) { res = 0; } else if (a_pri < b_pri) { |