luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-01 23:13:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Always do async vs sync correctly in GSocketConnection streams

Browse Source 
Previously if a GSocketConnection had a blocking GSocket, it would
sometimes block during asynchonous I/O, and if it had a non-blocking
socket, it would sometimes return G_IO_ERROR_WOULD_BLOCK from
synchronous I/O. This fixes the connection to not depend on the socket
state.

https://bugzilla.gnome.org/show_bug.cgi?id=616458
This commit is contained in:
Dan Winship
2010-06-24 13:09:14 -04:00
parent 17fea2f749
commit 547311bfd8
6 changed files with 101 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
gio/gsocket.c
View File

@@ -1721,6 +1721,37 @@ g_socket_receive (GSocket *socket,
gsize size,
GCancellable *cancellable,
GError **error)
{
return g_socket_receive_with_blocking (socket, buffer, size,
socket->priv->blocking,
cancellable, error);
}
/**
* g_socket_receive_with_blocking:
* @socket: a #GSocket
* @buffer: a buffer to read data into (which should be at least @size
* bytes long).
* @size: the number of bytes you want to read from the socket
* @blocking: whether to do blocking or non-blocking I/O
* @cancellable: a %GCancellable or %NULL
* @error: #GError for error reporting, or %NULL to ignore.
*
* This behaves exactly the same as g_socket_receive(), except that
* the choice of blocking or non-blocking behavior is determined by
* the @blocking argument rather than by @socket's properties.
*
* Returns: Number of bytes read, or -1 on error
*
* Since: 2.26
*/
gssize
g_socket_receive_with_blocking (GSocket *socket,
gchar *buffer,
gsize size,
gboolean blocking,
GCancellable *cancellable,
GError **error)
{
gssize ret;
@@ -1734,7 +1765,7 @@ g_socket_receive (GSocket *socket,
while (1)
{
if (socket->priv->blocking &&
if (blocking &&
!g_socket_condition_wait (socket,
G_IO_IN, cancellable, error))
return -1;
@@ -1746,7 +1777,7 @@ g_socket_receive (GSocket *socket,
if (errsv == EINTR)
continue;
if (socket->priv->blocking)
if (blocking)
{
#ifdef WSAEWOULDBLOCK
if (errsv == WSAEWOULDBLOCK)
@@ -1861,6 +1892,37 @@ g_socket_send (GSocket *socket,
gsize size,
GCancellable *cancellable,
GError **error)
{
return g_socket_send_with_blocking (socket, buffer, size,
socket->priv->blocking,
cancellable, error);
}
/**
* g_socket_send_with_blocking:
* @socket: a #GSocket
* @buffer: the buffer containing the data to send.
* @size: the number of bytes to send
* @blocking: whether to do blocking or non-blocking I/O
* @cancellable: a %GCancellable or %NULL
* @error: #GError for error reporting, or %NULL to ignore.
*
* This behaves exactly the same as g_socket_send(), except that
* the choice of blocking or non-blocking behavior is determined by
* the @blocking argument rather than by @socket's properties.
*
* Returns: Number of bytes written (which may be less than @size), or -1
* on error
*
* Since: 2.26
*/
gssize
g_socket_send_with_blocking (GSocket *socket,
const gchar *buffer,
gsize size,
gboolean blocking,
GCancellable *cancellable,
GError **error)
{
gssize ret;
@@ -1874,7 +1936,7 @@ g_socket_send (GSocket *socket,
while (1)
{
if (socket->priv->blocking &&
if (blocking &&
!g_socket_condition_wait (socket,
G_IO_OUT, cancellable, error))
return -1;
@@ -1891,7 +1953,7 @@ g_socket_send (GSocket *socket,
win32_unset_event_mask (socket, FD_WRITE);
#endif
if (socket->priv->blocking)
if (blocking)
{
#ifdef WSAEWOULDBLOCK
if (errsv == WSAEWOULDBLOCK)