redo some stuff

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

src/include/private/switch_core_pvt.h

@@ -121,7 +121,6 @@ struct switch_core_session {
 
 	switch_mutex_t *mutex;
 	switch_mutex_t *resample_mutex;
-	switch_mutex_t *signal_mutex;
 	switch_thread_cond_t *cond;
 
 	switch_thread_rwlock_t *rwlock;

src/include/switch_core.h

@@ -297,9 +297,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_destroy(void);
 ///\ingroup core1
 ///\{
 
-SWITCH_DECLARE(switch_status_t) switch_core_session_signal_lock(switch_core_session_t *session);
-SWITCH_DECLARE(switch_status_t) switch_core_session_signal_unlock(switch_core_session_t *session);
-
 #ifdef SWITCH_DEBUG_RWLOCKS
 SWITCH_DECLARE(switch_status_t) switch_core_session_perform_read_lock(_In_ switch_core_session_t *session, const char *file, const char *func, int line);
 #endif

src/mod/endpoints/mod_iax/mod_iax.c

@@ -938,7 +938,6 @@ SWITCH_MODULE_RUNTIME_FUNCTION(mod_iax_runtime)
 
 			if ((tech_pvt = iax_get_private(iaxevent->session))) {
 				channel = switch_core_session_get_channel(tech_pvt->session);
-				switch_core_session_signal_lock(tech_pvt->session);
 			}
 
 			if (globals.debug && iaxevent->etype != IAX_EVENT_VOICE) {
@@ -1122,9 +1121,6 @@ SWITCH_MODULE_RUNTIME_FUNCTION(mod_iax_runtime)
 			}
 			iax_event_free(iaxevent);
 			switch_mutex_unlock(globals.mutex);
-			if (tech_pvt && tech_pvt->session) {
-				switch_core_session_signal_unlock(tech_pvt->session);
-			}
 		}
 	}
 

src/mod/endpoints/mod_sofia/mod_sofia.h

