diff options
| author | Dwayne M. Hubbard <dwayne.hubbard@gmail.com> | 2007-09-12 20:47:32 +0000 |
|---|---|---|
| committer | Dwayne M. Hubbard <dwayne.hubbard@gmail.com> | 2007-09-12 20:47:32 +0000 |
| commit | 48ccbe253d014dad792fe5a899a4dd259737c9ec (patch) | |
| tree | 99cb188d4af3ab11645bd0f635da571b0d0d5d7b /apps | |
| parent | 3a6e79ad80f7bc037bf4b6424147d06b7377eaa8 (diff) | |
Merged revisions 82286 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r82286 | dhubbard | 2007-09-12 15:24:24 -0500 (Wed, 12 Sep 2007) | 1 line
remove a race condition for the creation of recordthread's, and fix a small memory leak. This closes issue# 10636
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@82287 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_meetme.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 81e188ada..d353c3d9d 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -343,6 +343,8 @@ struct ast_conference { unsigned int isdynamic:1; /*!< Created on the fly? */ unsigned int locked:1; /*!< Is the conference locked? */ pthread_t recordthread; /*!< thread for recording */ + ast_mutex_t recordthreadlock; /*!< control threads trying to start recordthread */ + pthread_attr_t attr; /*!< thread attribute */ const char *recordingfilename; /*!< Filename to record the Conference into */ const char *recordingformat; /*!< Format to record the Conference in */ char pin[MAX_PIN]; /*!< If protected by a PIN */ @@ -781,6 +783,8 @@ static struct ast_conference *build_conf(char *confno, char *pin, char *pinadmin ast_mutex_init(&cnf->playlock); ast_mutex_init(&cnf->listenlock); + cnf->recordthread = AST_PTHREADT_NULL; + ast_mutex_init(&cnf->recordthreadlock); ast_copy_string(cnf->confno, confno, sizeof(cnf->confno)); ast_copy_string(cnf->pin, pin, sizeof(cnf->pin)); ast_copy_string(cnf->pinadmin, pinadmin, sizeof(cnf->pinadmin)); @@ -1281,7 +1285,10 @@ static int conf_free(struct ast_conference *conf) ast_hangup(conf->chan); else close(conf->fd); - + + ast_mutex_destroy(&conf->playlock); + ast_mutex_destroy(&conf->listenlock); + ast_mutex_destroy(&conf->recordthreadlock); ast_free(conf); return 0; @@ -1466,7 +1473,8 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c } } - if ((conf->recording == MEETME_RECORD_OFF) && (confflags & CONFFLAG_RECORDCONF) && ((conf->lchan = ast_request("zap", AST_FORMAT_SLINEAR, "pseudo", NULL)))) { + ast_mutex_lock(&conf->recordthreadlock); + if ((conf->recordthread == AST_PTHREADT_NULL) && (confflags & CONFFLAG_RECORDCONF) && ((conf->lchan = ast_request("zap", AST_FORMAT_SLINEAR, "pseudo", NULL)))) { ast_set_read_format(conf->lchan, AST_FORMAT_SLINEAR); ast_set_write_format(conf->lchan, AST_FORMAT_SLINEAR); ztc.chan = 0; @@ -1480,6 +1488,7 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c ast_pthread_create_detached_background(&conf->recordthread, NULL, recordthread, conf); } } + ast_mutex_unlock(&conf->recordthreadlock); time(&user->jointime); |