kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix more comments 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4443 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Brian West 2007-03-04 01:50:52 +00:00
parent 343c2210da
commit 0c3180866d
1 changed files with 42 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/switch_event.c
View File

@ -41,8 +41,8 @@ static switch_mutex_t *EVENT_QUEUE_MUTEX = NULL;
static switch_mutex_t *EVENT_QUEUE_HAVEMORE_MUTEX = NULL; static switch_mutex_t *EVENT_QUEUE_HAVEMORE_MUTEX = NULL;
static switch_thread_cond_t *EVENT_QUEUE_CONDITIONAL = NULL; static switch_thread_cond_t *EVENT_QUEUE_CONDITIONAL = NULL;
static switch_memory_pool_t *RUNTIME_POOL = NULL; static switch_memory_pool_t *RUNTIME_POOL = NULL;
//static switch_memory_pool_t *APOOL = NULL; /* static switch_memory_pool_t *APOOL = NULL; */
//static switch_memory_pool_t *BPOOL = NULL; /* static switch_memory_pool_t *BPOOL = NULL; */
static switch_memory_pool_t *THRUNTIME_POOL = NULL; static switch_memory_pool_t *THRUNTIME_POOL = NULL;
static switch_queue_t *EVENT_QUEUE[3] = {0,0,0}; static switch_queue_t *EVENT_QUEUE[3] = {0,0,0};
static int POOL_COUNT_MAX = SWITCH_CORE_QUEUE_LEN; static int POOL_COUNT_MAX = SWITCH_CORE_QUEUE_LEN;
@ -209,34 +209,36 @@ static void *SWITCH_THREAD_FUNC switch_event_thread(switch_thread_t *thread, voi
if (!any) { if (!any) {
//lock on havemore so we are the only ones poking at it while we check it /* lock on havemore so we are the only ones poking at it while we check it
//see if we saw anything in the queues or have a check again flag * see if we saw anything in the queues or have a check again flag
*/
switch_mutex_lock(EVENT_QUEUE_HAVEMORE_MUTEX); switch_mutex_lock(EVENT_QUEUE_HAVEMORE_MUTEX);
if(!EVENT_QUEUE_HAVEMORE) { if(!EVENT_QUEUE_HAVEMORE) {
//See if we need to quit /* See if we need to quit */
if (THREAD_RUNNING != 1) { if (THREAD_RUNNING != 1) {
//give up our lock /* give up our lock */
switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX); switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX);
//Game over /* game over */
break; break;
} }
//give up our lock /* give up our lock */
switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX); switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX);
//wait until someone tells us we have something to do /* wait until someone tells us we have something to do */
switch_thread_cond_wait(EVENT_QUEUE_CONDITIONAL, EVENT_QUEUE_MUTEX); switch_thread_cond_wait(EVENT_QUEUE_CONDITIONAL, EVENT_QUEUE_MUTEX);
} else { } else {
//Caught a race, one of the queues was updated after we looked at it /* Caught a race, one of the queues was updated after we looked at it
//reset our flag * reset our flag
*/
EVENT_QUEUE_HAVEMORE = 0; EVENT_QUEUE_HAVEMORE = 0;
//Give up our lock /* give up our lock */
switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX); switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX);
} }
//go grab some events /* go grab some events */
continue; continue;
} }
@ -348,24 +350,27 @@ SWITCH_DECLARE(switch_status_t) switch_event_shutdown(void)
if (THREAD_RUNNING > 0) { if (THREAD_RUNNING > 0) {
THREAD_RUNNING = -1; THREAD_RUNNING = -1;
//Lock on havemore to make sure he event thread, if currently running /* lock on havemore to make sure he event thread, if currently running
// doesn't check the HAVEMORE flag before we set it * doesn't check the HAVEMORE flag before we set it
*/
switch_mutex_lock(EVENT_QUEUE_HAVEMORE_MUTEX); switch_mutex_lock(EVENT_QUEUE_HAVEMORE_MUTEX);
//See if the event thread is sitting /* see if the event thread is sitting */
if(switch_mutex_trylock(EVENT_QUEUE_MUTEX) == SWITCH_STATUS_SUCCESS) { if(switch_mutex_trylock(EVENT_QUEUE_MUTEX) == SWITCH_STATUS_SUCCESS) {
//we don't need havemore anymore, the thread was sitting already /* we don't need havemore anymore, the thread was sitting already */
switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX); switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX);
//wake up the event thread /* wake up the event thread */
switch_thread_cond_signal(EVENT_QUEUE_CONDITIONAL); switch_thread_cond_signal(EVENT_QUEUE_CONDITIONAL);
//give up our lock /* give up our lock */
switch_mutex_unlock(EVENT_QUEUE_MUTEX); switch_mutex_unlock(EVENT_QUEUE_MUTEX);
} else { // it wasn't waiting which means we might have updated a queue it already looked at } else {
//set a flag so it knows to read the queues again /* it wasn't waiting which means we might have updated a queue it already looked at
* set a flag so it knows to read the queues again
*/
EVENT_QUEUE_HAVEMORE = 1; EVENT_QUEUE_HAVEMORE = 1;
//variable updated, give up the mutex /* variable updated, give up the mutex */
switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX); switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX);
} }
@ -401,7 +406,7 @@ SWITCH_DECLARE(switch_status_t) switch_event_init(switch_memory_pool_t *pool)
return SWITCH_STATUS_MEMERR; return SWITCH_STATUS_MEMERR;
} }
*/ */
//THRUNTIME_POOL = APOOL; /* THRUNTIME_POOL = APOOL; */
switch_queue_create(&EVENT_QUEUE[0], POOL_COUNT_MAX + 10, THRUNTIME_POOL); switch_queue_create(&EVENT_QUEUE[0], POOL_COUNT_MAX + 10, THRUNTIME_POOL);
switch_queue_create(&EVENT_QUEUE[1], POOL_COUNT_MAX + 10, THRUNTIME_POOL); switch_queue_create(&EVENT_QUEUE[1], POOL_COUNT_MAX + 10, THRUNTIME_POOL);
switch_queue_create(&EVENT_QUEUE[2], POOL_COUNT_MAX + 10, THRUNTIME_POOL); switch_queue_create(&EVENT_QUEUE[2], POOL_COUNT_MAX + 10, THRUNTIME_POOL);
@ -627,7 +632,7 @@ SWITCH_DECLARE(switch_status_t) switch_event_serialize(switch_event_t *event, ch
return SWITCH_STATUS_MEMERR; return SWITCH_STATUS_MEMERR;
} }
//switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "hit serialze!.\n"); /* switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "hit serialze!.\n"); */
for (hp = event->headers; hp; hp = hp->next) { for (hp = event->headers; hp; hp = hp->next) {
/* /*
* grab enough memory to store 3x the string (url encode takes one char and turns it into %XX) * grab enough memory to store 3x the string (url encode takes one char and turns it into %XX)
@ -641,7 +646,7 @@ SWITCH_DECLARE(switch_status_t) switch_event_serialize(switch_event_t *event, ch
if(encode_len < new_len) { if(encode_len < new_len) {
char* tmp; char* tmp;
//switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Allocing %d was %d.\n", ((strlen(hp->value) * 3) + 1), encode_len); /* switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Allocing %d was %d.\n", ((strlen(hp->value) * 3) + 1), encode_len); */
/* we can use realloc for initial alloc as well, if encode_buf is zero it treats it as a malloc */ /* we can use realloc for initial alloc as well, if encode_buf is zero it treats it as a malloc */
/* keep track of the size of our allocation */ /* keep track of the size of our allocation */
@ -834,24 +839,27 @@ SWITCH_DECLARE(switch_status_t) switch_event_fire_detailed(char *file, char *fun
switch_queue_push(EVENT_QUEUE[(*event)->priority], *event); switch_queue_push(EVENT_QUEUE[(*event)->priority], *event);
//Lock on havemore to make sure he event thread, if currently running /* lock on havemore to make sure he event thread, if currently running
// doesn't check the HAVEMORE flag before we set it * doesn't check the HAVEMORE flag before we set it
*/
switch_mutex_lock(EVENT_QUEUE_HAVEMORE_MUTEX); switch_mutex_lock(EVENT_QUEUE_HAVEMORE_MUTEX);
//See if the event thread is sitting /* see if the event thread is sitting */
if(switch_mutex_trylock(EVENT_QUEUE_MUTEX) == SWITCH_STATUS_SUCCESS) { if(switch_mutex_trylock(EVENT_QUEUE_MUTEX) == SWITCH_STATUS_SUCCESS) {
//we don't need havemore anymore, the thread was sitting already /* we don't need havemore anymore, the thread was sitting already */
switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX); switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX);
//wake up the event thread /* wake up the event thread */
switch_thread_cond_signal(EVENT_QUEUE_CONDITIONAL); switch_thread_cond_signal(EVENT_QUEUE_CONDITIONAL);
//give up our lock /* give up our lock */
switch_mutex_unlock(EVENT_QUEUE_MUTEX); switch_mutex_unlock(EVENT_QUEUE_MUTEX);
} else { // it wasn't waiting which means we might have updated a queue it already looked at } else {
//set a flag so it knows to read the queues again /* it wasn't waiting which means we might have updated a queue it already looked at
* set a flag so it knows to read the queues again
*/
EVENT_QUEUE_HAVEMORE = 1; EVENT_QUEUE_HAVEMORE = 1;
//variable updated, give up the mutex /* variable updated, give up the mutex */
switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX); switch_mutex_unlock(EVENT_QUEUE_HAVEMORE_MUTEX);
} }