From ab117fecaa11ce6b500883e1815e53c08ca3b0c0 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Fri, 7 Dec 2007 16:08:35 +0000 Subject: [PATCH] * Add a bit more of a verbose comment as to why a hangup frame needs to be queued up if autoservice gets a NULL return from ast_read(). * Make the process of queueing the hangup frame more efficient by putting the frame where it is going to end up and avoiding some locking and extra memory allocations and freeing. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@91777 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/autoservice.c | 46 ++++++++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/main/autoservice.c b/main/autoservice.c index f6887f638b..12eda1a1d9 100644 --- a/main/autoservice.c +++ b/main/autoservice.c @@ -66,10 +66,24 @@ static AST_LIST_HEAD_STATIC(aslist, asent); static pthread_t asthread = AST_PTHREADT_NULL; -static void *autoservice_run(void *ign) +static void defer_frame(struct ast_channel *chan, struct ast_frame *f) { + struct ast_frame *dup_f; + struct asent *as; + + AST_LIST_LOCK(&aslist); + AST_LIST_TRAVERSE(&aslist, as, list) { + if (as->chan != chan) + continue; + if ((dup_f = ast_frdup(f))) + AST_LIST_INSERT_TAIL(&as->dtmf_frames, dup_f, frame_list); + } + AST_LIST_UNLOCK(&aslist); +} - for(;;) { +static void *autoservice_run(void *ign) +{ + for (;;) { struct ast_channel *mons[MAX_AUTOMONS]; struct ast_channel *chan; struct asent *as; @@ -91,8 +105,18 @@ static void *autoservice_run(void *ign) struct ast_frame *f = ast_read(chan); if (!f) { - /* NULL means we got a hangup*/ - ast_queue_hangup(chan); + struct ast_frame hangup_frame = { 0, }; + /* No frame means the channel has been hung up. + * A hangup frame needs to be queued here as ast_waitfor() may + * never return again for the condition to be detected outside + * of autoservice. So, we'll leave a HANGUP queued up so the + * thread in charge of this channel will know. */ + + hangup_frame.frametype = AST_FRAME_CONTROL; + hangup_frame.subclass = AST_CONTROL_HANGUP; + + defer_frame(chan, &hangup_frame); + continue; } @@ -107,18 +131,8 @@ static void *autoservice_run(void *ign) case AST_FRAME_TEXT: case AST_FRAME_IMAGE: case AST_FRAME_HTML: - { - struct ast_frame *dup_f; - - AST_LIST_LOCK(&aslist); - AST_LIST_TRAVERSE(&aslist, as, list) { - if (as->chan != chan) - continue; - if ((dup_f = ast_frdup(f))) - AST_LIST_INSERT_TAIL(&as->dtmf_frames, dup_f, frame_list); - } - AST_LIST_UNLOCK(&aslist); - } + defer_frame(chan, f); + break; /* Throw these frames away */ case AST_FRAME_VOICE: