kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-29 18:19:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add any missing locking calls

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@1312 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2003-08-13 17:32:44 +00:00
parent e35371be2b
commit d91f72fd5f
4 changed files with 45 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@@ -1,3 +1,4 @@
-- Add thread debugging
-- Add optional pedantic SIP checking for Pingtel -- Add optional pedantic SIP checking for Pingtel
-- Allow extension names, include context, switch to use global vars. -- Allow extension names, include context, switch to use global vars.
-- Allow variables in extensions.conf to reference previously defined ones -- Allow variables in extensions.conf to reference previously defined ones

2
channel.c
View File

@@ -704,8 +704,10 @@ int ast_answer(struct ast_channel *chan)
switch(chan->_state) { switch(chan->_state) {
case AST_STATE_RINGING: case AST_STATE_RINGING:
case AST_STATE_RING: case AST_STATE_RING:
ast_mutex_lock(&chan->lock);
if (chan->pvt->answer) if (chan->pvt->answer)
res = chan->pvt->answer(chan); res = chan->pvt->answer(chan);
ast_mutex_unlock(&chan->lock);
ast_setstate(chan, AST_STATE_UP); ast_setstate(chan, AST_STATE_UP);
if (chan->cdr) if (chan->cdr)
ast_cdr_answer(chan->cdr); ast_cdr_answer(chan->cdr);

27
channels/chan_agent.c
View File

@@ -111,6 +111,23 @@ static struct agent_pvt {
struct agent_pvt *next; /* Agent */ struct agent_pvt *next; /* Agent */
} *agents = NULL; } *agents = NULL;
#define CHECK_FORMATS(ast, p) do { \
if (p->chan) {\
if (ast->nativeformats != p->chan->nativeformats) { \
ast_log(LOG_DEBUG, "Native formats changing from %d to %d\n", ast->nativeformats, p->chan->nativeformats); \
/* Native formats changed, reset things */ \
ast->nativeformats = p->chan->nativeformats; \
ast_log(LOG_DEBUG, "Resetting read to %d and write to %d\n", ast->readformat, ast->writeformat);\
ast_set_read_format(ast, ast->readformat); \
ast_set_write_format(ast, ast->writeformat); \
} \
if (p->chan->readformat != ast->pvt->rawreadformat) \
ast_set_read_format(p->chan, ast->pvt->rawreadformat); \
if (p->chan->writeformat != ast->pvt->rawwriteformat) \
ast_set_write_format(p->chan, ast->pvt->rawwriteformat); \
} \
} while(0)
#define CLEANUP(ast, p) do { \ #define CLEANUP(ast, p) do { \
int x; \ int x; \
if (p->chan) { \ if (p->chan) { \
@@ -227,8 +244,8 @@ static struct ast_frame *agent_read(struct ast_channel *ast)
static struct ast_frame null_frame = { AST_FRAME_NULL, }; static struct ast_frame null_frame = { AST_FRAME_NULL, };
static struct ast_frame answer_frame = { AST_FRAME_CONTROL, AST_CONTROL_ANSWER }; static struct ast_frame answer_frame = { AST_FRAME_CONTROL, AST_CONTROL_ANSWER };
ast_mutex_lock(&p->lock); ast_mutex_lock(&p->lock);
CHECK_FORMATS(ast, p);
if (p->chan) { if (p->chan) {
p->chan->pvt->rawreadformat = ast->pvt->rawreadformat;
f = ast_read(p->chan); f = ast_read(p->chan);
} else } else
f = &null_frame; f = &null_frame;
@@ -278,10 +295,16 @@ static int agent_write(struct ast_channel *ast, struct ast_frame *f)
{ {
struct agent_pvt *p = ast->pvt->pvt; struct agent_pvt *p = ast->pvt->pvt;
int res = -1; int res = -1;
CHECK_FORMATS(ast, p);
ast_mutex_lock(&p->lock); ast_mutex_lock(&p->lock);
if (p->chan) { if (p->chan) {
p->chan->pvt->rawwriteformat = ast->pvt->rawwriteformat; if ((f->frametype != AST_FRAME_VOICE) ||
(f->subclass == p->chan->writeformat)) {
res = ast_write(p->chan, f); res = ast_write(p->chan, f);
} else {
ast_log(LOG_DEBUG, "Dropping one incompatible voice frame on '%s' to '%s'\n", ast->name, p->chan->name);
res = 0;
}
} else } else
res = 0; res = 0;
CLEANUP(ast, p); CLEANUP(ast, p);

9
channels/chan_local.c
View File

@@ -91,8 +91,13 @@ retrylock:
if (ast_mutex_trylock(&other->lock)) { if (ast_mutex_trylock(&other->lock)) {
/* Failed to lock. Release main lock and try again */ /* Failed to lock. Release main lock and try again */
ast_mutex_unlock(&p->lock); ast_mutex_unlock(&p->lock);
if (us) if (us) {
ast_mutex_unlock(&us->lock); if (ast_mutex_unlock(&us->lock)) {
ast_log(LOG_WARNING, "%s wasn't locked while sending %d/%d\n",
us->name, f->frametype, f->subclass);
us = NULL;
}
}
/* Wait just a bit */ /* Wait just a bit */
usleep(1); usleep(1);
/* Only we can destroy ourselves, so we can't disappear here */ /* Only we can destroy ourselves, so we can't disappear here */