* giowin32.c: IO Channels for Win32.
* Copyright 1998 Owen Taylor and Tor Lillqvist
* Copyright 1999-2000 Tor Lillqvist and Craig Setera
- * Copyright 2001 Andrew Lanoix
+ * Copyright 2001-2003 Andrew Lanoix
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
/* Following fields used by socket channels */
GSList *watches;
HANDLE data_avail_noticed_event;
+ gint reset_send; /* socket used to send data so select_thread() can reset/re-loop */
+ gint reset_recv; /* socket used to recv data so select_thread() can reset/re-loop */
};
#define LOCK(mutex) EnterCriticalSection (&mutex)
WaitForSingleObject (channel->space_avail_event, INFINITE);
}
+static void
+init_reset_sockets(GIOWin32Channel *channel)
+{
+ struct sockaddr_in local, local2, server;
+ unsigned int addr;
+ int len;
+ struct hostent *hp;
+
+ channel->reset_send = (gint) socket(AF_INET, SOCK_DGRAM, 0);
+ if (channel->reset_send == INVALID_SOCKET)
+ {
+ g_warning (G_STRLOC ": Error creating reset_send socket: %s\n",
+ g_win32_error_message (WSAGetLastError ()));
+ }
+
+ local.sin_family = AF_INET;
+ local.sin_port = 0;
+ local.sin_addr.S_un.S_addr = htonl(INADDR_ANY);
+
+ if (bind(channel->reset_send, (struct sockaddr *)&local, sizeof(local)) == SOCKET_ERROR)
+ {
+ g_warning (G_STRLOC ": Error binding to reset_send socket: %s\n",
+ g_win32_error_message (WSAGetLastError ()));
+ }
+
+ local2.sin_family = AF_INET;
+ local2.sin_port = 0;
+ local2.sin_addr.S_un.S_addr = htonl(INADDR_ANY);
+
+ channel->reset_recv = (gint) socket(AF_INET, SOCK_DGRAM, 0);
+ if (channel->reset_recv == INVALID_SOCKET)
+ {
+ g_warning (G_STRLOC ": Error creating reset_recv socket: %s\n",
+ g_win32_error_message (WSAGetLastError ()));
+ }
+
+ if (bind(channel->reset_recv, (struct sockaddr *)&local2, sizeof(local)) == SOCKET_ERROR)
+ {
+ g_warning (G_STRLOC ": Error binding to reset_recv socket: %s\n",
+ g_win32_error_message (WSAGetLastError ()));
+ }
+
+ len = sizeof(local2);
+ if (getsockname(channel->reset_recv, (struct sockaddr *)&local2, &len) == SOCKET_ERROR)
+ {
+ g_warning (G_STRLOC ": Error getsockname with reset_recv socket: %s\n",
+ g_win32_error_message (WSAGetLastError ()));
+ }
+
+ addr = inet_addr("127.0.0.1");
+ hp = gethostbyaddr((char *)&addr,4,AF_INET);
+
+ memset(&server,0,sizeof(server));
+ memcpy(&(server.sin_addr),hp->h_addr,hp->h_length);
+ server.sin_family = hp->h_addrtype;
+ server.sin_port = local2.sin_port;
+
+ if (connect(channel->reset_send, (struct sockaddr *)&server, sizeof(server)) == SOCKET_ERROR)
+ {
+ g_warning (G_STRLOC ": connect to reset_recv socket: %s\n",
+ g_win32_error_message (WSAGetLastError ()));
+ }
+
+}
+
static GIOStatus
buffer_read (GIOWin32Channel *channel,
guchar *dest,
fd_set read_fds, write_fds, except_fds;
GSList *tmp;
int n;
+ char buffer[8];
g_io_channel_ref ((GIOChannel *)channel);
FD_ZERO (&read_fds);
FD_ZERO (&write_fds);
FD_ZERO (&except_fds);
+ FD_SET(channel->reset_recv, &read_fds);
+ LOCK (channel->mutex);
tmp = channel->watches;
while (tmp)
- {
- GIOWin32Watch *watch = (GIOWin32Watch *)tmp->data;
-
- if (watch->condition & (G_IO_IN | G_IO_HUP))
- FD_SET (channel->fd, &read_fds);
- if (watch->condition & G_IO_OUT)
- FD_SET (channel->fd, &write_fds);
- if (watch->condition & G_IO_ERR)
- FD_SET (channel->fd, &except_fds);
+ {
+ GIOWin32Watch *watch = (GIOWin32Watch *)tmp->data;
+
+ if (watch->condition & (G_IO_IN | G_IO_HUP))
+ FD_SET (channel->fd, &read_fds);
+ if (watch->condition & G_IO_OUT)
+ FD_SET (channel->fd, &write_fds);
+ if (watch->condition & G_IO_ERR)
+ FD_SET (channel->fd, &except_fds);
- tmp = tmp->next;
- }
+ tmp = tmp->next;
+ }
+ UNLOCK (channel->mutex);
+
if (channel->debug)
- g_print ("select_thread %#x: calling select() for%s%s%s\n",
- channel->thread_id,
- (FD_ISSET (channel->fd, &read_fds) ? " IN" : ""),
- (FD_ISSET (channel->fd, &write_fds) ? " OUT" : ""),
- (FD_ISSET (channel->fd, &except_fds) ? " ERR" : ""));
+ g_print ("select_thread %#x: calling select() for%s%s%s\n",
+ channel->thread_id,
+ (FD_ISSET (channel->fd, &read_fds) ? " IN" : ""),
+ (FD_ISSET (channel->fd, &write_fds) ? " OUT" : ""),
+ (FD_ISSET (channel->fd, &except_fds) ? " ERR" : ""));
n = select (1, &read_fds, &write_fds, &except_fds, NULL);
+ LOCK (channel->mutex);
+ if (channel->needs_close)
+ {
+ UNLOCK (channel->mutex);
+ break;
+ }
+ UNLOCK (channel->mutex);
+
if (n == SOCKET_ERROR)
{
if (channel->debug)
break;
}
+ if (FD_ISSET(channel->reset_recv, &read_fds))
+ {
if (channel->debug)
- g_print ("select_thread %#x: got%s%s%s\n",
- channel->thread_id,
- (FD_ISSET (channel->fd, &read_fds) ? " IN" : ""),
- (FD_ISSET (channel->fd, &write_fds) ? " OUT" : ""),
- (FD_ISSET (channel->fd, &except_fds) ? " ERR" : ""));
-
- if (FD_ISSET (channel->fd, &read_fds))
- channel->revents |= G_IO_IN;
- if (FD_ISSET (channel->fd, &write_fds))
- channel->revents |= G_IO_OUT;
- if (FD_ISSET (channel->fd, &except_fds))
- channel->revents |= G_IO_ERR;
-
- if (channel->debug)
- g_print ("select_thread %#x: resetting data_avail_noticed, setting data_avail\n",
- channel->thread_id);
- ResetEvent (channel->data_avail_noticed_event);
- SetEvent (channel->data_avail_event);
+ g_print ("select_thread %#x: re-looping\n",
+ channel->thread_id);
+ recv(channel->reset_recv, (char *)&buffer, (int) sizeof(buffer), 0);
+ continue;
+ }
- LOCK (channel->mutex);
- if (channel->needs_close)
- {
- UNLOCK (channel->mutex);
- break;
- }
+ if (channel->debug)
+ g_print ("select_thread %#x: got%s%s%s\n",
+ channel->thread_id,
+ (FD_ISSET (channel->fd, &read_fds) ? " IN" : ""),
+ (FD_ISSET (channel->fd, &write_fds) ? " OUT" : ""),
+ (FD_ISSET (channel->fd, &except_fds) ? " ERR" : ""));
+
+ if (FD_ISSET (channel->fd, &read_fds))
+ channel->revents |= G_IO_IN;
+ if (FD_ISSET (channel->fd, &write_fds))
+ channel->revents |= G_IO_OUT;
+ if (FD_ISSET (channel->fd, &except_fds))
+ channel->revents |= G_IO_ERR;
+
+ if (channel->debug)
+ g_print ("select_thread %#x: resetting data_avail_noticed, setting data_avail\n",
+ channel->thread_id);
+
+ LOCK (channel->mutex);
+ ResetEvent (channel->data_avail_noticed_event);
+ SetEvent (channel->data_avail_event);
+ if (channel->needs_close)
+ {
UNLOCK (channel->mutex);
+ break;
+ }
+ UNLOCK (channel->mutex);
- if (channel->debug)
- g_print ("select_thread %#x: waiting for data_avail_noticed\n",
- channel->thread_id);
+ if (channel->debug)
+ g_print ("select_thread %#x: waiting for data_avail_noticed\n",
+ channel->thread_id);
- WaitForSingleObject (channel->data_avail_noticed_event, INFINITE);
- if (channel->debug)
- g_print ("select_thread %#x: got data_avail_noticed\n",
+ WaitForSingleObject (channel->data_avail_noticed_event, INFINITE);
+ if (channel->debug)
+ g_print ("select_thread %#x: got data_avail_noticed\n",
channel->thread_id);
}
-
- channel->running = FALSE;
- LOCK (channel->mutex);
- if (channel->fd != -1)
- {
- /* DO NOT close the fd here */
- channel->fd = -1;
- }
+ LOCK (channel->mutex);
+ channel->running = FALSE;
if (channel->debug)
g_print ("select_thread %#x: got error, setting data_avail\n",
channel->thread_id);
SetEvent (channel->data_avail_event);
- UNLOCK (channel->mutex);
-
g_io_channel_unref((GIOChannel *)channel);
-
+ UNLOCK (channel->mutex);
+
/* No need to call _endthreadex(), the actual thread starter routine
* in MSVCRT (see crt/src/threadex.c:_threadstartex) calls
* _endthreadex() for us.
}
else if (channel->type == G_IO_WIN32_SOCKET)
{
+ LOCK (channel->mutex);
channel->revents = 0;
-
if (channel->debug)
g_print ("g_io_win32_prepare: for thread %#x, setting data_avail_noticed\n",
channel->thread_id);
if (channel->debug)
g_print ("g_io_win32_prepare: thread %#x, there.\n",
channel->thread_id);
+ UNLOCK (channel->mutex);
}
return ((watch->condition & buffer_condition) == watch->condition);
if (channel->type == G_IO_WIN32_SOCKET)
{
+ LOCK (channel->mutex);
if (channel->debug)
g_print ("g_io_win32_check: thread %#x, resetting data_avail\n",
channel->thread_id);
if (channel->debug)
g_print ("g_io_win32_check: thread %#x, there.\n",
channel->thread_id);
+ UNLOCK (channel->mutex);
}
return ((watch->pollfd.revents | buffer_condition) & watch->condition);
{
GIOWin32Watch *watch = (GIOWin32Watch *)source;
GIOWin32Channel *channel = (GIOWin32Channel *)watch->channel;
+ char send_buffer[] = "f";
+ LOCK (channel->mutex);
if (channel->debug)
g_print ("g_io_win32_finalize: channel with thread %#x\n",
channel->thread_id);
channel->watches = g_slist_remove (channel->watches, watch);
SetEvent (channel->data_avail_noticed_event);
+ if (channel->type == G_IO_WIN32_SOCKET)
+ send(channel->reset_send, send_buffer, sizeof(send_buffer), 0);
+
g_io_channel_unref (watch->channel);
+ UNLOCK (channel->mutex);
}
#if defined(G_PLATFORM_WIN32) && defined(__GNUC__)
GIOWin32Channel *win32_channel = (GIOWin32Channel *)channel;
GIOWin32Watch *watch;
GSource *source;
+ char send_buffer[] = "c";
source = g_source_new (&g_io_watch_funcs, sizeof (GIOWin32Watch));
watch = (GIOWin32Watch *)source;
if (win32_channel->debug)
g_print ("g_io_win32_create_watch: fd:%d condition:%#x handle:%#x\n",
win32_channel->fd, condition, watch->pollfd.fd);
-
+
+ LOCK (win32_channel->mutex);
win32_channel->watches = g_slist_append (win32_channel->watches, watch);
if (win32_channel->thread_id == 0)
create_thread (win32_channel, condition, thread);
+ else
+ send(win32_channel->reset_send, send_buffer, sizeof(send_buffer), 0);
g_source_add_poll (source, &watch->pollfd);
-
+ UNLOCK (win32_channel->mutex);
+
return source;
}
if (count < sizeof (MSG))
{
g_set_error(err, G_IO_CHANNEL_ERROR, G_IO_CHANNEL_ERROR_INVAL,
- _("Incorrect message size")); /* Informative enough error message? */
+ "Incorrect message size"); /* Informative enough error message? */
return G_IO_STATUS_ERROR;
}
if (count != sizeof (MSG))
{
g_set_error(err, G_IO_CHANNEL_ERROR, G_IO_CHANNEL_ERROR_INVAL,
- _("Incorrect message size")); /* Informative enough error message? */
+ "Incorrect message size"); /* Informative enough error message? */
return G_IO_STATUS_ERROR;
}
win32_channel->thread_id,
win32_channel->fd);
+ if (win32_channel->reset_send)
+ closesocket(win32_channel->reset_send);
+ if (win32_channel->reset_recv)
+ closesocket(win32_channel->reset_recv);
if (win32_channel->data_avail_event)
CloseHandle (win32_channel->data_avail_event);
if (win32_channel->space_avail_event)
{
GIOWin32Channel *win32_channel = (GIOWin32Channel *)channel;
gint result;
- GIOChannelError error;
+ GIOChannelError error = G_IO_STATUS_NORMAL;
+ GIOStatus internal_status = G_IO_STATUS_NORMAL;
+ char send_buffer[] = "sr";
if (win32_channel->debug)
g_print ("g_io_win32_sock_read: sockfd:%d count:%d\n",
error = G_IO_CHANNEL_ERROR_FAILED;
break;
}
- g_set_error(err, G_IO_CHANNEL_ERROR, error, _("Socket error"));
- return G_IO_STATUS_ERROR;
+ g_set_error(err, G_IO_CHANNEL_ERROR, error, "Socket read error");
+ internal_status = G_IO_STATUS_ERROR;
/* FIXME get all errors, better error messages */
}
else
{
*bytes_read = result;
-
- return (result > 0) ? G_IO_STATUS_NORMAL : G_IO_STATUS_EOF;
+ if (result == 0)
+ internal_status = G_IO_STATUS_EOF;
}
+
+ if ((internal_status == G_IO_STATUS_EOF) ||
+ (internal_status == G_IO_STATUS_ERROR))
+ {
+ LOCK (win32_channel->mutex);
+ SetEvent(win32_channel->data_avail_noticed_event);
+ win32_channel->needs_close = 1;
+ send(win32_channel->reset_send, send_buffer, sizeof(send_buffer), 0);
+ UNLOCK (win32_channel->mutex);
+ }
+ return internal_status;
}
static GIOStatus
{
GIOWin32Channel *win32_channel = (GIOWin32Channel *)channel;
gint result;
- GIOChannelError error;
+ GIOChannelError error = G_IO_STATUS_NORMAL;
+ char send_buffer[] = "sw";
if (win32_channel->debug)
g_print ("g_io_win32_sock_write: sockfd:%d count:%d\n",
error = G_IO_CHANNEL_ERROR_FAILED;
break;
}
- g_set_error(err, G_IO_CHANNEL_ERROR, error, _("Socket error"));
- return G_IO_STATUS_ERROR;
+ g_set_error(err, G_IO_CHANNEL_ERROR, error, "Socket write error");
+ LOCK (win32_channel->mutex);
+ SetEvent(win32_channel->data_avail_noticed_event);
+ win32_channel->needs_close = 1;
+ send(win32_channel->reset_send, send_buffer, sizeof(send_buffer), 0);
+ UNLOCK (win32_channel->mutex);
+ return G_IO_STATUS_ERROR;
/* FIXME get all errors, better error messages */
}
else
g_io_channel_init (channel);
g_io_channel_win32_init (win32_channel);
+ init_reset_sockets(channel);
if (win32_channel->debug)
g_print ("g_io_channel_win32_new_socket: sockfd:%d\n", socket);
channel->funcs = &win32_channel_sock_funcs;
projects / platform / upstream / glib.git / commitdiff