Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed deadlock between stream and ICE #3801

Merged
merged 3 commits into from
Dec 14, 2023
Merged

Fixed deadlock between stream and ICE #3801

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
153f994
Fixed deadlock between stream and ICE
sauwming Dec 12, 2023
2695437
Use media transport's group lock
sauwming Dec 13, 2023
359210f
Add group lock's existence check
sauwming Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 6 additions & 17 deletions pjmedia/src/pjmedia/stream.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,6 @@ struct pjmedia_stream
pj_uint32_t tx_duration; /**< TX duration in timestamp. */

pj_mutex_t *jb_mutex;
pj_mutex_t *rtcp_mutex;
pjmedia_jbuf *jb; /**< Jitter buffer. */
char jb_last_frm; /**< Last frame type from jb */
unsigned jb_last_frm_cnt;/**< Last JB frame type counter*/
Expand Down Expand Up @@ -1088,9 +1087,10 @@ static pj_status_t send_rtcp(pjmedia_stream *stream,
pj_status_t status;

/* We need to prevent data race since there is only a single instance
* of rtcp packet buffer.
* of rtcp packet buffer. And to avoid deadlock with media transport,
* we use the transport's group lock.
*/
pj_mutex_lock(stream->rtcp_mutex);
pj_grp_lock_acquire(stream->transport->grp_lock);

/* Build RTCP RR/SR packet */
pjmedia_rtcp_build_rtcp(&stream->rtcp, &sr_rr_pkt, &len);
Expand Down Expand Up @@ -1211,7 +1211,7 @@ static pj_status_t send_rtcp(pjmedia_stream *stream,
}
}

pj_mutex_unlock(stream->rtcp_mutex);
pj_grp_lock_release(stream->transport->grp_lock);

return status;
}
Expand Down Expand Up @@ -2533,12 +2533,8 @@ PJ_DEF(pj_status_t) pjmedia_stream_create( pjmedia_endpt *endpt,
}

/* Create mutex to protect jitter buffer: */
status = pj_mutex_create_simple(pool, NULL, &stream->jb_mutex);
if (status != PJ_SUCCESS)
goto err_cleanup;

/* Create mutex for RTCP purposes */
status = pj_mutex_create_simple(pool, NULL, &stream->rtcp_mutex);
status = pj_mutex_create_simple(pool, NULL, &stream->jb_mutex);
if (status != PJ_SUCCESS)
goto err_cleanup;

Expand Down Expand Up @@ -3072,9 +3068,7 @@ PJ_DEF(pj_status_t) pjmedia_stream_destroy( pjmedia_stream *stream )
PJ_ASSERT_RETURN(stream != NULL, PJ_EINVAL);

/* Send RTCP BYE (also SDES & XR) */
if (stream->transport && stream->rtcp_mutex &&
!stream->rtcp_sdes_bye_disabled)
{
if (stream->transport && !stream->rtcp_sdes_bye_disabled) {
#if defined(PJMEDIA_HAS_RTCP_XR) && (PJMEDIA_HAS_RTCP_XR != 0)
send_rtcp(stream, PJ_TRUE, PJ_TRUE, stream->rtcp.xr_enabled, PJ_FALSE);
#else
Expand Down Expand Up @@ -3160,11 +3154,6 @@ PJ_DEF(pj_status_t) pjmedia_stream_destroy( pjmedia_stream *stream )
stream->jb_mutex = NULL;
}

if (stream->rtcp_mutex) {
pj_mutex_destroy(stream->rtcp_mutex);
stream->rtcp_mutex = NULL;
}

/* Destroy jitter buffer */
if (stream->jb)
pjmedia_jbuf_destroy(stream->jb);
Expand Down
22 changes: 7 additions & 15 deletions pjmedia/src/pjmedia/vid_stream.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ struct pjmedia_vid_stream
pjmedia_vid_codec_mgr *codec_mgr; /**< Codec manager. */
pjmedia_vid_stream_info info; /**< Stream info. */
pj_grp_lock_t *grp_lock; /**< Stream lock. */
pj_mutex_t *rtcp_mutex; /**< RTCP mutex. */

pjmedia_vid_channel *enc; /**< Encoding channel. */
pjmedia_vid_channel *dec; /**< Decoding channel. */
Expand Down Expand Up @@ -585,7 +584,11 @@ static pj_status_t send_rtcp(pjmedia_vid_stream *stream,
int len, max_len;
pj_status_t status;

pj_mutex_lock(stream->rtcp_mutex);

/* To avoid deadlock with media transport, we use the transport's
* group lock.
*/
pj_grp_lock_acquire( stream->transport->grp_lock );
sauwming marked this conversation as resolved.
Show resolved Hide resolved

/* Build RTCP RR/SR packet */
pjmedia_rtcp_build_rtcp(&stream->rtcp, &sr_rr_pkt, &len);
Expand Down Expand Up @@ -668,7 +671,7 @@ static pj_status_t send_rtcp(pjmedia_vid_stream *stream,
}
}

pj_mutex_unlock(stream->rtcp_mutex);
pj_grp_lock_release( stream->transport->grp_lock );

return status;
}
Expand Down Expand Up @@ -1844,11 +1847,6 @@ PJ_DEF(pj_status_t) pjmedia_vid_stream_create(
stream->cname.slen = p - stream->cname.ptr;
}

/* Create mutex for RTCP purposes */
status = pj_mutex_create_simple(pool, NULL, &stream->rtcp_mutex);
if (status != PJ_SUCCESS)
goto err_cleanup;

/* Create group lock */
status = pj_grp_lock_create_w_handler(pool, NULL, stream,
&on_destroy,
Expand Down Expand Up @@ -2197,9 +2195,7 @@ PJ_DEF(pj_status_t) pjmedia_vid_stream_destroy( pjmedia_vid_stream *stream )
pjmedia_event_unsubscribe(NULL, &stream_event_cb, stream, &stream->rtcp);

/* Send RTCP BYE (also SDES) */
if (stream->transport && stream->rtcp_mutex &&
!stream->rtcp_sdes_bye_disabled)
{
if (stream->transport && !stream->rtcp_sdes_bye_disabled) {
send_rtcp(stream, PJ_TRUE, PJ_TRUE, PJ_FALSE, PJ_FALSE);
}

Expand Down Expand Up @@ -2243,10 +2239,6 @@ static void on_destroy( void *arg )
}

/* Free mutex */
if (stream->rtcp_mutex) {
pj_mutex_destroy(stream->rtcp_mutex);
stream->rtcp_mutex = NULL;
}
stream->grp_lock = NULL;

/* Destroy jitter buffer */
Expand Down
Loading