@@ -467,6 +467,7 @@ struct private_object {
 	unsigned long rm_rate;
 	switch_payload_t pt;
 	switch_mutex_t *flag_mutex;
+	switch_mutex_t *sofia_mutex;
 	switch_payload_t te;
 	switch_payload_t bte;
 	switch_payload_t cng_pt;

src/mod/endpoints/mod_sofia/sofia.c

@@ -180,6 +180,7 @@ void sofia_event_callback(nua_event_t event,
 		} else if (!switch_strlen_zero(sofia_private->uuid)) {
 			if ((session = switch_core_session_locate(sofia_private->uuid))) {
 				tech_pvt = switch_core_session_get_private(session);
+				switch_assert(tech_pvt);
 				channel = switch_core_session_get_channel(tech_pvt->session);
 				if (!tech_pvt->call_id && sip && sip->sip_call_id && sip->sip_call_id->i_id) {
 					tech_pvt->call_id = switch_core_session_strdup(session, sip->sip_call_id->i_id);
@@ -196,7 +197,7 @@ void sofia_event_callback(nua_event_t event,
 	}
 
 	if (session) {
-		switch_core_session_signal_lock(session);
+		switch_mutex_lock(tech_pvt->sofia_mutex);
 
 		if (channel && switch_channel_get_state(channel) >= CS_HANGUP) {
 			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel is already hungup.\n");
@@ -353,7 +354,7 @@ void sofia_event_callback(nua_event_t event,
 	}
 
 	if (session) {
-		switch_core_session_signal_unlock(session);
+		switch_mutex_unlock(tech_pvt->sofia_mutex);
 		switch_core_session_rwunlock(session);
 	}
 }
@@ -3486,6 +3487,7 @@ void sofia_handle_sip_i_invite(nua_t *nua, sofia_profile_t *profile, nua_handle_
 
 
 	switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
+	switch_mutex_init(&tech_pvt->sofia_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(session));
 
 	tech_pvt->remote_ip = switch_core_session_strdup(session, network_ip);
 	tech_pvt->remote_port = network_port;

src/mod/endpoints/mod_sofia/sofia_glue.c

@@ -1702,9 +1702,7 @@ switch_status_t sofia_glue_activate_rtp(private_object_t *tech_pvt, switch_rtp_f
 	const char *var;
 
 	switch_assert(tech_pvt != NULL);
-
-	switch_core_session_signal_lock(tech_pvt->session);
-
+	switch_mutex_lock(tech_pvt->sofia_mutex);
 
 	if ((var = switch_channel_get_variable(tech_pvt->channel, SOFIA_SECURE_MEDIA_VARIABLE)) && switch_true(var)) {
 		switch_set_flag_locked(tech_pvt, TFLAG_SECURE);
@@ -2027,7 +2025,7 @@ switch_status_t sofia_glue_activate_rtp(private_object_t *tech_pvt, switch_rtp_f
 
   end:
 
-	switch_core_session_signal_unlock(tech_pvt->session);
+	switch_mutex_unlock(tech_pvt->sofia_mutex);
 
 	return status;
 

src/switch_channel.c

@@ -390,7 +390,9 @@ SWITCH_DECLARE(void) switch_channel_uninit(switch_channel_t *channel)
 {
 	switch_channel_flush_dtmf(channel);
 	switch_core_hash_destroy(&channel->private_hash);
+	switch_mutex_lock(channel->profile_mutex);
 	switch_event_destroy(&channel->variables);
+	switch_mutex_unlock(channel->profile_mutex);
 }
 
 SWITCH_DECLARE(switch_status_t) switch_channel_init(switch_channel_t *channel, switch_core_session_t *session, switch_channel_state_t state,
@@ -562,7 +564,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_variable(switch_channel_t *ch
 {
 	switch_assert(channel != NULL);
 
-	if (!switch_strlen_zero(varname)) {
+	if (channel->variables && !switch_strlen_zero(varname)) {
 		switch_mutex_lock(channel->profile_mutex);
 		switch_event_del_header(channel->variables, varname);
 		if (!switch_strlen_zero(value)) {
@@ -584,7 +586,7 @@ SWITCH_DECLARE(switch_status_t) switch_channel_set_variable_printf(switch_channe
 	va_list ap;
 	switch_assert(channel != NULL);
 
-	if (!switch_strlen_zero(varname)) {
+	if (channel->variables && !switch_strlen_zero(varname)) {
 		switch_mutex_lock(channel->profile_mutex);
 		switch_event_del_header(channel->variables, varname);
 

src/switch_core_rwlock.c

@@ -35,15 +35,6 @@
 #include <switch.h>
 #include "private/switch_core_pvt.h"
 
-SWITCH_DECLARE(switch_status_t) switch_core_session_signal_lock(switch_core_session_t *session)
-{
-	return switch_mutex_lock(session->signal_mutex);
-}
-
-SWITCH_DECLARE(switch_status_t) switch_core_session_signal_unlock(switch_core_session_t *session)
-{
-	return switch_mutex_unlock(session->signal_mutex);
-}
 
 #ifdef SWITCH_DEBUG_RWLOCKS
 SWITCH_DECLARE(switch_status_t) switch_core_session_perform_read_lock(switch_core_session_t *session, const char *file, const char *func, int line)

src/switch_core_session.c

@@ -57,9 +57,10 @@ SWITCH_DECLARE(switch_core_session_t *) switch_core_session_locate(const char *u
 		if ((session = switch_core_hash_find(session_manager.session_table, uuid_str))) {
 			/* Acquire a read lock on the session */
 #ifdef SWITCH_DEBUG_RWLOCKS
-			if (switch_core_session_perform_read_lock(session, file, func, line) != SWITCH_STATUS_SUCCESS) {
+			if (switch_channel_get_state(session->channel) >= CS_HANGUP || 
+				switch_core_session_perform_read_lock(session, file, func, line) != SWITCH_STATUS_SUCCESS) {
 #else
-			if (switch_core_session_read_lock(session) != SWITCH_STATUS_SUCCESS) {
+			if (switch_channel_get_state(session->channel) >= CS_HANGUP || switch_core_session_read_lock(session) != SWITCH_STATUS_SUCCESS) {
 #endif
 				/* not available, forget it */
 				session = NULL;
@@ -418,8 +419,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_receive_message(switch_core_
 		return status;
 	}
 
-	switch_core_session_signal_lock(session);
-
 	if (session->endpoint_interface->io_routines->receive_message) {
 		status = session->endpoint_interface->io_routines->receive_message(session, message);
 	}
@@ -433,9 +432,6 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_receive_message(switch_core_
 	}
 
 	switch_core_session_kill_channel(session, SWITCH_SIG_BREAK);
-
-	switch_core_session_signal_unlock(session);
-
 	switch_core_session_rwunlock(session);
 
 	return status;
@@ -988,7 +984,6 @@ SWITCH_DECLARE(switch_core_session_t *) switch_core_session_request(const switch
 
 	switch_mutex_init(&session->mutex, SWITCH_MUTEX_NESTED, session->pool);
 	switch_mutex_init(&session->resample_mutex, SWITCH_MUTEX_NESTED, session->pool);
-	switch_mutex_init(&session->signal_mutex, SWITCH_MUTEX_NESTED, session->pool);
 	switch_thread_rwlock_create(&session->bug_rwlock, session->pool);
 	switch_thread_cond_create(&session->cond, session->pool);
 	switch_thread_rwlock_create(&session->rwlock, session->pool);

src/switch_core_state_machine.c

@@ -396,9 +396,8 @@ SWITCH_DECLARE(void) switch_core_session_run(switch_core_session_t *session)
 							do_extra_handlers = 0;
 						}
 					}
-					switch_core_session_signal_lock(session);
+					
 					STATE_MACRO(hangup, "HANGUP");
-					switch_core_session_signal_unlock(session);
 
 					hook_var = switch_channel_get_variable(session->channel, SWITCH_API_HANGUP_HOOK_VARIABLE);
 
@@ -418,19 +417,13 @@ SWITCH_DECLARE(void) switch_core_session_run(switch_core_session_t *session)
 				}
 				goto done;
 			case CS_INIT:		/* Basic setup tasks */
-				switch_core_session_signal_lock(session);
 				STATE_MACRO(init, "INIT");
-				switch_core_session_signal_unlock(session);
 				break;
 			case CS_ROUTING:	/* Look for a dialplan and find something to do */
-				switch_core_session_signal_lock(session);
 				STATE_MACRO(routing, "ROUTING");
-				switch_core_session_signal_unlock(session);
 				break;
 			case CS_RESET:		/* Reset */
-				switch_core_session_signal_lock(session);
 				STATE_MACRO(reset, "RESET");
-				switch_core_session_signal_unlock(session);
 				break;
 				/* These other states are intended for prolonged durations so we do not signal lock for them */
 			case CS_EXECUTE:	/* Execute an Operation */