kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-06-24 01:08:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 78028 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r78028 | russell | 2007-08-02 21:04:22 -0500 (Thu, 02 Aug 2007) | 6 lines

Don't reuse the timespec that was set to 0 in the previous timedwait as it
will just return immediately.  Also, fix some logic so the thread's lock
isn't unlocked twice in the weird case of dynamic threads getting acquired
right after a timeout.
(pointed out by SteveK)

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@78029 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-08-03 02:05:02 +00:00
parent 1064b75ab7
commit bcabfbb89a
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_iax2.c
+2 -5
View File
@@ -8413,15 +8413,12 @@ static void *iax2_process_thread(void *data)
/* Someone grabbed our thread *right* after we timed out.
* Wait for them to set us up with something to do and signal
* us to continue. */
ast_cond_timedwait(&thread->cond, &thread->lock, &ts);
ast_mutex_unlock(&thread->lock);
ast_cond_wait(&thread->cond, &thread->lock);
}
if (!t)
ast_mutex_unlock(&thread->lock);
} else {
ast_cond_wait(&thread->cond, &thread->lock);
ast_mutex_unlock(&thread->lock);
}
ast_mutex_unlock(&thread->lock);
/* Add ourselves to the active list now */
AST_LIST_LOCK(&active_list);