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

fix strange race moc experienced in uuid_bridge

This commit is contained in:
Anthony Minessale 2011-12-07 15:13:59 -06:00
parent 9ea3ce666f
commit 0bf2a0e975
3 changed files with 51 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/include/switch_channel.h
View File

@ -389,6 +389,7 @@ SWITCH_DECLARE(uint32_t) switch_channel_test_flag_partner(switch_channel_t *chan
\param flag flag to set \param flag flag to set
*/ */
SWITCH_DECLARE(void) switch_channel_set_state_flag(switch_channel_t *channel, switch_channel_flag_t flag); SWITCH_DECLARE(void) switch_channel_set_state_flag(switch_channel_t *channel, switch_channel_flag_t flag);
SWITCH_DECLARE(void) switch_channel_clear_state_flag(switch_channel_t *channel, switch_channel_flag_t flag);
/*! /*!
\brief Clear given flag(s) from a channel \brief Clear given flag(s) from a channel

9
src/switch_channel.c
View File

@ -1674,6 +1674,15 @@ SWITCH_DECLARE(void) switch_channel_set_state_flag(switch_channel_t *channel, sw
switch_mutex_unlock(channel->flag_mutex); switch_mutex_unlock(channel->flag_mutex);
} }
SWITCH_DECLARE(void) switch_channel_clear_state_flag(switch_channel_t *channel, switch_channel_flag_t flag)
{
switch_assert(channel != NULL);
switch_mutex_lock(channel->flag_mutex);
channel->state_flags[flag] = 0;
switch_mutex_unlock(channel->flag_mutex);
}
SWITCH_DECLARE(void) switch_channel_clear_flag(switch_channel_t *channel, switch_channel_flag_t flag) SWITCH_DECLARE(void) switch_channel_clear_flag(switch_channel_t *channel, switch_channel_flag_t flag)
{ {
int ACTIVE = 0; int ACTIVE = 0;

51
src/switch_ivr_bridge.c
View File

@ -763,21 +763,48 @@ static switch_status_t uuid_bridge_on_soft_execute(switch_core_session_t *sessio
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
switch_channel_clear_flag_recursive(channel, CF_BRIDGE_ORIGINATOR);
if ((other_uuid = switch_channel_get_variable(channel, SWITCH_UUID_BRIDGE)) && (other_session = switch_core_session_locate(other_uuid))) { if ((other_uuid = switch_channel_get_variable(channel, SWITCH_UUID_BRIDGE)) && (other_session = switch_core_session_locate(other_uuid))) {
switch_channel_t *other_channel = switch_core_session_get_channel(other_session); switch_channel_t *other_channel = switch_core_session_get_channel(other_session);
switch_event_t *event; switch_event_t *event;
int ready_a, ready_b; int ready_a, ready_b;
switch_channel_state_t state; switch_channel_state_t state, running_state;
int max = 1000, loops = max;
switch_channel_set_variable(channel, SWITCH_UUID_BRIDGE, NULL); switch_channel_set_variable(channel, SWITCH_UUID_BRIDGE, NULL);
for (;;) {
state = switch_channel_get_state(other_channel);
running_state = switch_channel_get_running_state(other_channel);
switch_channel_wait_for_state(other_channel, channel, CS_RESET); if (state == running_state) {
if (--loops < 1) {
switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
switch_channel_hangup(other_channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
}
if (switch_channel_get_state(other_channel) == CS_RESET) { if (switch_channel_down_nosig(other_channel) || switch_channel_down_nosig(channel)) {
switch_channel_set_state(other_channel, CS_SOFT_EXECUTE); break;
switch_channel_wait_for_state(other_channel, channel, CS_SOFT_EXECUTE); }
if (running_state == CS_RESET) {
switch_channel_set_state(other_channel, CS_SOFT_EXECUTE);
}
if (running_state == CS_SOFT_EXECUTE) {
if (switch_channel_test_flag(other_channel, CF_BRIDGE_ORIGINATOR)) {
goto done;
} else {
break;
}
}
} else {
loops = max;
}
switch_yield(20000);
} }
switch_core_session_reset(session, SWITCH_TRUE, SWITCH_TRUE); switch_core_session_reset(session, SWITCH_TRUE, SWITCH_TRUE);
@ -789,7 +816,7 @@ static switch_status_t uuid_bridge_on_soft_execute(switch_core_session_t *sessio
} else { } else {
switch_channel_hangup(channel, SWITCH_CAUSE_ORIGINATOR_CANCEL); switch_channel_hangup(channel, SWITCH_CAUSE_ORIGINATOR_CANCEL);
} }
return SWITCH_STATUS_FALSE; goto done;
} }
ready_a = switch_channel_ready(channel); ready_a = switch_channel_ready(channel);
@ -809,7 +836,7 @@ static switch_status_t uuid_bridge_on_soft_execute(switch_core_session_t *sessio
} }
} }
switch_core_session_rwunlock(other_session); switch_core_session_rwunlock(other_session);
return SWITCH_STATUS_FALSE; goto done;
} }
/* fire events that will change the data table from "show channels" */ /* fire events that will change the data table from "show channels" */
@ -839,7 +866,9 @@ static switch_status_t uuid_bridge_on_soft_execute(switch_core_session_t *sessio
switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
} }
done:
switch_channel_clear_flag_recursive(channel, CF_BRIDGE_ORIGINATOR);
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
} }
@ -1563,8 +1592,10 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_uuid_bridge(const char *originator_uu
//switch_channel_set_variable(originatee_channel, SWITCH_PARK_AFTER_BRIDGE_VARIABLE, NULL); //switch_channel_set_variable(originatee_channel, SWITCH_PARK_AFTER_BRIDGE_VARIABLE, NULL);
switch_channel_clear_state_handler(originator_channel, NULL); switch_channel_clear_state_handler(originator_channel, NULL);
switch_channel_clear_state_handler(originatee_channel, NULL); switch_channel_clear_state_handler(originatee_channel, NULL);
switch_channel_set_state_flag(originator_channel, CF_BRIDGE_ORIGINATOR); switch_channel_clear_flag_recursive(originator_channel, CF_BRIDGE_ORIGINATOR);
switch_channel_clear_flag_recursive(originatee_channel, CF_BRIDGE_ORIGINATOR); switch_channel_clear_flag_recursive(originatee_channel, CF_BRIDGE_ORIGINATOR);
switch_channel_set_state_flag(originator_channel, CF_BRIDGE_ORIGINATOR);
switch_channel_clear_state_flag(originatee_channel, CF_BRIDGE_ORIGINATOR);
switch_channel_add_state_handler(originator_channel, &uuid_bridge_state_handlers); switch_channel_add_state_handler(originator_channel, &uuid_bridge_state_handlers);
switch_channel_add_state_handler(originatee_channel, &uuid_bridge_state_handlers); switch_channel_add_state_handler(originatee_channel, &uuid_bridge_state_handlers);