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

[core] fix session deadlock (#2290)

This commit is contained in:
xu 2023-11-05 10:17:07 +08:00
parent 57fe9aa6b6
commit d4fd792228
2 changed files with 49 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/switch_core_io.c
View File

@ -146,13 +146,15 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
if (session->read_codec && !session->track_id && session->track_duration) { if (session->read_codec && !session->track_id && session->track_duration) {
if (session->read_frame_count == 0) { if (session->read_frame_count == 0) {
switch_event_t *event; switch_event_t *event;
switch_core_session_message_t msg = { 0 }; switch_core_session_message_t *msg = switch_core_session_alloc(session, sizeof(*msg));
session->read_frame_count = (session->read_impl.samples_per_second / session->read_impl.samples_per_packet) * session->track_duration; session->read_frame_count = (session->read_impl.samples_per_second / session->read_impl.samples_per_packet) * session->track_duration;
msg.message_id = SWITCH_MESSAGE_HEARTBEAT_EVENT; msg->message_id = SWITCH_MESSAGE_HEARTBEAT_EVENT;
msg.numeric_arg = session->track_duration; msg->numeric_arg = session->track_duration;
switch_core_session_receive_message(session, &msg); MESSAGE_STAMP_FFL(msg);
switch_core_session_queue_message(session, msg);
switch_event_create(&event, SWITCH_EVENT_SESSION_HEARTBEAT); switch_event_create(&event, SWITCH_EVENT_SESSION_HEARTBEAT);
switch_channel_event_set_data(session->channel, event); switch_channel_event_set_data(session->channel, event);
@ -410,10 +412,10 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
switch_set_flag(session, SSF_READ_TRANSCODE); switch_set_flag(session, SSF_READ_TRANSCODE);
if (!switch_test_flag(session, SSF_WARN_TRANSCODE)) { if (!switch_test_flag(session, SSF_WARN_TRANSCODE)) {
switch_core_session_message_t msg = { 0 }; switch_core_session_message_t *msg = switch_core_session_alloc(session, sizeof(*msg));
msg->message_id = SWITCH_MESSAGE_INDICATE_TRANSCODING_NECESSARY;
msg.message_id = SWITCH_MESSAGE_INDICATE_TRANSCODING_NECESSARY; MESSAGE_STAMP_FFL(msg);
switch_core_session_receive_message(session, &msg); switch_core_session_queue_message(session, msg);
switch_set_flag(session, SSF_WARN_TRANSCODE); switch_set_flag(session, SSF_WARN_TRANSCODE);
} }
@ -562,10 +564,11 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
status = SWITCH_STATUS_FALSE; status = SWITCH_STATUS_FALSE;
goto done; goto done;
} else { } else {
switch_core_session_message_t msg = { 0 }; switch_core_session_message_t *msg = switch_core_session_alloc(session, sizeof(*msg));
msg.numeric_arg = 1; msg->message_id = SWITCH_MESSAGE_RESAMPLE_EVENT;
msg.message_id = SWITCH_MESSAGE_RESAMPLE_EVENT; msg->numeric_arg = 1;
switch_core_session_receive_message(session, &msg); MESSAGE_STAMP_FFL(msg);
switch_core_session_queue_message(session, msg);
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Activating read resampler\n"); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Activating read resampler\n");
} }
@ -597,10 +600,12 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_read_frame(switch_core_sessi
switch_mutex_unlock(session->resample_mutex); switch_mutex_unlock(session->resample_mutex);
{ {
switch_core_session_message_t msg = { 0 }; switch_core_session_message_t *msg = switch_core_session_alloc(session, sizeof(*msg));
msg.numeric_arg = 0; msg->message_id = SWITCH_MESSAGE_RESAMPLE_EVENT;
msg.message_id = SWITCH_MESSAGE_RESAMPLE_EVENT; msg->numeric_arg = 0;
switch_core_session_receive_message(session, &msg); MESSAGE_STAMP_FFL(msg);
switch_core_session_queue_message(session, msg);
} }
} }

50
src/switch_core_media.c
View File

@ -15945,12 +15945,12 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess
} }
if (!switch_test_flag(session, SSF_WARN_TRANSCODE)) { if (!switch_test_flag(session, SSF_WARN_TRANSCODE)) {
switch_core_session_message_t msg = { 0 }; switch_core_session_message_t *msg = switch_core_session_alloc(session, sizeof(*msg));
msg->message_id = SWITCH_MESSAGE_INDICATE_TRANSCODING_NECESSARY;
msg.message_id = SWITCH_MESSAGE_INDICATE_TRANSCODING_NECESSARY; MESSAGE_STAMP_FFL(msg);
switch_core_session_receive_message(session, &msg); switch_core_session_queue_message(session, msg);
switch_set_flag(session, SSF_WARN_TRANSCODE); switch_set_flag(session, SSF_WARN_TRANSCODE);
} }
if (frame->codec) { if (frame->codec) {
session->raw_write_frame.datalen = session->raw_write_frame.buflen; session->raw_write_frame.datalen = session->raw_write_frame.buflen;
@ -15993,10 +15993,12 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess
if (status != SWITCH_STATUS_SUCCESS) { if (status != SWITCH_STATUS_SUCCESS) {
goto done; goto done;
} else { } else {
switch_core_session_message_t msg = { 0 }; switch_core_session_message_t *msg = switch_core_session_alloc(session, sizeof(*msg));
msg.numeric_arg = 1; msg->message_id = SWITCH_MESSAGE_RESAMPLE_EVENT;
msg.message_id = SWITCH_MESSAGE_RESAMPLE_EVENT; msg->numeric_arg = 1;
switch_core_session_receive_message(session, &msg); MESSAGE_STAMP_FFL(msg);
switch_core_session_queue_message(session, msg);
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Activating write resampler\n"); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Activating write resampler\n");
} }
@ -16029,10 +16031,11 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess
switch_mutex_unlock(session->resample_mutex); switch_mutex_unlock(session->resample_mutex);
{ {
switch_core_session_message_t msg = { 0 }; switch_core_session_message_t *msg = switch_core_session_alloc(session, sizeof(*msg));
msg.numeric_arg = 0; msg->message_id = SWITCH_MESSAGE_RESAMPLE_EVENT;
msg.message_id = SWITCH_MESSAGE_RESAMPLE_EVENT; msg->numeric_arg = 0;
switch_core_session_receive_message(session, &msg); MESSAGE_STAMP_FFL(msg);
switch_core_session_queue_message(session, msg);
} }
} }
@ -16329,11 +16332,11 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess
if (status != SWITCH_STATUS_SUCCESS) { if (status != SWITCH_STATUS_SUCCESS) {
goto done; goto done;
} else { } else {
switch_core_session_message_t msg = { 0 }; switch_core_session_message_t *msg = switch_core_session_alloc(session, sizeof(*msg));
msg.numeric_arg = 1; msg->message_id = SWITCH_MESSAGE_RESAMPLE_EVENT;
msg.message_id = SWITCH_MESSAGE_RESAMPLE_EVENT; msg->numeric_arg = 1;
switch_core_session_receive_message(session, &msg); MESSAGE_STAMP_FFL(msg);
switch_core_session_queue_message(session, msg);
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Activating write resampler\n"); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Activating write resampler\n");
} }
@ -16351,7 +16354,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess
break; break;
case SWITCH_STATUS_NOOP: case SWITCH_STATUS_NOOP:
if (session->write_resampler) { if (session->write_resampler) {
switch_core_session_message_t msg = { 0 };
int ok = 0; int ok = 0;
switch_mutex_lock(session->resample_mutex); switch_mutex_lock(session->resample_mutex);
@ -16363,9 +16366,12 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_frame(switch_core_sess
switch_mutex_unlock(session->resample_mutex); switch_mutex_unlock(session->resample_mutex);
if (ok) { if (ok) {
msg.numeric_arg = 0; switch_core_session_message_t *msg = switch_core_session_alloc(session, sizeof(*msg));
msg.message_id = SWITCH_MESSAGE_RESAMPLE_EVENT; msg->message_id = SWITCH_MESSAGE_RESAMPLE_EVENT;
switch_core_session_receive_message(session, &msg); msg->numeric_arg = 0;
MESSAGE_STAMP_FFL(msg);
switch_core_session_queue_message(session, msg);
} }
} }