[asterisk-commits] kpfleming: branch 1.6.0 r114886 - in /branches/1.6.0: ./ channels/
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Wed Apr 30 09:55:17 CDT 2008
Author: kpfleming
Date: Wed Apr 30 09:55:16 2008
New Revision: 114886
URL: http://svn.digium.com/view/asterisk?view=rev&rev=114886
Log:
Merged revisions 114884 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r114884 | kpfleming | 2008-04-30 09:49:51 -0500 (Wed, 30 Apr 2008) | 10 lines
Merged revisions 114880 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r114880 | kpfleming | 2008-04-30 09:46:57 -0500 (Wed, 30 Apr 2008) | 2 lines
use the ARRAY_LEN macro for indexing through the iaxs/iaxsl arrays so that the size of the arrays can be adjusted in one place, and change the size of the arrays from 32768 calls to 2048 calls when LOW_MEMORY is defined
........
................
Modified:
branches/1.6.0/ (props changed)
branches/1.6.0/channels/chan_iax2.c
branches/1.6.0/channels/iax2.h
Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.0/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_iax2.c?view=diff&rev=114886&r1=114885&r2=114886
==============================================================================
--- branches/1.6.0/channels/chan_iax2.c (original)
+++ branches/1.6.0/channels/chan_iax2.c Wed Apr 30 09:55:16 2008
@@ -115,9 +115,6 @@
#define DEFAULT_RETRY_TIME 1000
#define MEMORY_SIZE 100
#define DEFAULT_DROP 3
-/* Flag to use with trunk calls, keeping these calls high up. It halves our effective use
- but keeps the division between trunked and non-trunked better. */
-#define TRUNK_CALL_START 0x4000
#define DEBUG_SUPPORT
@@ -148,8 +145,6 @@
static int max_retries = 4;
static int ping_time = 21;
static int lagrq_time = 10;
-static int maxtrunkcall = TRUNK_CALL_START;
-static int maxnontrunkcall = 1;
static int maxjitterbuffer=1000;
static int resyncthreshold=1000;
static int maxjitterinterps=10;
@@ -835,6 +830,7 @@
* index into the array where the associated pvt structure is stored.
*/
static struct chan_iax2_pvt *iaxs[IAX_MAX_CALLS];
+
/*!
* \brief chan_iax2_pvt structure locks
*
@@ -842,7 +838,7 @@
* The index used here is the same as used in the iaxs array. It is the
* local call number for the associated pvt struct.
*/
-static ast_mutex_t iaxsl[IAX_MAX_CALLS];
+static ast_mutex_t iaxsl[ARRAY_LEN(iaxs)];
/*!
* \brief The last time a call number was used
*
@@ -862,7 +858,14 @@
* The specified time that we must wait before reusing a local call number is
* defined as MIN_REUSE_TIME, with a default of 60 seconds.
*/
-static struct timeval lastused[IAX_MAX_CALLS];
+static struct timeval lastused[ARRAY_LEN(iaxs)];
+
+/* Flag to use with trunk calls, keeping these calls high up. It halves our effective use
+ but keeps the division between trunked and non-trunked better. */
+#define TRUNK_CALL_START ARRAY_LEN(iaxs) / 2
+
+static int maxtrunkcall = TRUNK_CALL_START;
+static int maxnontrunkcall = 1;
static enum ast_bridge_result iax2_bridge(struct ast_channel *c0, struct ast_channel *c1, int flags, struct ast_frame **fo, struct ast_channel **rc, int timeoutms);
static int expire_registry(const void *data);
@@ -1400,11 +1403,14 @@
{
int max = TRUNK_CALL_START;
int x;
+
/* XXX Prolly don't need locks here XXX */
- for (x=TRUNK_CALL_START;x<IAX_MAX_CALLS - 1; x++) {
- if (iaxs[x])
+ for (x = TRUNK_CALL_START; x < ARRAY_LEN(iaxs) - 1; x++) {
+ if (iaxs[x]) {
max = x + 1;
- }
+ }
+ }
+
maxtrunkcall = max;
if (iaxdebug)
ast_debug(1, "New max trunk callno is %d\n", max);
@@ -1437,7 +1443,7 @@
ast_log(LOG_WARNING, "Call %d is already a trunk\n", callno);
return -1;
}
- for (x=TRUNK_CALL_START;x<IAX_MAX_CALLS - 1; x++) {
+ for (x = TRUNK_CALL_START; x < ARRAY_LEN(iaxs) - 1; x++) {
ast_mutex_lock(&iaxsl[x]);
if (!iaxs[x] && ((now.tv_sec - lastused[x].tv_sec) > MIN_REUSE_TIME)) {
iaxs[x] = iaxs[callno];
@@ -1457,7 +1463,7 @@
}
ast_mutex_unlock(&iaxsl[x]);
}
- if (x >= IAX_MAX_CALLS - 1) {
+ if (x >= ARRAY_LEN(iaxs) - 1) {
ast_log(LOG_WARNING, "Unable to trunk call: Insufficient space\n");
return -1;
}
@@ -5195,7 +5201,7 @@
if (a->argc != 3)
return CLI_SHOWUSAGE;
ast_cli(a->fd, FORMAT2, "Channel", "Peer", "Username", "ID (Lo/Rem)", "Seq (Tx/Rx)", "Lag", "Jitter", "JitBuf", "Format");
- for (x = 0; x < IAX_MAX_CALLS; x++) {
+ for (x = 0; x < ARRAY_LEN(iaxs); x++) {
ast_mutex_lock(&iaxsl[x]);
if (iaxs[x]) {
int lag, jitter, localdelay;
@@ -5237,7 +5243,7 @@
int numchans = 0;
#define ACN_FORMAT1 "%-25.25s %4d %4d %4d %5d %3d %5d %4d %6d %4d %4d %5d %3d %5d %4d %6d\n"
#define ACN_FORMAT2 "%s %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d\n"
- for (x=0;x<IAX_MAX_CALLS;x++) {
+ for (x = 0; x < ARRAY_LEN(iaxs); x++) {
ast_mutex_lock(&iaxsl[x]);
if (iaxs[x]) {
int localjitter, localdelay, locallost, locallosspct, localdropped, localooo;
@@ -11052,7 +11058,7 @@
struct parsed_dial_string pds;
char *tmpstr;
- for (x=0; x<IAX_MAX_CALLS; x++) {
+ for (x = 0; x < ARRAY_LEN(iaxs); x++) {
/* Look for an *exact match* call. Once a call is negotiated, it can only
look up entries for a single context */
if (!ast_mutex_trylock(&iaxsl[x])) {
@@ -11737,9 +11743,10 @@
ast_netsock_release(netsock);
ast_netsock_release(outsock);
- for (x = 0; x < IAX_MAX_CALLS; x++) {
- if (iaxs[x])
+ for (x = 0; x < ARRAY_LEN(iaxs); x++) {
+ if (iaxs[x]) {
iax2_destroy(x);
+ }
}
ast_manager_unregister( "IAXpeers" );
ast_manager_unregister( "IAXpeerlist" );
@@ -11753,8 +11760,9 @@
sched_context_destroy(sched);
reload_firmware(1);
- for (x = 0; x < IAX_MAX_CALLS; x++)
+ for (x = 0; x < ARRAY_LEN(iaxsl); x++) {
ast_mutex_destroy(&iaxsl[x]);
+ }
ao2_ref(peers, -1);
ao2_ref(users, -1);
@@ -11818,8 +11826,9 @@
memset(iaxs, 0, sizeof(iaxs));
- for (x=0;x<IAX_MAX_CALLS;x++)
+ for (x = 0; x < ARRAY_LEN(iaxsl); x++) {
ast_mutex_init(&iaxsl[x]);
+ }
ast_cond_init(&sched_cond, NULL);
Modified: branches/1.6.0/channels/iax2.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/iax2.h?view=diff&rev=114886&r1=114885&r2=114886
==============================================================================
--- branches/1.6.0/channels/iax2.h (original)
+++ branches/1.6.0/channels/iax2.h Wed Apr 30 09:55:16 2008
@@ -26,7 +26,12 @@
/* Max version of IAX protocol we support */
#define IAX_PROTO_VERSION 2
+/* NOTE: IT IS CRITICAL THAT IAX_MAX_CALLS BE A POWER OF 2. */
+#if defined(LOW_MEMORY)
+#define IAX_MAX_CALLS 2048
+#else
#define IAX_MAX_CALLS 32768
+#endif
#define IAX_FLAG_FULL 0x8000
More information about the asterisk-commits
mailing list