mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-06 02:32:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

net: keep GCancellable fd around instead of re-creating it constantly

Browse source 
Just create the cancellable fd once and keep it around instead
of creating/closing it for every single packet. Since we spend
most time waiting for packets, an fd is alloced and in use pretty
much all the time anyway.
This commit is contained in:
Tim-Philipp Müller 2015-05-19 14:34:04 +01:00
parent 19e5356afd
commit d71f5c7d73
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libs/gst/net/gstnetclientclock.c
View file

@ -94,6 +94,7 @@ struct _GstNetClientClockPrivate
GSocket *socket; GSocket *socket;
GSocketAddress *servaddr; GSocketAddress *servaddr;
GCancellable *cancel; GCancellable *cancel;
gboolean made_cancel_fd;
GstClockTime timeout_expiration; GstClockTime timeout_expiration;
GstClockTime roundtrip_limit; GstClockTime roundtrip_limit;
@ -612,6 +613,7 @@ gst_net_client_clock_start (GstNetClientClock * self)
GSocket *socket; GSocket *socket;
GError *error = NULL; GError *error = NULL;
GSocketFamily family; GSocketFamily family;
GPollFD dummy_pollfd;
g_return_val_if_fail (self->priv->address != NULL, FALSE); g_return_val_if_fail (self->priv->address != NULL, FALSE);
g_return_val_if_fail (self->priv->servaddr == NULL, FALSE); g_return_val_if_fail (self->priv->servaddr == NULL, FALSE);
@ -659,6 +661,9 @@ gst_net_client_clock_start (GstNetClientClock * self)
g_object_unref (myaddr); g_object_unref (myaddr);
self->priv->cancel = g_cancellable_new (); self->priv->cancel = g_cancellable_new ();
self->priv->made_cancel_fd =
g_cancellable_make_pollfd (self->priv->cancel, &dummy_pollfd);
self->priv->socket = socket; self->priv->socket = socket;
self->priv->servaddr = G_SOCKET_ADDRESS (servaddr); self->priv->servaddr = G_SOCKET_ADDRESS (servaddr);
@ -721,6 +726,9 @@ gst_net_client_clock_stop (GstNetClientClock * self)
g_thread_join (self->priv->thread); g_thread_join (self->priv->thread);
self->priv->thread = NULL; self->priv->thread = NULL;
if (self->priv->made_cancel_fd)
g_cancellable_release_fd (self->priv->cancel);
g_object_unref (self->priv->cancel); g_object_unref (self->priv->cancel);
self->priv->cancel = NULL; self->priv->cancel = NULL;

7
libs/gst/net/gstnettimeprovider.c
View file

@ -73,6 +73,7 @@ struct _GstNetTimeProviderPrivate
GSocket *socket; GSocket *socket;
GCancellable *cancel; GCancellable *cancel;
gboolean made_cancel_fd;
}; };
static gboolean gst_net_time_provider_start (GstNetTimeProvider * bself); static gboolean gst_net_time_provider_start (GstNetTimeProvider * bself);
@ -274,6 +275,7 @@ gst_net_time_provider_start (GstNetTimeProvider * self)
{ {
GSocketAddress *socket_addr, *bound_addr; GSocketAddress *socket_addr, *bound_addr;
GInetAddress *inet_addr; GInetAddress *inet_addr;
GPollFD dummy_pollfd;
GSocket *socket; GSocket *socket;
GError *err = NULL; GError *err = NULL;
int port; int port;
@ -328,6 +330,8 @@ gst_net_time_provider_start (GstNetTimeProvider * self)
self->priv->socket = socket; self->priv->socket = socket;
self->priv->cancel = g_cancellable_new (); self->priv->cancel = g_cancellable_new ();
self->priv->made_cancel_fd =
g_cancellable_make_pollfd (self->priv->cancel, &dummy_pollfd);
self->priv->thread = g_thread_try_new ("GstNetTimeProvider", self->priv->thread = g_thread_try_new ("GstNetTimeProvider",
gst_net_time_provider_thread, self, &err); gst_net_time_provider_thread, self, &err);
@ -380,6 +384,9 @@ gst_net_time_provider_stop (GstNetTimeProvider * self)
g_thread_join (self->priv->thread); g_thread_join (self->priv->thread);
self->priv->thread = NULL; self->priv->thread = NULL;
if (self->priv->made_cancel_fd)
g_cancellable_release_fd (self->priv->cancel);
g_object_unref (self->priv->cancel); g_object_unref (self->priv->cancel);
self->priv->cancel = NULL; self->priv->cancel = NULL;