mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-25 19:21:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

systemclock: Improve GstPoll handling and don't check for impossible errno values

Browse source 
Also just read/write control every time, GstPoll is optimized by itself
already to only do I/O if switching between empty and one byte.

https://bugzilla.gnome.org/show_bug.cgi?id=750397
This commit is contained in:
Sebastian Dröge 2016-06-29 13:37:28 +02:00
parent cda3f1213b
commit 149127b755
1 changed files with 12 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
gst/gstsystemclock.c
View file

@ -374,14 +374,18 @@ gst_system_clock_remove_wakeup (GstSystemClock * sysclock)
g_return_if_fail (sysclock->priv->wakeup_count > 0); g_return_if_fail (sysclock->priv->wakeup_count > 0);
sysclock->priv->wakeup_count--; sysclock->priv->wakeup_count--;
if (sysclock->priv->wakeup_count == 0) { GST_CAT_DEBUG (GST_CAT_CLOCK, "reading control");
/* read the control socket byte when we removed the last wakeup count */ while (!gst_poll_read_control (sysclock->priv->timer)) {
GST_CAT_DEBUG (GST_CAT_CLOCK, "reading control"); if (errno == EWOULDBLOCK) {
while (!gst_poll_read_control (sysclock->priv->timer)) { /* Try again and give other threads the chance to do something */
g_warning ("gstsystemclock: read control failed, trying again\n"); g_thread_yield ();
continue;
} else {
/* Critical error, GstPoll will have printed a critical warning already */
break;
} }
GST_SYSTEM_CLOCK_BROADCAST (sysclock);
} }
GST_SYSTEM_CLOCK_BROADCAST (sysclock);
GST_CAT_DEBUG (GST_CAT_CLOCK, "wakeup count %d", GST_CAT_DEBUG (GST_CAT_CLOCK, "wakeup count %d",
sysclock->priv->wakeup_count); sysclock->priv->wakeup_count);
} }
@ -389,22 +393,8 @@ gst_system_clock_remove_wakeup (GstSystemClock * sysclock)
static void static void
gst_system_clock_add_wakeup (GstSystemClock * sysclock) gst_system_clock_add_wakeup (GstSystemClock * sysclock)
{ {
/* only write the control socket for the first wakeup */ GST_CAT_DEBUG (GST_CAT_CLOCK, "writing control");
if (sysclock->priv->wakeup_count == 0) { gst_poll_write_control (sysclock->priv->timer);
GST_CAT_DEBUG (GST_CAT_CLOCK, "writing control");
while (!gst_poll_write_control (sysclock->priv->timer)) {
if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) {
g_warning
("gstsystemclock: write control failed in wakeup_async, trying again: %d:%s\n",
errno, g_strerror (errno));
} else {
g_critical
("gstsystemclock: write control failed in wakeup_async: %d:%s\n",
errno, g_strerror (errno));
return;
}
}
}
sysclock->priv->wakeup_count++; sysclock->priv->wakeup_count++;
GST_CAT_DEBUG (GST_CAT_CLOCK, "wakeup count %d", GST_CAT_DEBUG (GST_CAT_CLOCK, "wakeup count %d",
sysclock->priv->wakeup_count); sysclock->priv->wakeup_count);