mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-07 06:52:41 +00:00
Code Issues 1 Projects Releases Wiki Activity

systemclock: handle unschedule of late entries

Browse source 
If the clockentry is too late and is unscheduled before it gets
a change to detect its lateness the wakeup count and the poll are
used but never properly cleaned up. This leaves it in a dirty state
that is going to mess with the next clock entry waiting requests.

https://bugzilla.gnome.org/show_bug.cgi?id=761586
This commit is contained in:
Thiago Santos 2016-02-05 15:34:47 -03:00
parent 682516402d
commit 77a98d98cb
1 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
gst/gstsystemclock.c
View file

@ -660,6 +660,24 @@ gst_system_clock_get_resolution (GstClock * clock)
#endif /* __APPLE__ */ #endif /* __APPLE__ */
} }
static inline void
gst_system_clock_cleanup_unscheduled (GstSystemClock * sysclock,
GstClockEntry * entry)
{
/* try to clean up.
* The unschedule function managed to set the status to
* unscheduled. We now take the lock and mark the entry as unscheduled.
* This makes sure that the unschedule function doesn't perform a
* wakeup anymore. If the unschedule function has a change to perform
* the wakeup before us, we clean up here */
GST_OBJECT_LOCK (sysclock);
entry->unscheduled = TRUE;
if (entry->woken_up) {
gst_system_clock_remove_wakeup (sysclock);
}
GST_OBJECT_UNLOCK (sysclock);
}
/* synchronously wait on the given GstClockEntry. /* synchronously wait on the given GstClockEntry.
* *
* We do this by blocking on the global GstPoll timer with * We do this by blocking on the global GstPoll timer with
@ -735,17 +753,7 @@ gst_system_clock_id_wait_jitter_unlocked (GstClock * clock,
entry, status, pollret); entry, status, pollret);
if (G_UNLIKELY (status == GST_CLOCK_UNSCHEDULED)) { if (G_UNLIKELY (status == GST_CLOCK_UNSCHEDULED)) {
/* try to clean up The unschedule function managed to set the status to gst_system_clock_cleanup_unscheduled (sysclock, entry);
* unscheduled. We now take the lock and mark the entry as unscheduled.
* This makes sure that the unschedule function doesn't perform a
* wakeup anymore. If the unschedule function has a change to perform
* the wakeup before us, we clean up here */
GST_OBJECT_LOCK (sysclock);
entry->unscheduled = TRUE;
if (entry->woken_up) {
gst_system_clock_remove_wakeup (sysclock);
}
GST_OBJECT_UNLOCK (sysclock);
goto done; goto done;
} else { } else {
if (G_UNLIKELY (pollret != 0)) { if (G_UNLIKELY (pollret != 0)) {
@ -823,7 +831,9 @@ gst_system_clock_id_wait_jitter_unlocked (GstClock * clock,
if (G_UNLIKELY (diff == 0)) { if (G_UNLIKELY (diff == 0)) {
if (G_UNLIKELY (!CAS_ENTRY_STATUS (entry, status, GST_CLOCK_OK))) { if (G_UNLIKELY (!CAS_ENTRY_STATUS (entry, status, GST_CLOCK_OK))) {
status = GET_ENTRY_STATUS (entry); status = GET_ENTRY_STATUS (entry);
if (G_UNLIKELY (status != GST_CLOCK_UNSCHEDULED)) if (G_LIKELY (status == GST_CLOCK_UNSCHEDULED))
gst_system_clock_cleanup_unscheduled (sysclock, entry);
else
GST_CAT_ERROR (GST_CAT_CLOCK, "unexpected status %d for entry %p", GST_CAT_ERROR (GST_CAT_CLOCK, "unexpected status %d for entry %p",
status, entry); status, entry);
} else { } else {
@ -832,7 +842,9 @@ gst_system_clock_id_wait_jitter_unlocked (GstClock * clock,
} else { } else {
if (G_UNLIKELY (!CAS_ENTRY_STATUS (entry, status, GST_CLOCK_EARLY))) { if (G_UNLIKELY (!CAS_ENTRY_STATUS (entry, status, GST_CLOCK_EARLY))) {
status = GET_ENTRY_STATUS (entry); status = GET_ENTRY_STATUS (entry);
if (G_UNLIKELY (status != GST_CLOCK_UNSCHEDULED)) if (G_LIKELY (status == GST_CLOCK_UNSCHEDULED))
gst_system_clock_cleanup_unscheduled (sysclock, entry);
else
GST_CAT_ERROR (GST_CAT_CLOCK, "unexpected status %d for entry %p", GST_CAT_ERROR (GST_CAT_CLOCK, "unexpected status %d for entry %p",
status, entry); status, entry);
} else { } else {