[svn-commits] kpfleming: branch group/new_loader_completion r40221
- in /team/group/new_loa...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Thu Aug 17 09:09:52 MST 2006
Author: kpfleming
Date: Thu Aug 17 11:09:52 2006
New Revision: 40221
URL: http://svn.digium.com/view/asterisk?rev=40221&view=rev
Log:
update to trunk and reset automerge
Modified:
team/group/new_loader_completion/ (props changed)
team/group/new_loader_completion/acinclude.m4
team/group/new_loader_completion/apps/app_macro.c
team/group/new_loader_completion/channels/chan_misdn.c
team/group/new_loader_completion/configure
team/group/new_loader_completion/configure.ac
Propchange: team/group/new_loader_completion/
------------------------------------------------------------------------------
automerge = yes
Propchange: team/group/new_loader_completion/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Aug 17 11:09:52 2006
@@ -1,1 +1,1 @@
-/trunk:1-40133
+/trunk:1-40220
Modified: team/group/new_loader_completion/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/acinclude.m4?rev=40221&r1=40220&r2=40221&view=diff
==============================================================================
--- team/group/new_loader_completion/acinclude.m4 (original)
+++ team/group/new_loader_completion/acinclude.m4 Thu Aug 17 11:09:52 2006
@@ -84,10 +84,14 @@
AC_DEFUN(
[AST_CHECK_GNU_MAKE], [AC_CACHE_CHECK(for GNU make, GNU_MAKE,
GNU_MAKE='Not Found' ;
+ GNU_MAKE_VERSION_MAJOR=0 ;
+ GNU_MAKE_VERSION_MINOR=0 ;
for a in make gmake gnumake ; do
if test -z "$a" ; then continue ; fi ;
if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then
GNU_MAKE=$a ;
+ GNU_MAKE_VERSION_MAJOR=`$GNU_MAKE --version | grep "GNU Make" | cut -f3 -d' ' | cut -f1 -d'.'`
+ GNU_MAKE_VERSION_MINOR=`$GNU_MAKE --version | grep "GNU Make" | cut -f2 -d'.'`
break;
fi
done ;
Modified: team/group/new_loader_completion/apps/app_macro.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/apps/app_macro.c?rev=40221&r1=40220&r2=40221&view=diff
==============================================================================
--- team/group/new_loader_completion/apps/app_macro.c (original)
+++ team/group/new_loader_completion/apps/app_macro.c Thu Aug 17 11:09:52 2006
@@ -109,7 +109,7 @@
int oldpriority;
char pc[80], depthc[12];
char oldcontext[AST_MAX_CONTEXT] = "";
- int offset, depth = 0;
+ int offset, depth = 0, maxdepth = 7;
int setmacrocontext=0;
int autoloopflag, dead = 0;
@@ -126,11 +126,16 @@
u = ast_module_user_add(chan);
+ /* does the user want a deeper rabbit hole? */
+ s = pbx_builtin_getvar_helper(chan, "MACRO_RECURSION");
+ if (s)
+ sscanf(s, "%d", &maxdepth);
+
/* Count how many levels deep the rabbit hole goes */
s = pbx_builtin_getvar_helper(chan, "MACRO_DEPTH");
if (s)
sscanf(s, "%d", &depth);
- if (depth >= 20) {
+ if (depth >= maxdepth) {
ast_log(LOG_ERROR, "Macro(): possible infinite loop detected. Returning early.\n");
ast_module_user_remove(u);
return 0;
Modified: team/group/new_loader_completion/channels/chan_misdn.c
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/channels/chan_misdn.c?rev=40221&r1=40220&r2=40221&view=diff
==============================================================================
--- team/group/new_loader_completion/channels/chan_misdn.c (original)
+++ team/group/new_loader_completion/channels/chan_misdn.c Thu Aug 17 11:09:52 2006
@@ -264,6 +264,8 @@
/* the main schedule context for stuff like l1 watcher, overlap dial, ... */
static struct sched_context *misdn_tasks = NULL;
static pthread_t misdn_tasks_thread;
+
+static int *misdn_ports;
static void chan_misdn_log(int level, int port, char *tmpl, ...);
@@ -564,8 +566,8 @@
static int misdn_l1_task (void *data)
{
- misdn_lib_isdn_l1watcher((int)data);
- chan_misdn_log(5, (int)data, "L1watcher timeout\n");
+ misdn_lib_isdn_l1watcher(*(int *)data);
+ chan_misdn_log(5, *(int *)data, "L1watcher timeout\n");
return 1;
}
@@ -4469,7 +4471,8 @@
free(misdn_debug);
if (misdn_debug_only)
free(misdn_debug_only);
-
+ free(misdn_ports);
+
return 0;
}
@@ -4493,12 +4496,15 @@
g_config_initialized=1;
misdn_debug = (int *)malloc(sizeof(int) * (max_ports+1));
+ misdn_ports = (int *)malloc(sizeof(int) * (max_ports+1));
misdn_cfg_get( 0, MISDN_GEN_DEBUG, &misdn_debug[0], sizeof(int));
- for (i = 1; i <= max_ports; i++)
+ for (i = 1; i <= max_ports; i++) {
misdn_debug[i] = misdn_debug[0];
+ misdn_ports[i] = i;
+ }
+ *misdn_ports = 0;
misdn_debug_only = (int *)calloc(max_ports + 1, sizeof(int));
-
{
char tempbuf[BUFFERSIZE+1];
misdn_cfg_get( 0, MISDN_GEN_TRACEFILE, tempbuf, BUFFERSIZE);
@@ -4588,7 +4594,7 @@
misdn_cfg_get(port, MISDN_CFG_L1_TIMEOUT, &l1timeout, sizeof(l1timeout));
if (l1timeout) {
chan_misdn_log(4, 0, "Adding L1watcher task: port:%d timeout:%ds\n", port, l1timeout);
- misdn_tasks_add(l1timeout * 1000, misdn_l1_task, (void*)port);
+ misdn_tasks_add(l1timeout * 1000, misdn_l1_task, &misdn_ports[port]);
}
}
Modified: team/group/new_loader_completion/configure
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/configure?rev=40221&r1=40220&r2=40221&view=diff
==============================================================================
--- team/group/new_loader_completion/configure (original)
+++ team/group/new_loader_completion/configure Thu Aug 17 11:09:52 2006
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 40086 .
+# From configure.ac Revision: 40129 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.60.
#
@@ -5166,10 +5166,14 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
GNU_MAKE='Not Found' ;
+ GNU_MAKE_VERSION_MAJOR=0 ;
+ GNU_MAKE_VERSION_MINOR=0 ;
for a in make gmake gnumake ; do
if test -z "$a" ; then continue ; fi ;
if ( sh -c "$a --version" 2> /dev/null | grep GNU 2>&1 > /dev/null ) ; then
GNU_MAKE=$a ;
+ GNU_MAKE_VERSION_MAJOR=`$GNU_MAKE --version | grep "GNU Make" | cut -f3 -d' ' | cut -f1 -d'.'`
+ GNU_MAKE_VERSION_MINOR=`$GNU_MAKE --version | grep "GNU Make" | cut -f2 -d'.'`
break;
fi
done ;
@@ -31075,3 +31079,20 @@
{ echo "$as_me:$LINENO: Target = ${host}" >&5
echo "$as_me: Target = ${host}" >&6;}
fi
+
+if test ${GNU_MAKE_VERSION_MAJOR} -lt 3 || test ${GNU_MAKE_VERSION_MINOR} -lt 81 ; then
+ { echo "$as_me:$LINENO: " >&5
+echo "$as_me: " >&6;}
+ { echo "$as_me:$LINENO: ***** WARNING ******" >&5
+echo "$as_me: ***** WARNING ******" >&6;}
+ { echo "$as_me:$LINENO: You are currently using GNU Make version ${GNU_MAKE_VERSION_MAJOR}.${GNU_MAKE_VERSION_MINOR}." >&5
+echo "$as_me: You are currently using GNU Make version ${GNU_MAKE_VERSION_MAJOR}.${GNU_MAKE_VERSION_MINOR}." >&6;}
+ { echo "$as_me:$LINENO: The Asterisk build system uses features that may not work correctly prior to 3.81." >&5
+echo "$as_me: The Asterisk build system uses features that may not work correctly prior to 3.81." >&6;}
+ { echo "$as_me:$LINENO: Please consider upgrading GNU Make or you may experience problems." >&5
+echo "$as_me: Please consider upgrading GNU Make or you may experience problems." >&6;}
+ { echo "$as_me:$LINENO: ********************" >&5
+echo "$as_me: ********************" >&6;}
+ { echo "$as_me:$LINENO: " >&5
+echo "$as_me: " >&6;}
+fi
Modified: team/group/new_loader_completion/configure.ac
URL: http://svn.digium.com/view/asterisk/team/group/new_loader_completion/configure.ac?rev=40221&r1=40220&r2=40221&view=diff
==============================================================================
--- team/group/new_loader_completion/configure.ac (original)
+++ team/group/new_loader_completion/configure.ac Thu Aug 17 11:09:52 2006
@@ -950,3 +950,13 @@
AC_MSG_NOTICE( Cross Compilation = YES)
AC_MSG_NOTICE( Target = ${host})
fi
+
+if test ${GNU_MAKE_VERSION_MAJOR} -lt 3 || test ${GNU_MAKE_VERSION_MINOR} -lt 81 ; then
+ AC_MSG_NOTICE()
+ AC_MSG_NOTICE(***** WARNING ******)
+ AC_MSG_NOTICE(You are currently using GNU Make version ${GNU_MAKE_VERSION_MAJOR}.${GNU_MAKE_VERSION_MINOR}.)
+ AC_MSG_NOTICE(The Asterisk build system uses features that may not work correctly prior to 3.81.)
+ AC_MSG_NOTICE(Please consider upgrading GNU Make or you may experience problems.)
+ AC_MSG_NOTICE(********************)
+ AC_MSG_NOTICE()
+fi
More information about the svn-commits
mailing list