diff options
author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-01 22:26:51 +0000 |
---|---|---|
committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-11-01 22:26:51 +0000 |
commit | 47c8ea00b89b1941c88858209af9be34740d7b4a (patch) | |
tree | 66604362a97aec13e31eae19ea0258e0042b8397 /apps/app_macro.c | |
parent | 93798f79e2a924d37153ea63869ee78786837519 (diff) |
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: http://svn.digium.com/svn/asterisk/trunk@88166 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_macro.c')
-rw-r--r-- | apps/app_macro.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/apps/app_macro.c b/apps/app_macro.c index 32e9d2d21..07284cabc 100644 --- a/apps/app_macro.c +++ b/apps/app_macro.c @@ -271,6 +271,7 @@ static int _macro_exec(struct ast_channel *chan, void *data, int exclusive) while(ast_exists_extension(chan, chan->context, chan->exten, chan->priority, chan->cid.cid_num)) { struct ast_context *c; struct ast_exten *e; + int foundx; runningapp[0] = '\0'; runningdata[0] = '\0'; @@ -299,7 +300,7 @@ static int _macro_exec(struct ast_channel *chan, void *data, int exclusive) /* Reset the macro depth, if it was changed in the last iteration */ pbx_builtin_setvar_helper(chan, "MACRO_DEPTH", depthc); - if ((res = ast_spawn_extension(chan, chan->context, chan->exten, chan->priority, chan->cid.cid_num))) { + if ((res = ast_spawn_extension(chan, chan->context, chan->exten, chan->priority, chan->cid.cid_num, &foundx,1))) { /* Something bad happened, or a hangup has been requested. */ if (((res >= '0') && (res <= '9')) || ((res >= 'A') && (res <= 'F')) || (res == '*') || (res == '#')) { @@ -330,7 +331,7 @@ static int _macro_exec(struct ast_channel *chan, void *data, int exclusive) gosub_level++; ast_debug(1, "Incrementing gosub_level\n"); } else if (!strcasecmp(runningapp, "GOSUBIF")) { - char tmp2[1024] = "", *cond, *app, *app2 = tmp2; + char tmp2[1024], *cond, *app, *app2 = tmp2; pbx_substitute_variables_helper(chan, runningdata, tmp2, sizeof(tmp2) - 1); cond = strsep(&app2, "?"); app = strsep(&app2, ":"); @@ -353,7 +354,7 @@ static int _macro_exec(struct ast_channel *chan, void *data, int exclusive) ast_debug(1, "Decrementing gosub_level\n"); } else if (!strncasecmp(runningapp, "EXEC", 4)) { /* Must evaluate args to find actual app */ - char tmp2[1024] = "", *tmp3 = NULL; + char tmp2[1024], *tmp3 = NULL; pbx_substitute_variables_helper(chan, runningdata, tmp2, sizeof(tmp2) - 1); if (!strcasecmp(runningapp, "EXECIF")) { tmp3 = strchr(tmp2, '|'); |