[asterisk-commits] russell: tag 1.4.19.2 r115640 - in /tags/1.4.19.2/channels: chan_iax2.c iax2.h
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Mon May 12 10:06:34 CDT 2008
Author: russell
Date: Mon May 12 10:06:33 2008
New Revision: 115640
URL: http://svn.digium.com/view/asterisk?view=rev&rev=115640
Log:
Merge rev 114880 from 1.4
Modified:
tags/1.4.19.2/channels/chan_iax2.c
tags/1.4.19.2/channels/iax2.h
Modified: tags/1.4.19.2/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/tags/1.4.19.2/channels/chan_iax2.c?view=diff&rev=115640&r1=115639&r2=115640
==============================================================================
--- tags/1.4.19.2/channels/chan_iax2.c (original)
+++ tags/1.4.19.2/channels/chan_iax2.c Mon May 12 10:06:33 2008
@@ -127,9 +127,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
@@ -151,8 +148,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;
@@ -811,8 +806,15 @@
/* XXX We probably should use a mutex when working with this XXX */
static struct chan_iax2_pvt *iaxs[IAX_MAX_CALLS];
-static ast_mutex_t iaxsl[IAX_MAX_CALLS];
-static struct timeval lastused[IAX_MAX_CALLS];
+static ast_mutex_t iaxsl[ARRAY_LEN(iaxs)];
+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);
@@ -1263,11 +1265,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 (option_debug && iaxdebug)
ast_log(LOG_DEBUG, "New max trunk callno is %d\n", max);
@@ -1301,7 +1306,7 @@
return -1;
}
gettimeofday(&now, NULL);
- 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];
@@ -1321,7 +1326,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;
}
@@ -4671,7 +4676,7 @@
if (argc != 3)
return RESULT_SHOWUSAGE;
ast_cli(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;
@@ -4711,7 +4716,7 @@
{
int x;
int numchans = 0;
- 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;
@@ -10063,7 +10068,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])) {
@@ -10816,9 +10821,11 @@
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( "IAXnetstats" );
ast_unregister_application(papp);
@@ -10832,8 +10839,9 @@
ast_mutex_destroy(&waresl.lock);
- 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);
@@ -10892,8 +10900,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: tags/1.4.19.2/channels/iax2.h
URL: http://svn.digium.com/view/asterisk/tags/1.4.19.2/channels/iax2.h?view=diff&rev=115640&r1=115639&r2=115640
==============================================================================
--- tags/1.4.19.2/channels/iax2.h (original)
+++ tags/1.4.19.2/channels/iax2.h Mon May 12 10:06:33 2008
@@ -17,7 +17,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