From 06a464b148ccea0d8ef99c9a50860b8772f34396 Mon Sep 17 00:00:00 2001 From: Anthony Minessale Date: Mon, 8 Feb 2010 18:18:11 +0000 Subject: [PATCH] avoiding livelock git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@16584 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/switch_ivr.c | 12 ++++++++++-- src/switch_ivr_bridge.c | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/switch_ivr.c b/src/switch_ivr.c index 632987c532..3d21777ef8 100644 --- a/src/switch_ivr.c +++ b/src/switch_ivr.c @@ -1275,7 +1275,11 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_nomedia(const char *uuid, switch_medi switch_channel_set_flag(other_channel, CF_RESET); switch_channel_set_flag(other_channel, CF_REDIRECT); switch_channel_set_state(other_channel, CS_PARK); - switch_channel_wait_for_state(other_channel, channel, CS_PARK); + if (switch_core_session_in_thread(session)) { + switch_yield(100000); + } else { + switch_channel_wait_for_state(other_channel, channel, CS_PARK); + } switch_core_session_receive_message(other_session, &msg); switch_channel_wait_for_flag(other_channel, CF_REQ_MEDIA, SWITCH_FALSE, 10000, NULL); switch_channel_wait_for_flag(other_channel, CF_MEDIA_ACK, SWITCH_TRUE, 10000, NULL); @@ -1299,7 +1303,11 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_nomedia(const char *uuid, switch_medi switch_ivr_signal_bridge(session, other_session); } - switch_channel_wait_for_state(other_channel, channel, CS_HIBERNATE); + if (switch_core_session_in_thread(session)) { + switch_yield(100000); + } else { + switch_channel_wait_for_state(other_channel, channel, CS_HIBERNATE); + } if (!switch_core_session_in_thread(session)) { switch_channel_wait_for_state(channel, other_channel, CS_HIBERNATE); diff --git a/src/switch_ivr_bridge.c b/src/switch_ivr_bridge.c index a18a940b70..5b6b414584 100644 --- a/src/switch_ivr_bridge.c +++ b/src/switch_ivr_bridge.c @@ -347,6 +347,7 @@ static void *audio_bridge_thread(switch_thread_t *thread, void *obj) switch_ivr_nomedia(switch_core_session_get_uuid(session_a), SMF_REBRIDGE); bypass_media_after_bridge = 0; switch_channel_clear_flag(chan_a, CF_BYPASS_MEDIA_AFTER_BRIDGE); + goto end_of_bridge_loop; } /* if 1 channel has DTMF pass it to the other */