diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-11 21:50:10 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-12-11 21:50:10 +0000 |
| commit | 3bb9acdf179fd50094480102f339bdd4a0bdcda6 (patch) | |
| tree | 2e3b4d8a9aa32a412a762ecd53ab1a4b4fa6ea7c /funcs | |
| parent | 0fac84cc8e70e493d86d06b92b848d4c9d754216 (diff) | |
Merged revisions 163254 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r163254 | russell | 2008-12-11 15:48:08 -0600 (Thu, 11 Dec 2008) | 16 lines
Merged revisions 163253 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r163253 | russell | 2008-12-11 15:46:29 -0600 (Thu, 11 Dec 2008) | 8 lines
Fix some observed slowdowns in dialplan processing.
The change is to remove autoservice usage from dialplan functions that do not
need it because they do not perform operations that potentially block.
(closes issue #13940)
Reported by: tbelder
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@163256 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs')
| -rw-r--r-- | funcs/func_cut.c | 6 | ||||
| -rw-r--r-- | funcs/func_strings.c | 16 |
2 files changed, 0 insertions, 22 deletions
diff --git a/funcs/func_cut.c b/funcs/func_cut.c index 96779b661..231729ddf 100644 --- a/funcs/func_cut.c +++ b/funcs/func_cut.c @@ -227,9 +227,6 @@ static int acf_cut_exec(struct ast_channel *chan, const char *cmd, char *data, c { int ret = -1; - if (chan) - ast_autoservice_start(chan); - switch (cut_internal(chan, data, buf, len)) { case ERROR_NOARG: ast_log(LOG_ERROR, "Syntax: CUT(<varname>,<char-delim>,<range-spec>) - missing argument!\n"); @@ -247,9 +244,6 @@ static int acf_cut_exec(struct ast_channel *chan, const char *cmd, char *data, c ast_log(LOG_ERROR, "Unknown internal error\n"); } - if (chan) - ast_autoservice_stop(chan); - return ret; } diff --git a/funcs/func_strings.c b/funcs/func_strings.c index 39dd86666..e520cc7d6 100644 --- a/funcs/func_strings.c +++ b/funcs/func_strings.c @@ -51,9 +51,6 @@ static int function_fieldqty(struct ast_channel *chan, const char *cmd, char delim[2] = ""; size_t delim_used; - if (chan) - ast_autoservice_start(chan); - AST_STANDARD_APP_ARGS(args, parse); if (args.delim) { ast_get_encoded_char(args.delim, delim, &delim_used); @@ -73,9 +70,6 @@ static int function_fieldqty(struct ast_channel *chan, const char *cmd, } snprintf(buf, len, "%d", fieldcount); - if (chan) - ast_autoservice_stop(chan); - return 0; } @@ -255,9 +249,6 @@ static int array(struct ast_channel *chan, const char *cmd, char *var, if (!var || !value2) return -1; - if (chan) - ast_autoservice_start(chan); - if (!strcmp(cmd, "HASH")) { const char *var2 = pbx_builtin_getvar_helper(chan, "~ODBCFIELDS~"); origvar = var; @@ -304,9 +295,6 @@ static int array(struct ast_channel *chan, const char *cmd, char *var, } } - if (chan) - ast_autoservice_stop(chan); - return 0; } @@ -748,11 +736,7 @@ static int function_eval(struct ast_channel *chan, const char *cmd, char *data, return -1; } - if (chan) - ast_autoservice_start(chan); pbx_substitute_variables_helper(chan, data, buf, buflen - 1); - if (chan) - ast_autoservice_stop(chan); return 0; } |