mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-09 10:59:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

[MOVED FROM GST-P-FARSIGHT] Properly do the locking to avoid race conditions with clock unscheduling

Browse source 
20070904205509-3e2dc-da19900b51af6aedb6547f4f392bef4d1061dec2.gz
This commit is contained in:
Olivier Crete 2007-09-04 20:55:09 +00:00 committed by Edward Hervey
parent bd1d78312d
commit 71cd3422fd
2 changed files with 35 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
gst/dtmf/gstdtmfsrc.c
View file

@ -548,19 +548,15 @@ gst_dtmf_src_stop (GstDTMFSrc *dtmfsrc)
{ {
GstDTMFSrcEvent *event = NULL; GstDTMFSrcEvent *event = NULL;
GST_OBJECT_LOCK (dtmfsrc);
if (dtmfsrc->clock_id != NULL) { if (dtmfsrc->clock_id != NULL) {
gst_clock_id_unschedule(dtmfsrc->clock_id); gst_clock_id_unschedule(dtmfsrc->clock_id);
gst_clock_id_unref (dtmfsrc->clock_id);
dtmfsrc->clock_id = NULL;
} }
GST_OBJECT_UNLOCK (dtmfsrc);
g_async_queue_lock (dtmfsrc->event_queue);
event = g_malloc (sizeof(GstDTMFSrcEvent)); event = g_malloc (sizeof(GstDTMFSrcEvent));
event->event_type = DTMF_EVENT_TYPE_PAUSE_TASK; event->event_type = DTMF_EVENT_TYPE_PAUSE_TASK;
g_async_queue_push_unlocked (dtmfsrc->event_queue, event); g_async_queue_push (dtmfsrc->event_queue, event);
g_async_queue_unlock (dtmfsrc->event_queue);
event = NULL; event = NULL;
@ -680,17 +676,23 @@ gst_dtmf_src_wait_for_buffer_ts (GstDTMFSrc *dtmfsrc, GstBuffer * buf)
clock = gst_element_get_clock (GST_ELEMENT (dtmfsrc)); clock = gst_element_get_clock (GST_ELEMENT (dtmfsrc));
if (clock != NULL) { if (clock != NULL) {
GstClockReturn clock_ret; GstClockReturn clock_ret;
GstClockID clock_id;
dtmfsrc->clock_id = gst_clock_new_single_shot_id (clock, GST_BUFFER_TIMESTAMP (buf)); clock_id = gst_clock_new_single_shot_id (clock, GST_BUFFER_TIMESTAMP (buf));
gst_object_unref (clock); gst_object_unref (clock);
GST_OBJECT_LOCK (dtmfsrc);
dtmfsrc->clock_id = clock_id;
GST_OBJECT_UNLOCK (dtmfsrc);
clock_ret = gst_clock_id_wait (dtmfsrc->clock_id, NULL); clock_ret = gst_clock_id_wait (dtmfsrc->clock_id, NULL);
GST_OBJECT_LOCK (dtmfsrc);
dtmfsrc->clock_id = NULL;
gst_clock_id_unref (clock_id);
GST_OBJECT_UNLOCK (dtmfsrc);
if (clock_ret == GST_CLOCK_UNSCHEDULED) { if (clock_ret == GST_CLOCK_UNSCHEDULED) {
GST_DEBUG_OBJECT (dtmfsrc, "Clock wait unscheduled"); GST_DEBUG_OBJECT (dtmfsrc, "Clock wait unscheduled");
/* we don't free anything in case of an unscheduled, because it would be unscheduled
* by the stop function which will do the free itself. We can't handle it here
* in case we stop the task before the unref is done
*/
} else { } else {
if (clock_ret != GST_CLOCK_OK && clock_ret != GST_CLOCK_EARLY) { if (clock_ret != GST_CLOCK_OK && clock_ret != GST_CLOCK_EARLY) {
gchar *clock_name = NULL; gchar *clock_name = NULL;
@ -702,8 +704,6 @@ gst_dtmf_src_wait_for_buffer_ts (GstDTMFSrc *dtmfsrc, GstBuffer * buf)
GST_ERROR_OBJECT (dtmfsrc, "Failed to wait on clock %s", clock_name); GST_ERROR_OBJECT (dtmfsrc, "Failed to wait on clock %s", clock_name);
g_free (clock_name); g_free (clock_name);
} }
gst_clock_id_unref (dtmfsrc->clock_id);
dtmfsrc->clock_id = NULL;
} }
} else { } else {
gchar *dtmf_name = gst_element_get_name (dtmfsrc); gchar *dtmf_name = gst_element_get_name (dtmfsrc);
@ -779,7 +779,7 @@ gst_dtmf_src_push_next_tone_packet (GstDTMFSrc *dtmfsrc)
event->packet_count = 0; event->packet_count = 0;
dtmfsrc->last_event = event; dtmfsrc->last_event = event;
} else if (event->event_type == DTMF_EVENT_TYPE_PAUSE_TASK) { } else if (event->event_type == DTMF_EVENT_TYPE_PAUSE_TASK) {
g_free (event); g_async_queue_push (dtmfsrc->event_queue, event);
g_async_queue_unref (dtmfsrc->event_queue); g_async_queue_unref (dtmfsrc->event_queue);
return; return;
} }

32
gst/dtmf/gstrtpdtmfsrc.c
View file

@ -606,17 +606,15 @@ gst_rtp_dtmf_src_stop (GstRTPDTMFSrc *dtmfsrc)
GstRTPDTMFSrcEvent *event = NULL; GstRTPDTMFSrcEvent *event = NULL;
GST_OBJECT_LOCK (dtmfsrc);
if (dtmfsrc->clock_id != NULL) { if (dtmfsrc->clock_id != NULL) {
gst_clock_id_unschedule(dtmfsrc->clock_id); gst_clock_id_unschedule(dtmfsrc->clock_id);
gst_clock_id_unref (dtmfsrc->clock_id);
dtmfsrc->clock_id = NULL;
} }
GST_OBJECT_UNLOCK (dtmfsrc);
g_async_queue_lock (dtmfsrc->event_queue);
event = g_malloc (sizeof(GstRTPDTMFSrcEvent)); event = g_malloc (sizeof(GstRTPDTMFSrcEvent));
event->event_type = RTP_DTMF_EVENT_TYPE_PAUSE_TASK; event->event_type = RTP_DTMF_EVENT_TYPE_PAUSE_TASK;
g_async_queue_push_unlocked (dtmfsrc->event_queue, event); g_async_queue_push (dtmfsrc->event_queue, event);
g_async_queue_unlock (dtmfsrc->event_queue);
event = NULL; event = NULL;
@ -683,17 +681,24 @@ gst_rtp_dtmf_src_wait_for_buffer_ts (GstRTPDTMFSrc *dtmfsrc, GstBuffer * buf)
clock = gst_element_get_clock (GST_ELEMENT (dtmfsrc)); clock = gst_element_get_clock (GST_ELEMENT (dtmfsrc));
if (clock != NULL) { if (clock != NULL) {
GstClockReturn clock_ret; GstClockReturn clock_ret;
GstClockID clock_id;
dtmfsrc->clock_id = gst_clock_new_single_shot_id (clock, GST_BUFFER_TIMESTAMP (buf)); clock_id = gst_clock_new_single_shot_id (clock, GST_BUFFER_TIMESTAMP (buf));
gst_object_unref (clock); gst_object_unref (clock);
GST_OBJECT_LOCK (dtmfsrc);
dtmfsrc->clock_id = clock_id;
GST_OBJECT_UNLOCK (dtmfsrc);
clock_ret = gst_clock_id_wait (dtmfsrc->clock_id, NULL); clock_ret = gst_clock_id_wait (dtmfsrc->clock_id, NULL);
GST_OBJECT_LOCK (dtmfsrc);
dtmfsrc->clock_id = NULL;
gst_clock_id_unref (clock_id);
GST_OBJECT_UNLOCK (dtmfsrc);
if (clock_ret == GST_CLOCK_UNSCHEDULED) { if (clock_ret == GST_CLOCK_UNSCHEDULED) {
GST_DEBUG_OBJECT (dtmfsrc, "Clock wait unscheduled"); GST_DEBUG_OBJECT (dtmfsrc, "Clock wait unscheduled");
/* we don't free anything in case of an unscheduled, because it would be unscheduled
* by the stop function which will do the free itself. We can't handle it here
* in case we stop the task before the unref is done
*/
} else { } else {
if (clock_ret != GST_CLOCK_OK && clock_ret != GST_CLOCK_EARLY) { if (clock_ret != GST_CLOCK_OK && clock_ret != GST_CLOCK_EARLY) {
gchar *clock_name = NULL; gchar *clock_name = NULL;
@ -705,7 +710,6 @@ gst_rtp_dtmf_src_wait_for_buffer_ts (GstRTPDTMFSrc *dtmfsrc, GstBuffer * buf)
GST_ERROR_OBJECT (dtmfsrc, "Failed to wait on clock %s", clock_name); GST_ERROR_OBJECT (dtmfsrc, "Failed to wait on clock %s", clock_name);
g_free (clock_name); g_free (clock_name);
} }
gst_clock_id_unref (dtmfsrc->clock_id);
} }
} }
@ -819,7 +823,11 @@ gst_rtp_dtmf_src_push_next_rtp_packet (GstRTPDTMFSrc *dtmfsrc)
dtmfsrc->last_event = event; dtmfsrc->last_event = event;
} else if (event->event_type == RTP_DTMF_EVENT_TYPE_PAUSE_TASK) { } else if (event->event_type == RTP_DTMF_EVENT_TYPE_PAUSE_TASK) {
g_free (event); /*
* We're pushing it back because it has to stay in there until
* the task is really paused (and the queue will then be flushed
*/
g_async_queue_push (dtmfsrc->event_queue, event);
g_async_queue_unref (dtmfsrc->event_queue); g_async_queue_unref (dtmfsrc->event_queue);
return; return;
} }