make events queue in the bg

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@152 d0543943-73ff-0310-b7d9-9358b9ac24b2

configure.in

@@ -30,7 +30,7 @@ AC_PROG_GCC_TRADITIONAL
 AC_FUNC_MALLOC
 AC_TYPE_SIGNAL
 AC_FUNC_STRFTIME
-AC_CHECK_FUNCS([gethostname])
+AC_CHECK_FUNCS([gethostname vasprintf])
 
 AC_CONFIG_FILES([Makefile
 			libs/jrtp4c/Makefile

src/include/config.h.in

@@ -55,6 +55,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Define to 1 if you have the `vasprintf' function. */
+#undef HAVE_VASPRINTF
+
 /* Name of package */
 #undef PACKAGE
 

src/include/switch.h

@@ -35,15 +35,15 @@
 extern "C" {
 #endif
 
-#if (_MSC_VER >= 1400) // VC8+
-#ifndef _CRT_SECURE_NO_DEPRECATE
-#define _CRT_SECURE_NO_DEPRECATE
-#endif
-#ifndef _CRT_NONSTDC_NO_DEPRECATE
-#define _CRT_NONSTDC_NO_DEPRECATE
-#endif
-#endif // VC8+
-
+#if (_MSC_VER >= 1400) // VC8+
+#ifndef _CRT_SECURE_NO_DEPRECATE
+#define _CRT_SECURE_NO_DEPRECATE
+#endif
+#ifndef _CRT_NONSTDC_NO_DEPRECATE
+#define _CRT_NONSTDC_NO_DEPRECATE
+#endif
+#endif // VC8+
+
 #include <apr.h>
 #include <apr_network_io.h>
 #include <apr_errno.h>
@@ -118,6 +118,11 @@ extern "C" {
 #include <switch_buffer.h>
 #include <switch_event.h>
 
+#ifndef WIN32
+#include <config.h>
+#endif
+
+
 #ifdef __cplusplus
 }
 #endif

src/include/switch_types.h

@@ -132,6 +132,8 @@ typedef enum {
 	SWITCH_EVENT_ANSWER_CHAN,
 	SWITCH_EVENT_HANGUP_CHAN,
 	SWITCH_EVENT_STARTUP,
+	SWITCH_EVENT_EVENT_SHUTDOWN,
+	SWITCH_EVENT_SHUTDOWN,
 	SWITCH_EVENT_ALL
 } switch_event_t;
 

src/mod/mod_event_test/mod_event_test.c

@@ -57,3 +57,15 @@ SWITCH_MOD_DECLARE(switch_status) switch_module_load(switch_loadable_module_inte
 	return SWITCH_STATUS_SUCCESS;
 }
 
+#ifdef TORTURE_ME
+SWITCH_MOD_DECLARE(switch_status) switch_module_runtime(void)
+{
+	for(;;) {
+		int x;
+		for(x = 0; x < 100; x++) {
+			switch_event_fire(SWITCH_EVENT_CUSTOM, "hello world");
+		}
+		switch_yield(100000);
+	}
+}
+#endif

src/switch_console.c

@@ -30,6 +30,7 @@
  *
  */
 #include <switch_console.h>
+#include <switch.h>
 
 static int switch_console_process(char *cmd)
 {
@@ -98,7 +99,7 @@ SWITCH_DECLARE(void) switch_console_printf(switch_text_channel channel, char *fi
 		filep = p + 1;
 	}
 
-#ifdef vasprintf
+#ifdef HAVE_VASPRINTF
 	ret = vasprintf(&data, fmt, ap);
 #else
 	data = (char *) malloc(2048);

src/switch_core.c

@@ -1549,16 +1549,6 @@ SWITCH_DECLARE(switch_status) switch_core_init(void)
 SWITCH_DECLARE(switch_status) switch_core_destroy(void)
 {
 
-	switch_event_shutdown();
-	switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Closing Event Engine.\n");
-
-	if (runtime.memory_pool) {
-		apr_pool_destroy(runtime.memory_pool);
-		apr_terminate();
-		switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Unallocated memory pool.\n");
-
-	}
-
 #ifdef EMBED_PERL
 	if (runtime.my_perl) {
 		perl_destruct(runtime.my_perl);
@@ -1568,6 +1558,15 @@ SWITCH_DECLARE(switch_status) switch_core_destroy(void)
 	}
 #endif
 
+	switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Closing Event Engine.\n");
+	switch_event_shutdown();
+
+	if (runtime.memory_pool) {
+		switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Unallocating memory pool.\n");
+		apr_pool_destroy(runtime.memory_pool);
+		apr_terminate();
+	}
+
 	return SWITCH_STATUS_SUCCESS;
 }
 

src/switch_event.c

@@ -34,8 +34,8 @@
 static switch_event *EVENT_QUEUE_HEAD;
 static switch_event *EVENT_QUEUE_WORK;
 static switch_event_node *EVENT_NODES[SWITCH_EVENT_ALL+1] = {NULL};
-static switch_mutex_t *ELOCK = NULL;
-static switch_mutex_t *MUTEX = NULL;
+static switch_mutex_t *BLOCK = NULL;
+static switch_mutex_t *QLOCK = NULL;
 static switch_memory_pool *EPOOL = NULL;
 switch_thread_cond_t *COND;
 
@@ -51,6 +51,8 @@ static char *EVENT_NAMES[] = {
 	"ANSWER_CHAN",
 	"HANGUP_CHAN",
 	"STARTUP",
+	"EVENT_SHUTDOWN",
+	"SHUTDOWN",
 	"ALL"
 };
 
@@ -59,43 +61,46 @@ static void * SWITCH_THREAD_FUNC switch_event_thread(switch_thread *thread, void
 	switch_event_node *enp;
 	switch_event *event = NULL, *out_event = NULL;
 	switch_event_t e;
+	switch_mutex_t *mutex = NULL;
 
-	assert(ELOCK != NULL);
+	switch_mutex_init(&mutex, SWITCH_MUTEX_NESTED, EPOOL);
+	switch_thread_cond_create(&COND, EPOOL);	
+	switch_mutex_lock(mutex);
+
+	assert(QLOCK != NULL);
 	assert(EPOOL != NULL);
 
 	THREAD_RUNNING = 1;
 	while(THREAD_RUNNING == 1) {
-		switch_thread_cond_wait(COND, MUTEX);
-
-		if (THREAD_RUNNING == 1) {
-			switch_mutex_lock(ELOCK);
-			/* <LOCKED> -----------------------------------------------*/
-			EVENT_QUEUE_WORK = EVENT_QUEUE_HEAD;
-			EVENT_QUEUE_HEAD = NULL;
-			switch_mutex_unlock(ELOCK);
-			/* </LOCKED> -----------------------------------------------*/
-		}
+		switch_thread_cond_wait(COND, mutex);
+		switch_mutex_lock(QLOCK);
+		/* <LOCKED> -----------------------------------------------*/
+		EVENT_QUEUE_WORK = EVENT_QUEUE_HEAD;
+		EVENT_QUEUE_HEAD = NULL;
+		switch_mutex_unlock(QLOCK);
+		/* </LOCKED> -----------------------------------------------*/
 
 		for(event = EVENT_QUEUE_WORK; event;) {
 			out_event = event;
 			event = event->next;
 			out_event->next = NULL;
-			if (THREAD_RUNNING == 1) {
-				for(e = out_event->event;; e = SWITCH_EVENT_ALL) {
-					for(enp = EVENT_NODES[e]; enp; enp = enp->next) {
-						if ((enp->event == out_event->event || enp->event == SWITCH_EVENT_ALL) && (enp->subclass == out_event->subclass || enp->subclass < 0)) {
-							enp->callback(out_event);
-						}
+			for(e = out_event->event;; e = SWITCH_EVENT_ALL) {
+				for(enp = EVENT_NODES[e]; enp; enp = enp->next) {
+					if ((enp->event == out_event->event || enp->event == SWITCH_EVENT_ALL) && (enp->subclass == out_event->subclass || enp->subclass < 0)) {
+						enp->callback(out_event);
 					}
+				}
 		
-					if (e == SWITCH_EVENT_ALL) {
-						break;
-					}
+				if (e == SWITCH_EVENT_ALL) {
+					break;
 				}
 			}
+
 			free(out_event->data);
 			free(out_event);
 		}
+
+	
 	}
 	THREAD_RUNNING = 0;
 	return NULL;
@@ -104,7 +109,7 @@ static void * SWITCH_THREAD_FUNC switch_event_thread(switch_thread *thread, void
 
 SWITCH_DECLARE(char *) switch_event_name(switch_event_t event)
 {
-	assert(ELOCK != NULL);
+	assert(BLOCK != NULL);
 	assert(EPOOL != NULL);
 
 	return EVENT_NAMES[event];
@@ -114,10 +119,9 @@ SWITCH_DECLARE(switch_status) switch_event_shutdown(void)
 {
 	THREAD_RUNNING = -1;
 
-	switch_thread_cond_signal(COND);
-
+	switch_event_fire(SWITCH_EVENT_EVENT_SHUTDOWN, "Event System Shutting Down");
 	while(THREAD_RUNNING) {
-		switch_yield(100);
+		switch_yield(1000);
 	}
 	return SWITCH_STATUS_SUCCESS;
 }
@@ -133,20 +137,19 @@ SWITCH_DECLARE(switch_status) switch_event_init(switch_memory_pool *pool)
 	assert(pool != NULL);
 	EPOOL = pool;
 	switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Activate Eventing Engine.\n");
-	switch_mutex_init(&ELOCK, SWITCH_MUTEX_NESTED, EPOOL);
+	switch_mutex_init(&BLOCK, SWITCH_MUTEX_NESTED, EPOOL);
+	switch_mutex_init(&QLOCK, SWITCH_MUTEX_NESTED, EPOOL);
 
-	switch_mutex_init(&MUTEX, SWITCH_MUTEX_NESTED, pool);
-	switch_thread_cond_create(&COND, pool);	
-	switch_mutex_lock(MUTEX);
-	
     switch_thread_create(&thread,
 						 thd_attr,
 						 switch_event_thread,
 						 NULL,
-						 pool
+						 EPOOL
 						 );
 
-
+	while(!THREAD_RUNNING) {
+		switch_yield(1000);
+	}
 	return SWITCH_STATUS_SUCCESS;
 
 }
@@ -154,9 +157,9 @@ SWITCH_DECLARE(switch_status) switch_event_init(switch_memory_pool *pool)
 SWITCH_DECLARE(switch_status) switch_event_fire_subclass(switch_event_t event, int subclass, char *data)
 {
 
-	switch_event *new_event;
+	switch_event *new_event, *ep;
 
-	assert(ELOCK != NULL);
+	assert(BLOCK != NULL);
 	assert(EPOOL != NULL);
 
 	if (!(new_event = malloc(sizeof(*new_event)))) {
@@ -168,15 +171,17 @@ SWITCH_DECLARE(switch_status) switch_event_fire_subclass(switch_event_t event, i
 	new_event->subclass = subclass;
 	new_event->data = strdup(data ? data : "");
 	
-	switch_mutex_lock(ELOCK);
+	switch_mutex_lock(QLOCK);
 	/* <LOCKED> -----------------------------------------------*/
-	if (EVENT_QUEUE_HEAD) {
-		new_event->next = EVENT_QUEUE_HEAD;
+	for(ep = EVENT_QUEUE_HEAD; ep && ep->next; ep = ep->next);
+
+	if (ep) {
+		ep->next = new_event;
+	} else {
+		EVENT_QUEUE_HEAD = new_event;
 	}
-	EVENT_QUEUE_HEAD = new_event;
-	switch_mutex_unlock(ELOCK);
+	switch_mutex_unlock(QLOCK);
 	/* </LOCKED> -----------------------------------------------*/
-	
 	switch_thread_cond_signal(COND);
 	return SWITCH_STATUS_SUCCESS;
 }
@@ -185,11 +190,11 @@ SWITCH_DECLARE(switch_status) switch_event_bind(char *id, switch_event_t event,
 {
 	switch_event_node *event_node;
 
-	assert(ELOCK != NULL);
+	assert(BLOCK != NULL);
 	assert(EPOOL != NULL);
 
 	if (event <= SWITCH_EVENT_ALL && (event_node = switch_core_alloc(EPOOL, sizeof(switch_event_node)))) {
-		switch_mutex_lock(ELOCK);
+		switch_mutex_lock(BLOCK);
 		/* <LOCKED> -----------------------------------------------*/
 		event_node->id = switch_core_strdup(EPOOL, id);
 		event_node->event = event;
@@ -199,7 +204,7 @@ SWITCH_DECLARE(switch_status) switch_event_bind(char *id, switch_event_t event,
 			event_node->next = EVENT_NODES[event];
 		}
 		EVENT_NODES[event] = event_node;
-		switch_mutex_unlock(ELOCK);
+		switch_mutex_unlock(BLOCK);
 		/* </LOCKED> -----------------------------------------------*/
 		return SWITCH_STATUS_SUCCESS;
 	}