kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-04 03:20:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 117135 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/trunk@117136 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2008-05-19 16:53:33 +00:00
parent 872eaba11d
commit a5cb416c86
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
res/res_smdi.c
View File

@@ -419,6 +419,19 @@ static void *smdi_message_wait(struct ast_smdi_interface *iface, int timeout,
struct timeval start; struct timeval start;
long diff = 0; long diff = 0;
void *msg; 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(); start = ast_tvnow();
@@ -440,7 +453,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 /* If there were no messages in the queue, then go to sleep until one
* arrives. */ * 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, search_key, options))) { if ((msg = smdi_msg_find(iface, type, search_key, options))) {
unlock_msg_q(iface, type); unlock_msg_q(iface, type);