kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-03 12:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 154428 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r154428 | tilghman | 2008-11-04 17:03:00 -0600 (Tue, 04 Nov 2008) | 7 lines
  
  Switch to using a thread condition to signal that a child thread is ready for
  work, rather than a busy wait.
  (closes issue #13011)
   Reported by: jpgrayson
   Patches: 
         chan_iax2_find_idle.patch uploaded by jpgrayson (license 492)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@154917 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-11-05 22:00:56 +00:00
parent 5dd7e8911e
commit 5a2f0feb1c
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
channels/chan_iax2.c
View File

@@ -778,7 +778,8 @@ struct iax2_thread {
time_t checktime;
ast_mutex_t lock;
ast_cond_t cond;
unsigned int ready_for_signal:1;
ast_mutex_t init_lock;
ast_cond_t init_cond;
/*! if this thread is processing a full frame,
some information about that frame will be stored
here, so we can avoid dispatching any more full
@@ -1119,6 +1120,9 @@ static struct iax2_thread *find_idle_thread(void)
/* Initialize lock and condition */
ast_mutex_init(&thread->lock);
ast_cond_init(&thread->cond, NULL);
ast_mutex_init(&thread->init_lock);
ast_cond_init(&thread->init_cond, NULL);
ast_mutex_lock(&thread->init_lock);
/* Create thread and send it on it's way */
if (ast_pthread_create_detached_background(&thread->threadid, NULL, iax2_process_thread, thread)) {
@@ -1133,8 +1137,10 @@ static struct iax2_thread *find_idle_thread(void)
memset(&thread->ffinfo, 0, sizeof(thread->ffinfo));
/* Wait for the thread to be ready before returning it to the caller */
while (!thread->ready_for_signal)
usleep(1);
ast_cond_wait(&thread->init_cond, &thread->init_lock);
/* Done with init_lock */
ast_mutex_unlock(&thread->init_lock);
return thread;
}
@@ -9737,6 +9743,8 @@ static void iax2_process_thread_cleanup(void *data)
struct iax2_thread *thread = data;
ast_mutex_destroy(&thread->lock);
ast_cond_destroy(&thread->cond);
ast_mutex_destroy(&thread->init_lock);
ast_cond_destroy(&thread->init_cond);
ast_free(thread);
ast_atomic_dec_and_test(&iaxactivethreadcount);
}
@@ -9747,6 +9755,7 @@ static void *iax2_process_thread(void *data)
struct timeval wait;
struct timespec ts;
int put_into_idle = 0;
int first_time = 1;
ast_atomic_fetchadd_int(&iaxactivethreadcount,1);
pthread_cleanup_push(iax2_process_thread_cleanup, data);
@@ -9755,8 +9764,11 @@ static void *iax2_process_thread(void *data)
ast_mutex_lock(&thread->lock);
/* Flag that we're ready to accept signals */
thread->ready_for_signal = 1;
if (first_time) {
signal_condition(&thread->init_lock, &thread->init_cond);
first_time = 0;
}
/* Put into idle list if applicable */
if (put_into_idle)
insert_idle_thread(thread);