aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-12-07 16:08:35 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2007-12-07 16:08:35 +0000
commit32e7c2d616699b3fbad25b7cfeec707636aec109 (patch)
tree8ca332ce8c9965eca7cec80c47afb70f45ee1207
parent8ccfe0b307fb1b8595253b05445f5b187711ea4d (diff)
* 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: http://svn.digium.com/svn/asterisk/branches/1.4@91777 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--main/autoservice.c46
1 files changed, 30 insertions, 16 deletions
diff --git a/main/autoservice.c b/main/autoservice.c
index f6887f638..12eda1a1d 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: