[svn-commits] russell: branch russell/iax2_transmit_q r184837 - /team/russell/iax2_transmit...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Sat Mar 28 23:56:28 CDT 2009
Author: russell
Date: Sat Mar 28 23:56:25 2009
New Revision: 184837
URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=184837
Log:
Instead of one big frame queue, have a queue per call number
Modified:
team/russell/iax2_transmit_q/channels/chan_iax2.c
Modified: team/russell/iax2_transmit_q/channels/chan_iax2.c
URL: http://svn.digium.com/svn-view/asterisk/team/russell/iax2_transmit_q/channels/chan_iax2.c?view=diff&rev=184837&r1=184836&r2=184837
==============================================================================
--- team/russell/iax2_transmit_q/channels/chan_iax2.c (original)
+++ team/russell/iax2_transmit_q/channels/chan_iax2.c Sat Mar 28 23:56:25 2009
@@ -759,8 +759,10 @@
* \note The contents of this list do not need to be explicitly destroyed
* on module unload. This is because all active calls are destroyed, and
* all frames in this queue will get destroyed as a part of that process.
+ *
+ * \note Contents protected by the iaxsl[] locks
*/
-static AST_LIST_HEAD_STATIC(frame_queue, iax_frame);
+static AST_LIST_HEAD_NOLOCK(, iax_frame) frame_queue[IAX_MAX_CALLS];
static struct ast_taskprocessor *transmit_processor;
@@ -1591,20 +1593,18 @@
struct iax_frame *cur = NULL;
ast_mutex_lock(&iaxsl[pvt->callno]);
+
iax2_destroy_helper(pvt);
+
+ /* Already gone */
+ ast_set_flag(pvt, IAX_ALREADYGONE);
+
+ AST_LIST_TRAVERSE(&frame_queue[pvt->callno], cur, list) {
+ /* Cancel any pending transmissions */
+ cur->retries = -1;
+ }
+
ast_mutex_unlock(&iaxsl[pvt->callno]);
-
- /* Already gone */
- ast_set_flag(pvt, IAX_ALREADYGONE);
-
- AST_LIST_LOCK(&frame_queue);
- AST_LIST_TRAVERSE(&frame_queue, cur, list) {
- /* Cancel any pending transmissions */
- if (cur->callno == pvt->callno) {
- cur->retries = -1;
- }
- }
- AST_LIST_UNLOCK(&frame_queue);
if (pvt->reg) {
pvt->reg->callno = 0;
@@ -2626,17 +2626,16 @@
f->retries = -1;
freeme = 1;
}
- if (callno)
- ast_mutex_unlock(&iaxsl[callno]);
- /* Do not try again */
+
if (freeme) {
/* Don't attempt delivery, just remove it from the queue */
- AST_LIST_LOCK(&frame_queue);
- AST_LIST_REMOVE(&frame_queue, f, list);
- AST_LIST_UNLOCK(&frame_queue);
+ AST_LIST_REMOVE(&frame_queue[callno], f, list);
+ ast_mutex_unlock(&iaxsl[callno]);
f->retrans = -1;
/* Free the IAX frame */
iax2_frame_free(f);
+ } else if (callno) {
+ ast_mutex_unlock(&iaxsl[callno]);
}
}
@@ -2926,7 +2925,7 @@
static char *handle_cli_iax2_show_stats(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
{
struct iax_frame *cur;
- int cnt = 0, dead = 0, final = 0;
+ int cnt = 0, dead = 0, final = 0, i = 0;
switch (cmd) {
case CLI_INIT:
@@ -2942,15 +2941,17 @@
if (a->argc != 3)
return CLI_SHOWUSAGE;
- AST_LIST_LOCK(&frame_queue);
- AST_LIST_TRAVERSE(&frame_queue, cur, list) {
- if (cur->retries < 0)
- dead++;
- if (cur->final)
- final++;
- cnt++;
- }
- AST_LIST_UNLOCK(&frame_queue);
+ for (i = 0; i < ARRAY_LEN(frame_queue); i++) {
+ ast_mutex_lock(&iaxsl[i]);
+ AST_LIST_TRAVERSE(&frame_queue[i], cur, list) {
+ if (cur->retries < 0)
+ dead++;
+ if (cur->final)
+ final++;
+ cnt++;
+ }
+ ast_mutex_unlock(&iaxsl[i]);
+ }
ast_cli(a->fd, " IAX Statistics\n");
ast_cli(a->fd, "---------------------\n");
@@ -3312,20 +3313,21 @@
struct iax_frame *fr = data;
ast_mutex_lock(&iaxsl[fr->callno]);
+
fr->sentyet = 1;
+
if (iaxs[fr->callno]) {
send_packet(fr);
}
- ast_mutex_unlock(&iaxsl[fr->callno]);
if (fr->retries < 0) {
+ ast_mutex_unlock(&iaxsl[fr->callno]);
/* No retransmit requested */
iax_frame_free(fr);
} else {
/* We need reliable delivery. Schedule a retransmission */
- AST_LIST_LOCK(&frame_queue);
- AST_LIST_INSERT_TAIL(&frame_queue, fr, list);
- AST_LIST_UNLOCK(&frame_queue);
+ AST_LIST_INSERT_TAIL(&frame_queue[fr->callno], fr, list);
+ ast_mutex_unlock(&iaxsl[fr->callno]);
fr->retries++;
fr->retrans = iax2_sched_add(sched, fr->retrytime, attempt_transmit, fr);
}
@@ -7033,16 +7035,13 @@
pvt->lastsent = 0;
pvt->nextpred = 0;
pvt->pingtime = DEFAULT_RETRY_TIME;
- AST_LIST_LOCK(&frame_queue);
- AST_LIST_TRAVERSE(&frame_queue, cur, list) {
+ AST_LIST_TRAVERSE(&frame_queue[callno], cur, list) {
/* We must cancel any packets that would have been transmitted
because now we're talking to someone new. It's okay, they
were transmitted to someone that didn't care anyway. */
- if (callno == cur->callno)
- cur->retries = -1;
- }
- AST_LIST_UNLOCK(&frame_queue);
- return 0;
+ cur->retries = -1;
+ }
+ return 0;
}
/*! \brief Acknowledgment received for OUR registration */
@@ -7645,16 +7644,13 @@
{
struct iax_frame *f;
- AST_LIST_LOCK(&frame_queue);
- AST_LIST_TRAVERSE(&frame_queue, f, list) {
+ AST_LIST_TRAVERSE(&frame_queue[callno], f, list) {
/* Send a copy immediately */
- if ((f->callno == callno) && iaxs[f->callno] &&
- ((unsigned char ) (f->oseqno - last) < 128) &&
- (f->retries >= 0)) {
+ if (((unsigned char) (f->oseqno - last) < 128) &&
+ (f->retries >= 0)) {
send_packet(f);
}
}
- AST_LIST_UNLOCK(&frame_queue);
}
static void __iax2_poke_peer_s(const void *data)
@@ -8671,17 +8667,15 @@
if (iaxdebug)
ast_debug(1, "Cancelling transmission of packet %d\n", x);
call_to_destroy = 0;
- AST_LIST_LOCK(&frame_queue);
- AST_LIST_TRAVERSE(&frame_queue, cur, list) {
+ AST_LIST_TRAVERSE(&frame_queue[fr->callno], cur, list) {
/* If it's our call, and our timestamp, mark -1 retries */
- if ((fr->callno == cur->callno) && (x == cur->oseqno)) {
+ if (x == cur->oseqno) {
cur->retries = -1;
/* Destroy call if this is the end */
if (cur->final)
call_to_destroy = fr->callno;
}
}
- AST_LIST_UNLOCK(&frame_queue);
if (call_to_destroy) {
if (iaxdebug)
ast_debug(1, "Really destroying %d, having been acked on final message\n", call_to_destroy);
@@ -8923,13 +8917,12 @@
case IAX_COMMAND_TXACC:
if (iaxs[fr->callno]->transferring == TRANSFER_BEGIN) {
/* Ack the packet with the given timestamp */
- AST_LIST_LOCK(&frame_queue);
- AST_LIST_TRAVERSE(&frame_queue, cur, list) {
+ AST_LIST_TRAVERSE(&frame_queue[fr->callno], cur, list) {
/* Cancel any outstanding txcnt's */
- if ((fr->callno == cur->callno) && (cur->transfer))
+ if (cur->transfer) {
cur->retries = -1;
+ }
}
- AST_LIST_UNLOCK(&frame_queue);
memset(&ied1, 0, sizeof(ied1));
iax_ie_append_short(&ied1, IAX_IE_CALLNO, iaxs[fr->callno]->callno);
send_command(iaxs[fr->callno], AST_FRAME_IAX, IAX_COMMAND_TXREADY, 0, ied1.buf, ied1.pos, -1);
@@ -9828,13 +9821,12 @@
break;
case IAX_COMMAND_TXMEDIA:
if (iaxs[fr->callno]->transferring == TRANSFER_READY) {
- AST_LIST_LOCK(&frame_queue);
- AST_LIST_TRAVERSE(&frame_queue, cur, list) {
+ AST_LIST_TRAVERSE(&frame_queue[fr->callno], cur, list) {
/* Cancel any outstanding frames and start anew */
- if ((fr->callno == cur->callno) && (cur->transfer))
+ if (cur->transfer) {
cur->retries = -1;
+ }
}
- AST_LIST_UNLOCK(&frame_queue);
/* Start sending our media to the transfer address, but otherwise leave the call as-is */
iaxs[fr->callno]->transferring = TRANSFER_MEDIAPASS;
}
More information about the svn-commits
mailing list