mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-03 11:25:35 +00:00
This commits the performance mods that give the priority processing engine in the pbx, a 25-30% speed boost. The two updates used, are, first, to merge the ast_exists_extension() and the ast_spawn_extension() where they are called sequentially in a loop in the code, into a slightly upgraded version of ast_spawn_extension(), with a few extra args; and, second, I modified the substitute_variables_helper_full, so it zeroes out the byte after the evaluated string instead of demanding you pre-zero the buffer; I also went thru the code and removed the code that zeroed this buffer before every call to the substitute_variables_helper_full. The first fix provides about a 9% speedup, and the second the rest. These figures come from the 'PIPS' benchmark I describe in blogs, conf. reports, etc.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88166 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -1390,7 +1390,6 @@ static int pbx_load_config(const char *config_file)
|
||||
ast_copy_string(userscontext, "default", sizeof(userscontext));
|
||||
|
||||
for (v = ast_variable_browse(cfg, "globals"); v; v = v->next) {
|
||||
memset(realvalue, 0, sizeof(realvalue));
|
||||
pbx_substitute_variables_helper(NULL, v->value, realvalue, sizeof(realvalue) - 1);
|
||||
pbx_builtin_setvar_helper(NULL, v->name, realvalue);
|
||||
}
|
||||
@@ -1487,20 +1486,17 @@ static int pbx_load_config(const char *config_file)
|
||||
free(tc);
|
||||
}
|
||||
} else if (!strcasecmp(v->name, "include")) {
|
||||
memset(realvalue, 0, sizeof(realvalue));
|
||||
pbx_substitute_variables_helper(NULL, v->value, realvalue, sizeof(realvalue) - 1);
|
||||
if (ast_context_add_include2(con, realvalue, registrar))
|
||||
ast_log(LOG_WARNING, "Unable to include context '%s' in context '%s'\n", v->value, cxt);
|
||||
} else if (!strcasecmp(v->name, "ignorepat")) {
|
||||
memset(realvalue, 0, sizeof(realvalue));
|
||||
pbx_substitute_variables_helper(NULL, v->value, realvalue, sizeof(realvalue) - 1);
|
||||
if (ast_context_add_ignorepat2(con, realvalue, registrar))
|
||||
ast_log(LOG_WARNING, "Unable to include ignorepat '%s' in context '%s'\n", v->value, cxt);
|
||||
} else if (!strcasecmp(v->name, "switch") || !strcasecmp(v->name, "lswitch") || !strcasecmp(v->name, "eswitch")) {
|
||||
char *stringp = realvalue;
|
||||
char *appl, *data;
|
||||
|
||||
memset(realvalue, 0, sizeof(realvalue));
|
||||
|
||||
if (!strcasecmp(v->name, "switch"))
|
||||
pbx_substitute_variables_helper(NULL, v->value, realvalue, sizeof(realvalue) - 1);
|
||||
else
|
||||
|
Reference in New Issue
Block a user