diff options
| author | Tom Deseyn <tom.deseyn@gmail.com> | 2016-01-28 16:26:47 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2016-03-01 13:15:38 +0000 |
| commit | 8c4d3c6aa9fd0816210ac8b03d958647208bf589 (patch) | |
| tree | f4548d196f00ebf870bbe479978d23e0263cb0f4 | |
| parent | b424712644363288405c911d22b5d028d174db23 (diff) | |
| download | gstreamer-plugins-base-8c4d3c6aa9fd0816210ac8b03d958647208bf589.tar.gz | |
multisocketsink: handle client close correctly and EWOULDBLOCK
Fixes 100% cpu usage when client disconnects. Commit 6db2ee56
would just make multisocketsink ignore reads of 0 bytes without
removing the client, so we'd get woken up over and over again
for the client.
Fix the original issue differently by handling the non-fatal error code.
https://bugzilla.gnome.org/show_bug.cgi?id=761257
https://bugzilla.gnome.org/show_bug.cgi?id=743834
| -rw-r--r-- | gst/tcp/gstmultisocketsink.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/gst/tcp/gstmultisocketsink.c b/gst/tcp/gstmultisocketsink.c index f9acc13f1..2f1a9ae19 100644 --- a/gst/tcp/gstmultisocketsink.c +++ b/gst/tcp/gstmultisocketsink.c @@ -616,11 +616,11 @@ gst_multi_socket_sink_handle_client_read (GstMultiSocketSink * sink, ret = TRUE; navail = g_socket_get_available_bytes (mhclient->handle.socket); - if (navail <= 0) + if (navail < 0) return TRUE; /* only collect the data in a buffer when we need to send it with an event */ - do_event = sink->send_messages; + do_event = sink->send_messages && navail > 0; if (do_event) { omem = mem = g_malloc (navail); maxmem = navail; @@ -632,7 +632,7 @@ gst_multi_socket_sink_handle_client_read (GstMultiSocketSink * sink, /* just Read 'n' Drop, could also just drop the client as it's not supposed * to write to us except for closing the socket, I guess it's because we * like to listen to our customers. */ - while (navail > 0) { + do { GST_DEBUG_OBJECT (sink, "%s client wants us to read", mhclient->debug); nread = @@ -647,6 +647,9 @@ gst_multi_socket_sink_handle_client_read (GstMultiSocketSink * sink, ret = FALSE; break; } else if (nread < 0) { + if (err->code == G_IO_ERROR_WOULD_BLOCK) + break; + GST_WARNING_OBJECT (sink, "%s could not read: %s", mhclient->debug, err->message); mhclient->status = GST_CLIENT_STATUS_ERROR; @@ -657,7 +660,7 @@ gst_multi_socket_sink_handle_client_read (GstMultiSocketSink * sink, if (do_event) mem += nread; first = FALSE; - } + } while (navail > 0); g_clear_error (&err); if (do_event) { |