[asterisk-commits] russell: branch 1.6.1 r163256 - in /branches/1.6.1: ./ funcs/

[SVN commits to the Asterisk project]

Author: russell
Date: Thu Dec 11 15:50:10 2008
New Revision: 163256

URL: http://svn.digium.com/view/asterisk?view=rev&rev=163256
Log:
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

........

................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/funcs/func_cut.c
    branches/1.6.1/funcs/func_strings.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/funcs/func_cut.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/funcs/func_cut.c?view=diff&rev=163256&r1=163255&r2=163256
==============================================================================
--- branches/1.6.1/funcs/func_cut.c (original)
+++ branches/1.6.1/funcs/func_cut.c Thu Dec 11 15:50:10 2008
@@ -227,9 +227,6 @@
 {
 	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");
@@ -246,9 +243,6 @@
 	default:
 		ast_log(LOG_ERROR, "Unknown internal error\n");
 	}
-
-	if (chan)
-		ast_autoservice_stop(chan);
 
 	return ret;
 }

Modified: branches/1.6.1/funcs/func_strings.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/funcs/func_strings.c?view=diff&rev=163256&r1=163255&r2=163256
==============================================================================
--- branches/1.6.1/funcs/func_strings.c (original)
+++ branches/1.6.1/funcs/func_strings.c Thu Dec 11 15:50:10 2008
@@ -51,9 +51,6 @@
 	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);
@@ -72,9 +69,6 @@
 		fieldcount = 1;
 	}
 	snprintf(buf, len, "%d", fieldcount);
-
-	if (chan)
-		ast_autoservice_stop(chan);
 
 	return 0;
 }
@@ -254,9 +248,6 @@
 	value2 = ast_strdupa(value);
 	if (!var || !value2)
 		return -1;
-
-	if (chan)
-		ast_autoservice_start(chan);
 
 	if (!strcmp(cmd, "HASH")) {
 		const char *var2 = pbx_builtin_getvar_helper(chan, "~ODBCFIELDS~");
@@ -303,9 +294,6 @@
 			}
 		}
 	}
-
-	if (chan)
-		ast_autoservice_stop(chan);
 
 	return 0;
 }
@@ -748,11 +736,7 @@
 		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;
 }