[Freeswitch-trunk] [commit] r12544 - freeswitch/trunk/src

[FreeSWITCH SVN]

Author: anthm
Date: Mon Mar  9 17:51:31 2009
New Revision: 12544

Log:
declinatio mortuus obfirmo in fsctl hupall

Modified:
   freeswitch/trunk/src/switch_core_session.c

Modified: freeswitch/trunk/src/switch_core_session.c
==============================================================================
--- freeswitch/trunk/src/switch_core_session.c	(original)
+++ freeswitch/trunk/src/switch_core_session.c	Mon Mar  9 17:51:31 2009
@@ -81,6 +81,12 @@
 	switch_hash_index_t *hi;
 	void *val;
 	switch_core_session_t *session;
+	switch_memory_pool_t *pool;
+	switch_queue_t *queue;
+	void *pop;
+	
+	switch_core_new_memory_pool(&pool);
+	switch_queue_create(&queue, 250000, pool);
 
 	if (!var_val) return;
 
@@ -93,13 +99,25 @@
 			if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) {
 				if (switch_channel_up(session->channel) &&
 					(this_val = switch_channel_get_variable(session->channel, var_name)) && (!strcmp(this_val, var_val))) {
-					switch_channel_hangup(session->channel, cause);
+					switch_queue_push(queue, switch_core_strdup(pool, session->uuid_str));
 				}
 				switch_core_session_rwunlock(session);
 			}
 		}
 	}
 	switch_mutex_unlock(runtime.session_hash_mutex);
+
+	while(switch_queue_trypop(queue, &pop) == SWITCH_STATUS_SUCCESS && pop) {
+		char *uuid = (char *) pop;
+		
+		if ((session = switch_core_session_locate(uuid))) {
+			switch_channel_hangup(session->channel, cause);
+			switch_core_session_rwunlock(session);
+		}
+	}
+
+	switch_core_destroy_memory_pool(&pool);
+
 }	
 
 SWITCH_DECLARE(void) switch_core_session_hupall_endpoint(const switch_endpoint_interface_t *endpoint_interface, switch_call_cause_t cause)
@@ -107,6 +125,12 @@
 	switch_hash_index_t *hi;
 	void *val;
 	switch_core_session_t *session;
+	switch_memory_pool_t *pool;
+	switch_queue_t *queue;
+	void *pop;
+	
+	switch_core_new_memory_pool(&pool);
+	switch_queue_create(&queue, 250000, pool);
 
 	switch_mutex_lock(runtime.session_hash_mutex);
 	for (hi = switch_hash_first(NULL, session_manager.session_table); hi; hi = switch_hash_next(hi)) {
@@ -115,13 +139,25 @@
 			session = (switch_core_session_t *) val;
 			if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) {
 				if (session->endpoint_interface == endpoint_interface) {
-					switch_channel_hangup(switch_core_session_get_channel(session), cause);
+					switch_queue_push(queue, switch_core_strdup(pool, session->uuid_str));
 				}
 				switch_core_session_rwunlock(session);
 			}
 		}
 	}
 	switch_mutex_unlock(runtime.session_hash_mutex);
+
+	while(switch_queue_trypop(queue, &pop) == SWITCH_STATUS_SUCCESS && pop) {
+		char *uuid = (char *) pop;
+		
+		if ((session = switch_core_session_locate(uuid))) {
+			switch_channel_hangup(session->channel, cause);
+			switch_core_session_rwunlock(session);
+		}
+	}
+
+	switch_core_destroy_memory_pool(&pool);
+
 }	
 
 SWITCH_DECLARE(void) switch_core_session_hupall(switch_call_cause_t cause)
@@ -129,28 +165,37 @@
 	switch_hash_index_t *hi;
 	void *val;
 	switch_core_session_t *session;
-	uint32_t loops = 0;
+	switch_memory_pool_t *pool;
+	switch_queue_t *queue;
+	void *pop;
 	
-	while (session_manager.session_count > 0) {
-		switch_mutex_lock(runtime.session_hash_mutex);
-		for (hi = switch_hash_first(NULL, session_manager.session_table); hi; hi = switch_hash_next(hi)) {
-			switch_hash_this(hi, NULL, NULL, &val);
-			if (val) {
-				session = (switch_core_session_t *) val;
-				if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) {
-					switch_channel_hangup(switch_core_session_get_channel(session), cause);
-					switch_core_session_rwunlock(session);
-				}
+	switch_core_new_memory_pool(&pool);
+	switch_queue_create(&queue, 250000, pool);
+
+	switch_mutex_lock(runtime.session_hash_mutex);
+	for (hi = switch_hash_first(NULL, session_manager.session_table); hi; hi = switch_hash_next(hi)) {
+		switch_hash_this(hi, NULL, NULL, &val);
+		if (val) {
+			session = (switch_core_session_t *) val;
+			if (switch_core_session_read_lock(session) == SWITCH_STATUS_SUCCESS) {
+				switch_queue_push(queue, switch_core_strdup(pool, session->uuid_str));
+				switch_core_session_rwunlock(session);
 			}
 		}
-		switch_mutex_unlock(runtime.session_hash_mutex);
-		switch_yield(1000000);
-		if (++loops == 30) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Giving up with %d session%s remaining\n",
-							  session_manager.session_count, session_manager.session_count == 1 ? "" : "s");
-			break;
+	}
+	switch_mutex_unlock(runtime.session_hash_mutex);
+	
+	while(switch_queue_trypop(queue, &pop) == SWITCH_STATUS_SUCCESS && pop) {
+		char *uuid = (char *) pop;
+		
+		if ((session = switch_core_session_locate(uuid))) {
+			switch_channel_hangup(session->channel, cause);
+			switch_core_session_rwunlock(session);
 		}
 	}
+
+	switch_core_destroy_memory_pool(&pool);
+	
 }