[svn-commits] russell: branch russell/poll_compat r182809 - in /team/russell/poll_compat: ....
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Tue Mar 17 21:00:17 CDT 2009
Author: russell
Date: Tue Mar 17 21:00:13 2009
New Revision: 182809
URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=182809
Log:
sync with 1.4 again
Modified:
team/russell/poll_compat/ (props changed)
team/russell/poll_compat/apps/app_chanspy.c
team/russell/poll_compat/apps/app_meetme.c
team/russell/poll_compat/apps/app_mixmonitor.c
team/russell/poll_compat/build_tools/cflags-devmode.xml
team/russell/poll_compat/include/asterisk/frame.h
team/russell/poll_compat/include/asterisk/linkedlists.h
team/russell/poll_compat/main/autoservice.c
team/russell/poll_compat/main/channel.c
team/russell/poll_compat/main/file.c
team/russell/poll_compat/main/frame.c
team/russell/poll_compat/main/slinfactory.c
Propchange: team/russell/poll_compat/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Mar 17 21:00:13 2009
@@ -1,1 +1,1 @@
-/branches/1.4:1-182805
+/branches/1.4:1-182808
Modified: team/russell/poll_compat/apps/app_chanspy.c
URL: http://svn.digium.com/svn-view/asterisk/team/russell/poll_compat/apps/app_chanspy.c?view=diff&rev=182809&r1=182808&r2=182809
==============================================================================
--- team/russell/poll_compat/apps/app_chanspy.c (original)
+++ team/russell/poll_compat/apps/app_chanspy.c Tue Mar 17 21:00:13 2009
@@ -171,7 +171,7 @@
static int spy_generate(struct ast_channel *chan, void *data, int len, int samples)
{
struct chanspy_translation_helper *csth = data;
- struct ast_frame *f, *cur;
+ struct ast_frame *f;
ast_audiohook_lock(&csth->spy_audiohook);
if (csth->spy_audiohook.status != AST_AUDIOHOOK_STATUS_RUNNING) {
@@ -186,16 +186,14 @@
if (!f)
return 0;
- for (cur = f; cur; cur = AST_LIST_NEXT(cur, frame_list)) {
- if (ast_write(chan, cur)) {
- ast_frfree(f);
- return -1;
- }
-
- if (csth->fd) {
- if (write(csth->fd, cur->data, cur->datalen) < 0) {
- ast_log(LOG_WARNING, "write() failed: %s\n", strerror(errno));
- }
+ if (ast_write(chan, f)) {
+ ast_frfree(f);
+ return -1;
+ }
+
+ if (csth->fd) {
+ if (write(csth->fd, f->data, f->datalen) < 0) {
+ ast_log(LOG_WARNING, "write() failed: %s\n", strerror(errno));
}
}
Modified: team/russell/poll_compat/apps/app_meetme.c
URL: http://svn.digium.com/svn-view/asterisk/team/russell/poll_compat/apps/app_meetme.c?view=diff&rev=182809&r1=182808&r2=182809
==============================================================================
--- team/russell/poll_compat/apps/app_meetme.c (original)
+++ team/russell/poll_compat/apps/app_meetme.c Tue Mar 17 21:00:13 2009
@@ -2338,19 +2338,9 @@
}
}
if (conf->transframe[index]) {
- if ((conf->transframe[index]->frametype != AST_FRAME_NULL) &&
- can_write(chan, confflags)) {
- struct ast_frame *cur;
-
- /* the translator may have returned a list of frames, so
- write each one onto the channel
- */
- for (cur = conf->transframe[index]; cur; cur = AST_LIST_NEXT(cur, frame_list)) {
- if (ast_write(chan, cur)) {
- ast_log(LOG_WARNING, "Unable to write frame to channel %s\n", chan->name);
- break;
- }
- }
+ if (conf->transframe[index]->frametype != AST_FRAME_NULL) {
+ if (can_write(chan, confflags) && ast_write(chan, conf->transframe[index]))
+ ast_log(LOG_WARNING, "Unable to write frame to channel %s\n", chan->name);
}
} else {
ast_mutex_unlock(&conf->listenlock);
Modified: team/russell/poll_compat/apps/app_mixmonitor.c
URL: http://svn.digium.com/svn-view/asterisk/team/russell/poll_compat/apps/app_mixmonitor.c?view=diff&rev=182809&r1=182808&r2=182809
==============================================================================
--- team/russell/poll_compat/apps/app_mixmonitor.c (original)
+++ team/russell/poll_compat/apps/app_mixmonitor.c Tue Mar 17 21:00:13 2009
@@ -229,14 +229,9 @@
}
}
- /* Write out the frame(s) */
- if (fs) {
- struct ast_frame *cur;
-
- for (cur = fr; cur; cur = AST_LIST_NEXT(cur, frame_list)) {
- ast_writestream(fs, cur);
- }
- }
+ /* Write out the frame */
+ if (fs)
+ ast_writestream(fs, fr);
} else {
ast_mutex_unlock(&mixmonitor->mixmonitor_ds->lock);
}
Modified: team/russell/poll_compat/build_tools/cflags-devmode.xml
URL: http://svn.digium.com/svn-view/asterisk/team/russell/poll_compat/build_tools/cflags-devmode.xml?view=diff&rev=182809&r1=182808&r2=182809
==============================================================================
--- team/russell/poll_compat/build_tools/cflags-devmode.xml (original)
+++ team/russell/poll_compat/build_tools/cflags-devmode.xml Tue Mar 17 21:00:13 2009
@@ -12,4 +12,6 @@
</member>
<member name="MTX_PROFILE" displayname="Enable Code Profiling Using TSC Counters">
</member>
+ <member name="TRACE_FRAMES" displayname="Trace Frame Allocations">
+ </member>
</category>
Modified: team/russell/poll_compat/include/asterisk/frame.h
URL: http://svn.digium.com/svn-view/asterisk/team/russell/poll_compat/include/asterisk/frame.h?view=diff&rev=182809&r1=182808&r2=182809
==============================================================================
--- team/russell/poll_compat/include/asterisk/frame.h (original)
+++ team/russell/poll_compat/include/asterisk/frame.h Tue Mar 17 21:00:13 2009
@@ -399,9 +399,9 @@
#endif
/*!
- * \brief Frees a frame or list of frames
+ * \brief Frees a frame
*
- * \param fr Frame to free, or head of list to free
+ * \param fr Frame to free
* \param cache Whether to consider this frame for frame caching
*/
void ast_frame_free(struct ast_frame *fr, int cache);
@@ -415,11 +415,6 @@
* data malloc'd. If you need to store frames, say for queueing, then
* you should call this function.
* \return Returns a frame on success, NULL on error
- * \note This function may modify the frame passed to it, so you must
- * not assume the frame will be intact after the isolated frame has
- * been produced. In other words, calling this function on a frame
- * should be the last operation you do with that frame before freeing
- * it (or exiting the block, if the frame is on the stack.)
*/
struct ast_frame *ast_frisolate(struct ast_frame *fr);
Modified: team/russell/poll_compat/include/asterisk/linkedlists.h
URL: http://svn.digium.com/svn-view/asterisk/team/russell/poll_compat/include/asterisk/linkedlists.h?view=diff&rev=182809&r1=182808&r2=182809
==============================================================================
--- team/russell/poll_compat/include/asterisk/linkedlists.h (original)
+++ team/russell/poll_compat/include/asterisk/linkedlists.h Tue Mar 17 21:00:13 2009
@@ -685,7 +685,7 @@
\param head This is a pointer to the list head structure
\param list This is a pointer to the list to be appended.
\param field This is the name of the field (declared using AST_LIST_ENTRY())
- used to link entries of the lists together.
+ used to link entries of this list together.
Note: The source list (the \a list parameter) will be empty after
calling this macro (the list entries are \b moved to the target list).
@@ -703,30 +703,6 @@
} while (0)
#define AST_RWLIST_APPEND_LIST AST_LIST_APPEND_LIST
-
-/*!
- \brief Inserts a whole list after a specific entry in a list
- \param head This is a pointer to the list head structure
- \param list This is a pointer to the list to be inserted.
- \param elm This is a pointer to the entry after which the new list should
- be inserted.
- \param field This is the name of the field (declared using AST_LIST_ENTRY())
- used to link entries of the lists together.
-
- Note: The source list (the \a list parameter) will be empty after
- calling this macro (the list entries are \b moved to the target list).
- */
-#define AST_LIST_INSERT_LIST_AFTER(head, list, elm, field) do { \
- (list)->last->field.next = (elm)->field.next; \
- (elm)->field.next = (list)->first; \
- if ((head)->last == elm) { \
- (head)->last = (list)->last; \
- } \
- (list)->first = NULL; \
- (list)->last = NULL; \
-} while(0)
-
-#define AST_RWLIST_INSERT_LIST_AFTER AST_LIST_INSERT_LIST_AFTER
/*!
\brief Removes and returns the head entry from a list.
Modified: team/russell/poll_compat/main/autoservice.c
URL: http://svn.digium.com/svn-view/asterisk/team/russell/poll_compat/main/autoservice.c?view=diff&rev=182809&r1=182808&r2=182809
==============================================================================
--- team/russell/poll_compat/main/autoservice.c (original)
+++ team/russell/poll_compat/main/autoservice.c Tue Mar 17 21:00:13 2009
@@ -168,22 +168,15 @@
continue;
}
- if (defer_frame != f) {
- if ((dup_f = ast_frdup(defer_frame))) {
- AST_LIST_INSERT_HEAD(&ents[i]->deferred_frames, dup_f, frame_list);
- }
- } else {
- if ((dup_f = ast_frisolate(defer_frame))) {
- if (dup_f != defer_frame) {
- ast_frfree(defer_frame);
- }
- AST_LIST_INSERT_HEAD(&ents[i]->deferred_frames, dup_f, frame_list);
- }
+ if ((dup_f = ast_frdup(defer_frame))) {
+ AST_LIST_INSERT_HEAD(&ents[i]->deferred_frames, dup_f, frame_list);
}
break;
}
- } else if (f) {
+ }
+
+ if (f) {
ast_frfree(f);
}
}
Modified: team/russell/poll_compat/main/channel.c
URL: http://svn.digium.com/svn-view/asterisk/team/russell/poll_compat/main/channel.c?view=diff&rev=182809&r1=182808&r2=182809
==============================================================================
--- team/russell/poll_compat/main/channel.c (original)
+++ team/russell/poll_compat/main/channel.c Tue Mar 17 21:00:13 2009
@@ -895,90 +895,60 @@
}
/*! \brief Queue an outgoing media frame */
-static int __ast_queue_frame(struct ast_channel *chan, struct ast_frame *fin, int head, struct ast_frame *after)
+static int __ast_queue_frame(struct ast_channel *chan, struct ast_frame *fin, int head)
{
struct ast_frame *f;
struct ast_frame *cur;
int blah = 1;
- unsigned int new_frames = 0;
- unsigned int new_voice_frames = 0;
- unsigned int queued_frames = 0;
- unsigned int queued_voice_frames = 0;
-
- AST_LIST_HEAD_NOLOCK(, ast_frame) frames;
-
- /* Build copies of all the frames and count them */
- AST_LIST_HEAD_INIT_NOLOCK(&frames);
- for (cur = fin; cur; cur = AST_LIST_NEXT(cur, frame_list)) {
- if (!(f = ast_frdup(cur))) {
- ast_frfree(AST_LIST_FIRST(&frames));
- return -1;
- }
-
- AST_LIST_INSERT_TAIL(&frames, f, frame_list);
- new_frames++;
- if (f->frametype == AST_FRAME_VOICE) {
- new_voice_frames++;
- }
+ int qlen = 0;
+
+ /* Build us a copy and free the original one */
+ if (!(f = ast_frdup(fin))) {
+ return -1;
}
ast_channel_lock(chan);
/* See if the last frame on the queue is a hangup, if so don't queue anything */
if ((cur = AST_LIST_LAST(&chan->readq)) && (cur->frametype == AST_FRAME_CONTROL) && (cur->subclass == AST_CONTROL_HANGUP)) {
- while ((f = AST_LIST_REMOVE_HEAD(&frames, frame_list))) {
- ast_frfree(f);
- }
+ ast_frfree(f);
ast_channel_unlock(chan);
return 0;
}
/* Count how many frames exist on the queue */
AST_LIST_TRAVERSE(&chan->readq, cur, frame_list) {
- queued_frames++;
- if (cur->frametype == AST_FRAME_VOICE) {
- queued_voice_frames++;
- }
- }
-
- if ((queued_frames + new_frames) > 128) {
- ast_log(LOG_WARNING, "Exceptionally long queue length queuing to %s\n", chan->name);
- while ((f = AST_LIST_REMOVE_HEAD(&frames, frame_list))) {
+ qlen++;
+ }
+
+ /* Allow up to 96 voice frames outstanding, and up to 128 total frames */
+ if (((fin->frametype == AST_FRAME_VOICE) && (qlen > 96)) || (qlen > 128)) {
+ if (fin->frametype != AST_FRAME_VOICE) {
+ ast_log(LOG_WARNING, "Exceptionally long queue length queuing to %s\n", chan->name);
+ ast_assert(fin->frametype == AST_FRAME_VOICE);
+ } else {
+ if (option_debug)
+ ast_log(LOG_DEBUG, "Dropping voice to exceptionally long queue on %s\n", chan->name);
ast_frfree(f);
- }
- ast_channel_unlock(chan);
- return 0;
- }
-
- if ((queued_voice_frames + new_voice_frames) > 96) {
- ast_log(LOG_WARNING, "Exceptionally long voice queue length queuing to %s\n", chan->name);
- while ((f = AST_LIST_REMOVE_HEAD(&frames, frame_list))) {
- ast_frfree(f);
- }
- ast_channel_unlock(chan);
- return 0;
- }
-
- if (after) {
- AST_LIST_INSERT_LIST_AFTER(&chan->readq, &frames, after, frame_list);
+ ast_channel_unlock(chan);
+ return 0;
+ }
+ }
+
+ if (head) {
+ AST_LIST_INSERT_HEAD(&chan->readq, f, frame_list);
} else {
- if (head) {
- AST_LIST_APPEND_LIST(&frames, &chan->readq, frame_list);
- AST_LIST_HEAD_INIT_NOLOCK(&chan->readq);
- }
- AST_LIST_APPEND_LIST(&chan->readq, &frames, frame_list);
+ AST_LIST_INSERT_TAIL(&chan->readq, f, frame_list);
}
if (chan->alertpipe[1] > -1) {
- if (write(chan->alertpipe[1], &blah, new_frames * sizeof(blah)) != (new_frames * sizeof(blah))) {
- ast_log(LOG_WARNING, "Unable to write to alert pipe on %s (qlen = %d): %s!\n",
- chan->name, queued_frames, strerror(errno));
+ if (write(chan->alertpipe[1], &blah, sizeof(blah)) != sizeof(blah)) {
+ ast_log(LOG_WARNING, "Unable to write to alert pipe on %s, frametype/subclass %d/%d (qlen = %d): %s!\n",
+ chan->name, f->frametype, f->subclass, qlen, strerror(errno));
}
#ifdef HAVE_DAHDI
} else if (chan->timingfd > -1) {
- while (new_frames--) {
- ioctl(chan->timingfd, DAHDI_TIMERPING, &blah);
- }
+ ioctl(chan->timingfd, DAHDI_TIMERPING, &blah);
#endif
} else if (ast_test_flag(chan, AST_FLAG_BLOCKING)) {
pthread_kill(chan->blocker, SIGURG);
@@ -991,12 +961,12 @@
int ast_queue_frame(struct ast_channel *chan, struct ast_frame *fin)
{
- return __ast_queue_frame(chan, fin, 0, NULL);
+ return __ast_queue_frame(chan, fin, 0);
}
int ast_queue_frame_head(struct ast_channel *chan, struct ast_frame *fin)
{
- return __ast_queue_frame(chan, fin, 1, NULL);
+ return __ast_queue_frame(chan, fin, 1);
}
/*! \brief Queue a hangup frame for channel */
@@ -2180,7 +2150,7 @@
AST_LIST_REMOVE_CURRENT(&chan->readq, frame_list);
break;
}
- AST_LIST_TRAVERSE_SAFE_END;
+ AST_LIST_TRAVERSE_SAFE_END
if (!f) {
/* There were no acceptable frames on the readq. */
@@ -2225,14 +2195,13 @@
chan->fdno = -1;
if (f) {
- struct ast_frame *readq_tail = AST_LIST_LAST(&chan->readq);
-
/* if the channel driver returned more than one frame, stuff the excess
- into the readq for the next ast_read call
+ into the readq for the next ast_read call (note that we can safely assume
+ that the readq is empty, because otherwise we would not have called into
+ the channel driver and f would be only a single frame)
*/
if (AST_LIST_NEXT(f, frame_list)) {
- ast_queue_frame(chan, AST_LIST_NEXT(f, frame_list));
- ast_frfree(AST_LIST_NEXT(f, frame_list));
+ AST_LIST_HEAD_SET_NOLOCK(&chan->readq, AST_LIST_NEXT(f, frame_list));
AST_LIST_NEXT(f, frame_list) = NULL;
}
@@ -2441,26 +2410,8 @@
}
}
- if (chan->readtrans && (f = ast_translate(chan->readtrans, f, 1)) == NULL) {
+ if (chan->readtrans && (f = ast_translate(chan->readtrans, f, 1)) == NULL)
f = &ast_null_frame;
- }
-
- /* it is possible for the translation process on chan->readtrans to have
- produced multiple frames from the single input frame we passed it; if
- this happens, queue the additional frames *before* the frames we may
- have queued earlier. if the readq was empty, put them at the head of
- the queue, and if it was not, put them just after the frame that was
- at the end of the queue.
- */
- if (AST_LIST_NEXT(f, frame_list)) {
- if (!readq_tail) {
- ast_queue_frame_head(chan, AST_LIST_NEXT(f, frame_list));
- } else {
- __ast_queue_frame(chan, AST_LIST_NEXT(f, frame_list), 0, readq_tail);
- }
- ast_frfree(AST_LIST_NEXT(f, frame_list));
- AST_LIST_NEXT(f, frame_list) = NULL;
- }
/* Run generator sitting on the line if timing device not available
* and synchronous generation of outgoing frames is necessary */
@@ -2791,7 +2742,7 @@
{
int res = -1;
int count = 0;
- struct ast_frame *f = NULL;
+ struct ast_frame *f = NULL, *f2 = NULL;
/*Deadlock avoidance*/
while(ast_channel_trylock(chan)) {
@@ -2862,12 +2813,10 @@
break;
case AST_FRAME_DTMF_END:
if (chan->audiohooks) {
- struct ast_frame *new_frame = fr;
-
- new_frame = ast_audiohook_write_list(chan, chan->audiohooks, AST_AUDIOHOOK_DIRECTION_WRITE, fr);
- if (new_frame != fr) {
- ast_frfree(new_frame);
- }
+ struct ast_frame *old_frame = fr;
+ fr = ast_audiohook_write_list(chan, chan->audiohooks, AST_AUDIOHOOK_DIRECTION_WRITE, fr);
+ if (old_frame != fr)
+ f = fr;
}
ast_clear_flag(chan, AST_FLAG_BLOCKING);
ast_channel_unlock(chan);
@@ -2896,6 +2845,13 @@
if (chan->tech->write == NULL)
break; /*! \todo XXX should return 0 maybe ? */
+ if (chan->audiohooks) {
+ struct ast_frame *old_frame = fr;
+ fr = ast_audiohook_write_list(chan, chan->audiohooks, AST_AUDIOHOOK_DIRECTION_WRITE, fr);
+ if (old_frame != fr)
+ f2 = fr;
+ }
+
/* If the frame is in the raw write format, then it's easy... just use the frame - otherwise we will have to translate */
if (fr->subclass == chan->rawwriteformat)
f = fr;
@@ -2908,82 +2864,37 @@
break;
}
- if (chan->audiohooks) {
- struct ast_frame *new_frame, *cur;
-
- for (cur = f; cur; cur = AST_LIST_NEXT(cur, frame_list)) {
- new_frame = ast_audiohook_write_list(chan, chan->audiohooks, AST_AUDIOHOOK_DIRECTION_WRITE, cur);
- if (new_frame != cur) {
- ast_frfree(new_frame);
- }
- }
- }
-
/* If Monitor is running on this channel, then we have to write frames out there too */
- /* the translator on chan->writetrans may have returned multiple frames
- from the single frame we passed in; if so, feed each one of them to the
- monitor */
if (chan->monitor && chan->monitor->write_stream) {
- struct ast_frame *cur;
-
- for (cur = f; cur; cur = AST_LIST_NEXT(cur, frame_list)) {
/* XXX must explain this code */
#ifndef MONITOR_CONSTANT_DELAY
- int jump = chan->insmpl - chan->outsmpl - 4 * cur->samples;
- if (jump >= 0) {
- jump = chan->insmpl - chan->outsmpl;
- if (ast_seekstream(chan->monitor->write_stream, jump, SEEK_FORCECUR) == -1)
- ast_log(LOG_WARNING, "Failed to perform seek in monitoring write stream, synchronization between the files may be broken\n");
- chan->outsmpl += jump + cur->samples;
- } else {
- chan->outsmpl += cur->samples;
- }
+ int jump = chan->insmpl - chan->outsmpl - 4 * f->samples;
+ if (jump >= 0) {
+ jump = chan->insmpl - chan->outsmpl;
+ if (ast_seekstream(chan->monitor->write_stream, jump, SEEK_FORCECUR) == -1)
+ ast_log(LOG_WARNING, "Failed to perform seek in monitoring write stream, synchronization between the files may be broken\n");
+ chan->outsmpl += jump + f->samples;
+ } else
+ chan->outsmpl += f->samples;
#else
- int jump = chan->insmpl - chan->outsmpl;
- if (jump - MONITOR_DELAY >= 0) {
- if (ast_seekstream(chan->monitor->write_stream, jump - cur->samples, SEEK_FORCECUR) == -1)
- ast_log(LOG_WARNING, "Failed to perform seek in monitoring write stream, synchronization between the files may be broken\n");
- chan->outsmpl += jump;
- } else {
- chan->outsmpl += cur->samples;
- }
+ int jump = chan->insmpl - chan->outsmpl;
+ if (jump - MONITOR_DELAY >= 0) {
+ if (ast_seekstream(chan->monitor->write_stream, jump - f->samples, SEEK_FORCECUR) == -1)
+ ast_log(LOG_WARNING, "Failed to perform seek in monitoring write stream, synchronization between the files may be broken\n");
+ chan->outsmpl += jump;
+ } else
+ chan->outsmpl += f->samples;
#endif
- if (chan->monitor->state == AST_MONITOR_RUNNING) {
- if (ast_writestream(chan->monitor->write_stream, cur) < 0)
- ast_log(LOG_WARNING, "Failed to write data to channel monitor write stream\n");
- }
+ if (chan->monitor->state == AST_MONITOR_RUNNING) {
+ if (ast_writestream(chan->monitor->write_stream, f) < 0)
+ ast_log(LOG_WARNING, "Failed to write data to channel monitor write stream\n");
}
}
- /* the translator on chan->writetrans may have returned multiple frames
- from the single frame we passed in; if so, feed each one of them to the
- channel, freeing each one after it has been written */
- if ((f != fr) && AST_LIST_NEXT(f, frame_list)) {
- struct ast_frame *cur, *next;
- unsigned int skip = 0;
-
- for (cur = f, next = AST_LIST_NEXT(cur, frame_list);
- cur;
- cur = next, next = cur ? AST_LIST_NEXT(cur, frame_list) : NULL) {
- if (!skip) {
- if ((res = chan->tech->write(chan, cur)) < 0) {
- chan->_softhangup |= AST_SOFTHANGUP_DEV;
- skip = 1;
- } else if (next) {
- /* don't do this for the last frame in the list,
- as the code outside the loop will do it once
- */
- chan->fout = FRAMECOUNT_INC(chan->fout);
- }
- }
- ast_frfree(cur);
- }
-
- /* reset f so the code below doesn't attempt to free it */
- f = NULL;
- } else {
- res = chan->tech->write(chan, f);
- }
+ if (f)
+ res = chan->tech->write(chan,f);
+ else
+ res = 0;
break;
case AST_FRAME_NULL:
case AST_FRAME_IAX:
@@ -3000,12 +2911,13 @@
if (f && f != fr)
ast_frfree(f);
+ if (f2)
+ ast_frfree(f2);
ast_clear_flag(chan, AST_FLAG_BLOCKING);
-
/* Consider a write failure to force a soft hangup */
- if (res < 0) {
+ if (res < 0)
chan->_softhangup |= AST_SOFTHANGUP_DEV;
- } else {
+ else {
chan->fout = FRAMECOUNT_INC(chan->fout);
}
done:
Modified: team/russell/poll_compat/main/file.c
URL: http://svn.digium.com/svn-view/asterisk/team/russell/poll_compat/main/file.c?view=diff&rev=182809&r1=182808&r2=182809
==============================================================================
--- team/russell/poll_compat/main/file.c (original)
+++ team/russell/poll_compat/main/file.c Tue Mar 17 21:00:13 2009
@@ -203,20 +203,14 @@
struct ast_frame *trf;
fs->lastwriteformat = f->subclass;
/* Get the translated frame but don't consume the original in case they're using it on another stream */
- if ((trf = ast_translate(fs->trans, f, 0))) {
- struct ast_frame *cur;
-
- /* the translator may have returned multiple frames, so process them */
- for (cur = trf; cur; cur = AST_LIST_NEXT(cur, frame_list)) {
- if ((res = fs->fmt->write(fs, trf))) {
- ast_log(LOG_WARNING, "Translated frame write failed\n");
- break;
- }
- }
+ trf = ast_translate(fs->trans, f, 0);
+ if (trf) {
+ res = fs->fmt->write(fs, trf);
ast_frfree(trf);
- } else {
+ if (res)
+ ast_log(LOG_WARNING, "Translated frame write failed\n");
+ } else
res = 0;
- }
}
}
return res;
Modified: team/russell/poll_compat/main/frame.c
URL: http://svn.digium.com/svn-view/asterisk/team/russell/poll_compat/main/frame.c?view=diff&rev=182809&r1=182808&r2=182809
==============================================================================
--- team/russell/poll_compat/main/frame.c (original)
+++ team/russell/poll_compat/main/frame.c Tue Mar 17 21:00:13 2009
@@ -46,6 +46,11 @@
#include "asterisk/translate.h"
#include "asterisk/dsp.h"
#include "asterisk/file.h"
+
+#ifdef TRACE_FRAMES
+static int headers;
+static AST_LIST_HEAD_STATIC(headerlist, ast_frame);
+#endif
#if !defined(LOW_MEMORY)
static void frame_cache_cleanup(void *data);
@@ -286,7 +291,7 @@
memmove(s->data, s->data + len, s->len);
if (!ast_tvzero(s->delivery)) {
/* If we have delivery time, increment it, otherwise, leave it at 0 */
- s->delivery = ast_tvadd(s->delivery, ast_samp2tv(s->f.samples, ast_format_rate(s->format)));
+ s->delivery = ast_tvadd(s->delivery, ast_samp2tv(s->f.samples, 8000));
}
}
/* Return frame */
@@ -323,6 +328,12 @@
#endif
f->mallocd_hdr_len = sizeof(*f);
+#ifdef TRACE_FRAMES
+ AST_LIST_LOCK(&headerlist);
+ headers++;
+ AST_LIST_INSERT_HEAD(&headerlist, f, frame_list);
+ AST_LIST_UNLOCK(&headerlist);
+#endif
return f;
}
@@ -340,7 +351,7 @@
}
#endif
-static void __frame_free(struct ast_frame *fr, int cache)
+void ast_frame_free(struct ast_frame *fr, int cache)
{
if (ast_test_flag(fr, AST_FRFLAG_FROM_TRANSLATOR)) {
ast_translate_frame_freed(fr);
@@ -359,8 +370,8 @@
* to keep things simple... */
struct ast_frame_cache *frames;
- if ((frames = ast_threadstorage_get(&frame_cache, sizeof(*frames))) &&
- (frames->size < FRAME_CACHE_MAX_SIZE)) {
+ if ((frames = ast_threadstorage_get(&frame_cache, sizeof(*frames)))
+ && frames->size < FRAME_CACHE_MAX_SIZE) {
AST_LIST_INSERT_HEAD(&frames->list, fr, frame_list);
frames->size++;
return;
@@ -374,22 +385,16 @@
}
if (fr->mallocd & AST_MALLOCD_SRC) {
if (fr->src)
- free((void *)fr->src);
+ free((char *)fr->src);
}
if (fr->mallocd & AST_MALLOCD_HDR) {
+#ifdef TRACE_FRAMES
+ AST_LIST_LOCK(&headerlist);
+ headers--;
+ AST_LIST_REMOVE(&headerlist, fr, frame_list);
+ AST_LIST_UNLOCK(&headerlist);
+#endif
free(fr);
- }
-}
-
-
-void ast_frame_free(struct ast_frame *frame, int cache)
-{
- struct ast_frame *next;
-
- for (next = AST_LIST_NEXT(frame, frame_list);
- frame;
- frame = next, next = frame ? AST_LIST_NEXT(frame, frame_list) : NULL) {
- __frame_free(frame, cache);
}
}
@@ -403,29 +408,19 @@
struct ast_frame *out;
void *newdata;
- /* if none of the existing frame is malloc'd, let ast_frdup() do it
- since it is more efficient
- */
- if (fr->mallocd == 0) {
- return ast_frdup(fr);
- }
-
- /* if everything is already malloc'd, we are done */
- if ((fr->mallocd & (AST_MALLOCD_HDR | AST_MALLOCD_SRC | AST_MALLOCD_DATA)) ==
- (AST_MALLOCD_HDR | AST_MALLOCD_SRC | AST_MALLOCD_DATA)) {
- return fr;
- }
+ ast_clear_flag(fr, AST_FRFLAG_FROM_TRANSLATOR);
+ ast_clear_flag(fr, AST_FRFLAG_FROM_DSP);
if (!(fr->mallocd & AST_MALLOCD_HDR)) {
/* Allocate a new header if needed */
- if (!(out = ast_frame_header_new())) {
+ if (!(out = ast_frame_header_new()))
return NULL;
- }
out->frametype = fr->frametype;
out->subclass = fr->subclass;
out->datalen = fr->datalen;
out->samples = fr->samples;
out->offset = fr->offset;
+ out->data = fr->data;
/* Copy the timing data */
ast_copy_flags(out, fr, AST_FRFLAG_HAS_TIMING_INFO);
if (ast_test_flag(fr, AST_FRFLAG_HAS_TIMING_INFO)) {
@@ -433,34 +428,26 @@
out->len = fr->len;
out->seqno = fr->seqno;
}
- } else {
- ast_clear_flag(fr, AST_FRFLAG_FROM_TRANSLATOR);
- ast_clear_flag(fr, AST_FRFLAG_FROM_DSP);
- ast_clear_flag(fr, AST_FRFLAG_FROM_FILESTREAM);
+ } else
out = fr;
- }
- if (!(fr->mallocd & AST_MALLOCD_SRC) && fr->src) {
- if (!(out->src = ast_strdup(fr->src))) {
- if (out != fr) {
- free(out);
+ if (!(fr->mallocd & AST_MALLOCD_SRC)) {
+ if (fr->src) {
+ if (!(out->src = ast_strdup(fr->src))) {
+ if (out != fr)
+ free(out);
+ return NULL;
}
- return NULL;
- }
- } else {
+ }
+ } else
out->src = fr->src;
- fr->src = NULL;
- fr->mallocd &= ~AST_MALLOCD_SRC;
- }
if (!(fr->mallocd & AST_MALLOCD_DATA)) {
if (!(newdata = ast_malloc(fr->datalen + AST_FRIENDLY_OFFSET))) {
- if (out->src != fr->src) {
+ if (out->src != fr->src)
free((void *) out->src);
- }
- if (out != fr) {
+ if (out != fr)
free(out);
- }
return NULL;
}
newdata += AST_FRIENDLY_OFFSET;
@@ -468,10 +455,6 @@
out->datalen = fr->datalen;
memcpy(newdata, fr->data, fr->datalen);
out->data = newdata;
- } else {
- out->data = fr->data;
- fr->data = NULL;
- fr->mallocd &= ~AST_MALLOCD_DATA;
}
out->mallocd = AST_MALLOCD_HDR | AST_MALLOCD_SRC | AST_MALLOCD_DATA;
@@ -514,7 +497,7 @@
break;
}
}
- AST_LIST_TRAVERSE_SAFE_END;
+ AST_LIST_TRAVERSE_SAFE_END
}
#endif
@@ -987,6 +970,29 @@
}
+#ifdef TRACE_FRAMES
+static int show_frame_stats(int fd, int argc, char *argv[])
+{
+ struct ast_frame *f;
+ int x=1;
+ if (argc != 4)
+ return RESULT_SHOWUSAGE;
+ AST_LIST_LOCK(&headerlist);
+ ast_cli(fd, " Framer Statistics \n");
+ ast_cli(fd, "---------------------------\n");
+ ast_cli(fd, "Total allocated headers: %d\n", headers);
+ ast_cli(fd, "Queue Dump:\n");
+ AST_LIST_TRAVERSE(&headerlist, f, frame_list)
+ ast_cli(fd, "%d. Type %d, subclass %d from %s\n", x++, f->frametype, f->subclass, f->src ? f->src : "<Unknown>");
+ AST_LIST_UNLOCK(&headerlist);
+ return RESULT_SUCCESS;
+}
+
+static char frame_stats_usage[] =
+"Usage: core show frame stats\n"
+" Displays debugging statistics from framer\n";
+#endif
+
/* Builtin Asterisk CLI-commands for debugging */
static struct ast_cli_entry cli_show_codecs = {
{ "show", "codecs", NULL },
@@ -1013,6 +1019,13 @@
show_codec_n_deprecated, NULL,
NULL };
+#ifdef TRACE_FRAMES
+static struct ast_cli_entry cli_show_frame_stats = {
+ { "show", "frame", "stats", NULL },
+ show_frame_stats, NULL,
+ NULL };
+#endif
+
static struct ast_cli_entry my_clis[] = {
{ { "core", "show", "codecs", NULL },
show_codecs, "Displays a list of codecs",
@@ -1033,6 +1046,12 @@
{ { "core", "show", "codec", NULL },
show_codec_n, "Shows a specific codec",
frame_show_codec_n_usage, NULL, &cli_show_codec },
+
+#ifdef TRACE_FRAMES
+ { { "core", "show", "frame", "stats", NULL },
+ show_frame_stats, "Shows frame statistics",
+ frame_stats_usage, NULL, &cli_show_frame_stats },
+#endif
};
int init_framer(void)
Modified: team/russell/poll_compat/main/slinfactory.c
URL: http://svn.digium.com/svn-view/asterisk/team/russell/poll_compat/main/slinfactory.c?view=diff&rev=182809&r1=182808&r2=182809
==============================================================================
--- team/russell/poll_compat/main/slinfactory.c (original)
+++ team/russell/poll_compat/main/slinfactory.c Tue Mar 17 21:00:13 2009
@@ -57,7 +57,7 @@
int ast_slinfactory_feed(struct ast_slinfactory *sf, struct ast_frame *f)
{
struct ast_frame *begin_frame = f, *duped_frame = NULL, *frame_ptr;
- unsigned int x = 0;
+ unsigned int x;
/* In some cases, we can be passed a frame which has no data in it, but
* which has a positive number of samples defined. Once such situation is
@@ -84,33 +84,27 @@
}
}
- if (!(begin_frame = ast_translate(sf->trans, f, 0))) {
+ if (!(begin_frame = ast_translate(sf->trans, f, 0)))
return 0;
- }
- if (!(duped_frame = ast_frisolate(begin_frame))) {
+ duped_frame = ast_frdup(begin_frame);
+
+ ast_frfree(begin_frame);
+
+ if (!duped_frame)
return 0;
- }
-
- if (duped_frame != begin_frame) {
- ast_frfree(begin_frame);
- }
} else {
if (!(duped_frame = ast_frdup(f)))
return 0;
}
- AST_LIST_TRAVERSE(&sf->queue, frame_ptr, frame_list) {
+ x = 0;
+ AST_LIST_TRAVERSE(&sf->queue, frame_ptr, frame_list)
x++;
- }
- /* if the frame was translated, the translator may have returned multiple
- frames, so process each of them
- */
- for (begin_frame = duped_frame; begin_frame; begin_frame = AST_LIST_NEXT(begin_frame, frame_list)) {
- AST_LIST_INSERT_TAIL(&sf->queue, begin_frame, frame_list);
- sf->size += begin_frame->samples;
- }
+ AST_LIST_INSERT_TAIL(&sf->queue, duped_frame, frame_list);
+
+ sf->size += duped_frame->samples;
return x;
}
More information about the svn-commits
mailing list