diff options
author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-19 16:58:10 +0000 |
---|---|---|
committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-05-19 16:58:10 +0000 |
commit | 69eeb6ef96eefa6f6f6150fb3e40d2ff9a9243b4 (patch) | |
tree | 86595a7c547588d54924bbc3da8319f030d056c4 /res/res_smdi.c | |
parent | aa20df49d6411fc25c209cda1bff02d1feffcb7c (diff) |
Merged revisions 117136 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r117136 | file | 2008-05-19 13:53:33 -0300 (Mon, 19 May 2008) | 14 lines
Merged revisions 117135 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r117135 | file | 2008-05-19 13:50:52 -0300 (Mon, 19 May 2008) | 6 lines
Use the right pthread lock and condition when waiting.
(closes issue #12664)
Reported by: tomo1657
Patches:
res_smdi.c.patch uploaded by tomo1657 (license 484)
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@117137 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res/res_smdi.c')
-rw-r--r-- | res/res_smdi.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/res/res_smdi.c b/res/res_smdi.c index 23fddada8..69a34ff59 100644 --- a/res/res_smdi.c +++ b/res/res_smdi.c @@ -389,6 +389,19 @@ static void *smdi_message_wait(struct ast_smdi_interface *iface, int timeout, struct timeval start; long diff = 0; void *msg; + ast_cond_t *cond = NULL; + ast_mutex_t *lock = NULL; + + switch (type) { + case SMDI_MWI: + cond = &iface->mwi_q_cond; + lock = &iface->mwi_q_lock; + break; + case SMDI_MD: + cond = &iface->md_q_cond; + lock = &iface->md_q_lock; + break; + } start = ast_tvnow(); @@ -410,7 +423,7 @@ static void *smdi_message_wait(struct ast_smdi_interface *iface, int timeout, /* If there were no messages in the queue, then go to sleep until one * arrives. */ - ast_cond_timedwait(&iface->md_q_cond, &iface->md_q_lock, &ts); + ast_cond_timedwait(cond, lock, &ts); if ((msg = smdi_msg_find(iface, type, station))) { unlock_msg_q(iface, type); |