luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-09 20:35:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/silviol/gsocket_flags'

Browse Source
This commit is contained in:
Ignacio Casal Quinteiro 2018-12-17 10:24:45 +01:00
commit 290c9ee655
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gio/gsocket.c
View File

@ -2711,8 +2711,6 @@ g_socket_accept (GSocket *socket,
while (TRUE) while (TRUE)
{ {
win32_unset_event_mask (socket, FD_ACCEPT);
if ((ret = accept (socket->priv->fd, NULL, 0)) < 0) if ((ret = accept (socket->priv->fd, NULL, 0)) < 0)
{ {
int errsv = get_socket_errno (); int errsv = get_socket_errno ();
@ -2727,6 +2725,8 @@ g_socket_accept (GSocket *socket,
errsv == EAGAIN) errsv == EAGAIN)
#endif #endif
{ {
win32_unset_event_mask (socket, FD_ACCEPT);
if (socket->priv->blocking) if (socket->priv->blocking)
{ {
if (!g_socket_condition_wait (socket, if (!g_socket_condition_wait (socket,
@ -2743,6 +2743,8 @@ g_socket_accept (GSocket *socket,
break; break;
} }
win32_unset_event_mask (socket, FD_ACCEPT);
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
{ {
/* The socket inherits the accepting sockets event mask and even object, /* The socket inherits the accepting sockets event mask and even object,
@ -2834,8 +2836,6 @@ g_socket_connect (GSocket *socket,
while (1) while (1)
{ {
win32_unset_event_mask (socket, FD_CONNECT);
if (connect (socket->priv->fd, &buffer.sa, if (connect (socket->priv->fd, &buffer.sa,
g_socket_address_get_native_size (address)) < 0) g_socket_address_get_native_size (address)) < 0)
{ {
@ -2850,6 +2850,8 @@ g_socket_connect (GSocket *socket,
if (errsv == WSAEWOULDBLOCK) if (errsv == WSAEWOULDBLOCK)
#endif #endif
{ {
win32_unset_event_mask (socket, FD_CONNECT);
if (socket->priv->blocking) if (socket->priv->blocking)
{ {
if (g_socket_condition_wait (socket, G_IO_OUT, cancellable, error)) if (g_socket_condition_wait (socket, G_IO_OUT, cancellable, error))
@ -2875,6 +2877,8 @@ g_socket_connect (GSocket *socket,
break; break;
} }
win32_unset_event_mask (socket, FD_CONNECT);
socket->priv->connected_read = TRUE; socket->priv->connected_read = TRUE;
socket->priv->connected_write = TRUE; socket->priv->connected_write = TRUE;
@ -3068,8 +3072,6 @@ g_socket_receive_with_timeout (GSocket *socket,
while (1) while (1)
{ {
win32_unset_event_mask (socket, FD_READ);
if ((ret = recv (socket->priv->fd, buffer, size, 0)) < 0) if ((ret = recv (socket->priv->fd, buffer, size, 0)) < 0)
{ {
int errsv = get_socket_errno (); int errsv = get_socket_errno ();
@ -3084,6 +3086,8 @@ g_socket_receive_with_timeout (GSocket *socket,
errsv == EAGAIN) errsv == EAGAIN)
#endif #endif
{ {
win32_unset_event_mask (socket, FD_READ);
if (timeout != 0) if (timeout != 0)
{ {
if (!block_on_timeout (socket, G_IO_IN, timeout, start_time, if (!block_on_timeout (socket, G_IO_IN, timeout, start_time,
@ -3094,10 +3098,14 @@ g_socket_receive_with_timeout (GSocket *socket,
} }
} }
win32_unset_event_mask (socket, FD_READ);
socket_set_error_lazy (error, errsv, _("Error receiving data: %s")); socket_set_error_lazy (error, errsv, _("Error receiving data: %s"));
return -1; return -1;
} }
win32_unset_event_mask (socket, FD_READ);
break; break;
} }
@ -3263,8 +3271,6 @@ g_socket_send_with_timeout (GSocket *socket,
while (1) while (1)
{ {
win32_unset_event_mask (socket, FD_WRITE);
if ((ret = send (socket->priv->fd, (const char *)buffer, size, G_SOCKET_DEFAULT_SEND_FLAGS)) < 0) if ((ret = send (socket->priv->fd, (const char *)buffer, size, G_SOCKET_DEFAULT_SEND_FLAGS)) < 0)
{ {
int errsv = get_socket_errno (); int errsv = get_socket_errno ();
@ -3279,6 +3285,8 @@ g_socket_send_with_timeout (GSocket *socket,
errsv == EAGAIN) errsv == EAGAIN)
#endif #endif
{ {
win32_unset_event_mask (socket, FD_WRITE);
if (timeout != 0) if (timeout != 0)
{ {
if (!block_on_timeout (socket, G_IO_OUT, timeout, start_time, if (!block_on_timeout (socket, G_IO_OUT, timeout, start_time,
@ -4755,8 +4763,6 @@ g_socket_send_message_with_timeout (GSocket *socket,
while (1) while (1)
{ {
win32_unset_event_mask (socket, FD_WRITE);
if (address) if (address)
result = WSASendTo (socket->priv->fd, result = WSASendTo (socket->priv->fd,
bufs, num_vectors, bufs, num_vectors,
@ -4778,6 +4784,8 @@ g_socket_send_message_with_timeout (GSocket *socket,
if (errsv == WSAEWOULDBLOCK) if (errsv == WSAEWOULDBLOCK)
{ {
win32_unset_event_mask (socket, FD_WRITE);
if (timeout != 0) if (timeout != 0)
{ {
if (!block_on_timeout (socket, G_IO_OUT, timeout, if (!block_on_timeout (socket, G_IO_OUT, timeout,
@ -5225,8 +5233,6 @@ g_socket_receive_message_with_timeout (GSocket *socket,
/* do it */ /* do it */
while (1) while (1)
{ {
win32_unset_event_mask (socket, FD_READ);
addrlen = sizeof addr; addrlen = sizeof addr;
if (address) if (address)
result = WSARecvFrom (socket->priv->fd, result = WSARecvFrom (socket->priv->fd,
@ -5248,6 +5254,8 @@ g_socket_receive_message_with_timeout (GSocket *socket,
if (errsv == WSAEWOULDBLOCK) if (errsv == WSAEWOULDBLOCK)
{ {
win32_unset_event_mask (socket, FD_READ);
if (timeout != 0) if (timeout != 0)
{ {
if (!block_on_timeout (socket, G_IO_IN, timeout, if (!block_on_timeout (socket, G_IO_IN, timeout,
@ -5261,6 +5269,7 @@ g_socket_receive_message_with_timeout (GSocket *socket,
socket_set_error_lazy (error, errsv, _("Error receiving message: %s")); socket_set_error_lazy (error, errsv, _("Error receiving message: %s"));
return -1; return -1;
} }
win32_unset_event_mask (socket, FD_READ);
break; break;
} }

7
gio/tests/pollable.c
View File

@ -38,10 +38,13 @@ poll_source_callback (GPollableInputStream *in,
gssize nread; gssize nread;
gboolean *success = user_data; gboolean *success = user_data;
g_assert_true (g_pollable_input_stream_is_readable (G_POLLABLE_INPUT_STREAM (in)));
nread = g_pollable_input_stream_read_nonblocking (in, buf, 2, NULL, &error); nread = g_pollable_input_stream_read_nonblocking (in, buf, 2, NULL, &error);
g_assert_no_error (error); g_assert_no_error (error);
g_assert_cmpint (nread, ==, 2); g_assert_cmpint (nread, ==, 2);
g_assert_cmpstr (buf, ==, "x"); g_assert_cmpstr (buf, ==, "x");
g_assert_false (g_pollable_input_stream_is_readable (G_POLLABLE_INPUT_STREAM (in)));
*success = TRUE; *success = TRUE;
return G_SOURCE_REMOVE; return G_SOURCE_REMOVE;
@ -65,9 +68,13 @@ write_callback (gpointer user_data)
gssize nwrote; gssize nwrote;
GError *error = NULL; GError *error = NULL;
g_assert_true (g_pollable_output_stream_is_writable (G_POLLABLE_OUTPUT_STREAM (out)));
nwrote = g_output_stream_write (out, buf, 2, NULL, &error); nwrote = g_output_stream_write (out, buf, 2, NULL, &error);
g_assert_no_error (error); g_assert_no_error (error);
g_assert_cmpint (nwrote, ==, 2); g_assert_cmpint (nwrote, ==, 2);
g_assert_true (g_pollable_output_stream_is_writable (G_POLLABLE_OUTPUT_STREAM (out)));
/* Give the pipe a few ticks to propagate the write for sockets. On my /* Give the pipe a few ticks to propagate the write for sockets. On my
* iMac i7, 40 works, 30 doesn't. */ * iMac i7, 40 works, 30 doesn't. */
g_usleep (80L); g_usleep (80L);