kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 04:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the case where a dynamic thread times out waiting for something to do

Browse Source 
during the first time it runs.  This shouldn't ever happen, but we should
account for it anyway.
(pointed out by pete, who works with mihai)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@77949 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2007-08-02 19:25:14 +00:00
parent 4386df68d9
commit 311841c1b3
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
channels/chan_iax2.c
View File

@@ -7874,14 +7874,23 @@ static void *iax2_process_thread(void *data)
ts.tv_sec = tv.tv_sec;
ts.tv_nsec = tv.tv_usec * 1000;
if (ast_cond_timedwait(&thread->cond, &thread->lock, &ts) == ETIMEDOUT) {
/* This thread was never put back into the available dynamic
* thread list, so just go away. */
if (!put_into_idle) {
ast_mutex_unlock(&thread->lock);
break;
}
AST_LIST_LOCK(&dynamic_list);
/* Account for the case where this thread is acquired *right* after a timeout */
if ((t = AST_LIST_REMOVE(&dynamic_list, thread, list)))
iaxdynamicthreadcount--;
AST_LIST_UNLOCK(&dynamic_list);
if (t) {
/* This dynamic thread timed out waiting for a task and was
* not acquired immediately after the timeout,
* so it's time to go away. */
ast_mutex_unlock(&thread->lock);
break; /* exiting the main loop */
break;
}
/* Someone grabbed our thread *right* after we timed out.
* Wait for them to set us up with something to do and signal