[svn-commits] dvossel: branch 1.6.1 r201448 - in /branches/1.6.1: ./ apps/app_mixmonitor.c
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Wed Jun 17 14:54:05 CDT 2009
Author: dvossel
Date: Wed Jun 17 14:54:01 2009
New Revision: 201448
URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=201448
Log:
Merged revisions 201445 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r201445 | dvossel | 2009-06-17 14:45:35 -0500 (Wed, 17 Jun 2009) | 25 lines
Merged revisions 201423 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r201423 | dvossel | 2009-06-17 14:28:12 -0500 (Wed, 17 Jun 2009) | 19 lines
StopMixMonitor race condition (not giving up file immediately)
StopMixMonitor only indicates to the MixMonitor thread to stop
writing to the file. It does not guarantee that the recording's
file handle is available to the dialplan immediately after execution.
This results in a race condition. To resolve this, the filestream
pointer is placed in a datastore on the channel. When StopMixMonitor
is called, the datastore is retrieved from the channel and the
filestream is closed immediately before returning to the dialplan.
Documentation indicating the use of StopMixMonitor to free files
has been updated as well.
(closes issue #15259)
Reported by: travisghansen
Tested by: dvossel
Review: https://reviewboard.asterisk.org/r/283/
........
................
Modified:
branches/1.6.1/ (props changed)
branches/1.6.1/apps/app_mixmonitor.c
Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.1/apps/app_mixmonitor.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/apps/app_mixmonitor.c?view=diff&rev=201448&r1=201447&r2=201448
==============================================================================
--- branches/1.6.1/apps/app_mixmonitor.c (original)
+++ branches/1.6.1/apps/app_mixmonitor.c Wed Jun 17 14:54:01 2009
@@ -55,7 +55,8 @@
"Records the audio on the current channel to the specified file.\n"
"If the filename is an absolute path, uses that path, otherwise\n"
"creates the file in the configured monitoring directory from\n"
-"asterisk.conf.\n\n"
+"asterisk.conf. Use of StopMixMonitor is required to guarantee\n"
+"the audio file is available for processing during dialplan execution.\n\n"
"Valid options:\n"
" a - Append to the file instead of overwriting it.\n"
" b - Only save audio to the file while the channel is bridged.\n"
@@ -79,8 +80,7 @@
static const char *stop_synopsis = "Stop recording a call through MixMonitor";
static const char *stop_desc = ""
" StopMixMonitor():\n"
-"Stops the audio recording that was started with a call to MixMonitor()\n"
-"on the current channel.\n"
+"Stop recording a call through MixMonitor, and free the recording's file handle.\n"
"";
struct module_symbols *me;
@@ -135,7 +135,24 @@
unsigned int destruction_ok;
ast_cond_t destruction_condition;
ast_mutex_t lock;
+
+ /* The filestream is held in the datastore so it can be stopped
+ * immediately during stop_mixmonitor or channel destruction. */
+ int fs_quit;
+ struct ast_filestream *fs;
};
+
+static void mixmonitor_ds_close_fs(struct mixmonitor_ds *mixmonitor_ds)
+{
+ ast_mutex_lock(&mixmonitor_ds->lock);
+ if (mixmonitor_ds->fs) {
+ ast_closestream(mixmonitor_ds->fs);
+ mixmonitor_ds->fs = NULL;
+ mixmonitor_ds->fs_quit = 1;
+ ast_verb(2, "MixMonitor close filestream\n");
+ }
+ ast_mutex_unlock(&mixmonitor_ds->lock);
+}
static void mixmonitor_ds_destroy(void *data)
{
@@ -181,19 +198,33 @@
#define SAMPLES_PER_FRAME 160
+static void mixmonitor_free(struct mixmonitor *mixmonitor)
+{
+ if (mixmonitor) {
+ if (mixmonitor->mixmonitor_ds) {
+ ast_mutex_destroy(&mixmonitor->mixmonitor_ds->lock);
+ ast_cond_destroy(&mixmonitor->mixmonitor_ds->destruction_condition);
+ ast_free(mixmonitor->mixmonitor_ds);
+ }
+ ast_free(mixmonitor);
+ }
+}
+
static void *mixmonitor_thread(void *obj)
{
struct mixmonitor *mixmonitor = obj;
- struct ast_filestream *fs = NULL;
+ struct ast_filestream **fs = NULL;
unsigned int oflags;
char *ext;
int errflag = 0;
ast_verb(2, "Begin MixMonitor Recording %s\n", mixmonitor->name);
-
+
ast_audiohook_lock(&mixmonitor->audiohook);
- while (mixmonitor->audiohook.status == AST_AUDIOHOOK_STATUS_RUNNING) {
+ fs = &mixmonitor->mixmonitor_ds->fs;
+
+ while (mixmonitor->audiohook.status == AST_AUDIOHOOK_STATUS_RUNNING && !mixmonitor->mixmonitor_ds->fs_quit) {
struct ast_frame *fr = NULL;
ast_audiohook_trigger_wait(&mixmonitor->audiohook);
@@ -206,48 +237,43 @@
ast_mutex_lock(&mixmonitor->mixmonitor_ds->lock);
if (!ast_test_flag(mixmonitor, MUXFLAG_BRIDGED) || (mixmonitor->mixmonitor_ds->chan && ast_bridged_channel(mixmonitor->mixmonitor_ds->chan))) {
- ast_mutex_unlock(&mixmonitor->mixmonitor_ds->lock);
/* Initialize the file if not already done so */
- if (!fs && !errflag) {
+ if (!*fs && !errflag && !mixmonitor->mixmonitor_ds->fs_quit) {
oflags = O_CREAT | O_WRONLY;
oflags |= ast_test_flag(mixmonitor, MUXFLAG_APPEND) ? O_APPEND : O_TRUNC;
-
+
if ((ext = strrchr(mixmonitor->filename, '.')))
*(ext++) = '\0';
else
ext = "raw";
-
- if (!(fs = ast_writefile(mixmonitor->filename, ext, NULL, oflags, 0, 0666))) {
+
+ if (!(*fs = ast_writefile(mixmonitor->filename, ext, NULL, oflags, 0, 0666))) {
ast_log(LOG_ERROR, "Cannot open %s.%s\n", mixmonitor->filename, ext);
errflag = 1;
}
}
/* Write out the frame(s) */
- if (fs) {
+ if (*fs) {
struct ast_frame *cur;
for (cur = fr; cur; cur = AST_LIST_NEXT(cur, frame_list)) {
- ast_writestream(fs, cur);
+ ast_writestream(*fs, cur);
}
}
- } else {
- ast_mutex_unlock(&mixmonitor->mixmonitor_ds->lock);
}
+ ast_mutex_unlock(&mixmonitor->mixmonitor_ds->lock);
/* All done! free it. */
ast_frame_free(fr, 0);
-
}
ast_audiohook_detach(&mixmonitor->audiohook);
ast_audiohook_unlock(&mixmonitor->audiohook);
ast_audiohook_destroy(&mixmonitor->audiohook);
- ast_verb(2, "End MixMonitor Recording %s\n", mixmonitor->name);
-
- if (fs)
- ast_closestream(fs);
+
+ mixmonitor_ds_close_fs(mixmonitor->mixmonitor_ds);
if (mixmonitor->post_process) {
ast_verb(2, "Executing [%s]\n", mixmonitor->post_process);
@@ -259,11 +285,9 @@
ast_cond_wait(&mixmonitor->mixmonitor_ds->destruction_condition, &mixmonitor->mixmonitor_ds->lock);
}
ast_mutex_unlock(&mixmonitor->mixmonitor_ds->lock);
- ast_mutex_destroy(&mixmonitor->mixmonitor_ds->lock);
- ast_cond_destroy(&mixmonitor->mixmonitor_ds->destruction_condition);
- ast_free(mixmonitor->mixmonitor_ds);
- ast_free(mixmonitor);
-
+
+ ast_verb(2, "End MixMonitor Recording %s\n", mixmonitor->name);
+ mixmonitor_free(mixmonitor);
return NULL;
}
@@ -275,11 +299,13 @@
if (!(mixmonitor_ds = ast_calloc(1, sizeof(*mixmonitor_ds)))) {
return -1;
}
-
+
ast_mutex_init(&mixmonitor_ds->lock);
ast_cond_init(&mixmonitor_ds->destruction_condition, NULL);
if (!(datastore = ast_datastore_alloc(&mixmonitor_ds_info, NULL))) {
+ ast_mutex_destroy(&mixmonitor_ds->lock);
+ ast_cond_destroy(&mixmonitor_ds->destruction_condition);
ast_free(mixmonitor_ds);
return -1;
}
@@ -330,6 +356,7 @@
/* Copy over flags and channel name */
mixmonitor->flags = flags;
if (setup_mixmonitor_ds(mixmonitor, chan)) {
+ mixmonitor_free(mixmonitor);
return;
}
mixmonitor->name = (char *) mixmonitor + sizeof(*mixmonitor);
@@ -449,6 +476,14 @@
static int stop_mixmonitor_exec(struct ast_channel *chan, void *data)
{
+ struct ast_datastore *datastore = NULL;
+
+ /* closing the filestream here guarantees the file is avaliable to the dialplan
+ * after calling StopMixMonitor */
+ if ((datastore = ast_channel_datastore_find(chan, &mixmonitor_ds_info, NULL))) {
+ mixmonitor_ds_close_fs(datastore->data);
+ }
+
ast_audiohook_detach_source(chan, mixmonitor_spy_type);
return 0;
}
More information about the svn-commits
mailing list