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

rfbsrc: Serialize write operations

Browse source 
Currently we send key events from seperate threads. IOStream does not
allow concurrent write operations, so protect this operation using a
mutex.
This commit is contained in:
Nicolas Dufresne 2016-03-24 16:46:49 -04:00
parent c8d2e234c4
commit 459bdaae3f
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/librfb/rfbdecoder.c
View file

@ -69,6 +69,8 @@ rfb_decoder_new (void)
decoder->data_len = 0; decoder->data_len = 0;
decoder->error = NULL; decoder->error = NULL;
g_mutex_init (&decoder->write_lock);
return decoder; return decoder;
} }
@ -87,6 +89,7 @@ rfb_decoder_free (RfbDecoder * decoder)
g_clear_object (&decoder->socket_client); g_clear_object (&decoder->socket_client);
g_clear_error (&decoder->error); g_clear_error (&decoder->error);
g_free (decoder->data); g_free (decoder->data);
g_mutex_clear (&decoder->write_lock);
g_free (decoder); g_free (decoder);
} }
@ -217,12 +220,16 @@ rfb_decoder_send (RfbDecoder * decoder, guint8 * buffer, guint len)
g_return_val_if_fail (buffer != NULL, 0); g_return_val_if_fail (buffer != NULL, 0);
g_return_val_if_fail (len > 0, 0); g_return_val_if_fail (len > 0, 0);
g_mutex_lock (&decoder->write_lock);
out = g_io_stream_get_output_stream (G_IO_STREAM (decoder->connection)); out = g_io_stream_get_output_stream (G_IO_STREAM (decoder->connection));
if (!g_output_stream_write_all (out, buffer, len, NULL, decoder->cancellable, if (!g_output_stream_write_all (out, buffer, len, NULL, decoder->cancellable,
&err)) &err))
goto send_error; goto send_error;
g_mutex_unlock (&decoder->write_lock);
return TRUE; return TRUE;
send_error: send_error:
@ -237,6 +244,7 @@ send_error:
} }
} }
g_clear_error (&err); g_clear_error (&err);
g_mutex_unlock (&decoder->write_lock);
return FALSE; return FALSE;
} }
} }

3
gst/librfb/rfbdecoder.h
View file

@ -94,6 +94,9 @@ struct _RfbDecoder
/* some many used values */ /* some many used values */
guint bytespp; guint bytespp;
guint line_size; guint line_size;
/* Seriliaze writes operations */
GMutex write_lock;
}; };
RfbDecoder *rfb_decoder_new (void); RfbDecoder *rfb_decoder_new (void);