+/*
+ * tpool-poll.c: poll related stuff
+ *
+ * Authors:
+ * Dietmar Maurer (dietmar@ximian.com)
+ * Gonzalo Paniagua Javier (gonzalo@ximian.com)
+ *
+ * Copyright 2001-2003 Ximian, Inc (http://www.ximian.com)
+ * Copyright 2004-2011 Novell, Inc (http://www.novell.com)
+ */
+
#define INIT_POLLFD(a, b, c) {(a)->fd = b; (a)->events = c; (a)->revents = 0;}
struct _tp_poll_data {
int pipe [2];
static void tp_poll_modify (gpointer event_data, int fd, int operation, int events, gboolean is_new);
static void tp_poll_wait (gpointer p);
-#ifdef HOST_WIN32
-static void
-connect_hack (gpointer x)
-{
- struct sockaddr_in *addr = (struct sockaddr_in *) x;
- int count = 0;
-
- while (connect ((SOCKET) socket_io_data.pipe [1], (SOCKADDR *) addr, sizeof (struct sockaddr_in))) {
- Sleep (500);
- if (++count > 3) {
- g_warning ("Error initializing async. sockets %d.", WSAGetLastError ());
- g_assert (WSAGetLastError ());
- }
- }
-}
-#endif
-
static gpointer
tp_poll_init (SocketIOData *data)
{
tp_poll_data *result;
#ifdef HOST_WIN32
- struct sockaddr_in server;
struct sockaddr_in client;
+ struct sockaddr_in server;
SOCKET srv;
int len;
#endif
server.sin_family = AF_INET;
server.sin_addr.s_addr = inet_addr ("127.0.0.1");
server.sin_port = 0;
- if (bind (srv, (SOCKADDR *) &server, sizeof (server))) {
+ if (bind (srv, (SOCKADDR *) &server, sizeof (struct sockaddr_in))) {
g_print ("%d\n", WSAGetLastError ());
g_assert (1 != 0);
}
len = sizeof (server);
getsockname (srv, (SOCKADDR *) &server, &len);
listen (srv, 1);
- mono_thread_create (mono_get_root_domain (), connect_hack, &server);
- len = sizeof (server);
+ if (connect ((SOCKET) result->pipe [1], (SOCKADDR *) &server, sizeof (server)) == SOCKET_ERROR) {
+ g_print ("%d\n", WSAGetLastError ());
+ g_assert (1 != 0);
+ }
+ len = sizeof (client);
result->pipe [0] = accept (srv, (SOCKADDR *) &client, &len);
g_assert (result->pipe [0] != INVALID_SOCKET);
closesocket (srv);
{
tp_poll_data *data = event_data;
char msg [1];
- int w;
+ int unused;
MONO_SEM_WAIT (&data->new_sem);
INIT_POLLFD (&data->newpfd, GPOINTER_TO_INT (fd), events);
*msg = (char) operation;
#ifndef HOST_WIN32
- w = write (data->pipe [1], msg, 1);
+ unused = write (data->pipe [1], msg, 1);
#else
- send ((SOCKET) data->pipe [1], msg, 1, 0);
+ unused = send ((SOCKET) data->pipe [1], msg, 1, 0);
#endif
}
#define INITIAL_POLLFD_SIZE 1024
#endif
#define POLL_ERRORS (MONO_POLLERR | MONO_POLLHUP | MONO_POLLNVAL)
+
+#ifdef DISABLE_SOCKETS
+#define socket_io_cleanup(x)
+#endif
mono_pollfd *pfds;
gint maxfd = 1;
gint allocated;
MonoInternalThread *thread;
tp_poll_data *data;
SocketIOData *socket_io_data = p;
- gpointer *async_results;
+ MonoPtrArray async_results;
gint nresults;
thread = mono_thread_internal_current ();
data = socket_io_data->event_data;
allocated = INITIAL_POLLFD_SIZE;
pfds = g_new0 (mono_pollfd, allocated);
- async_results = g_new0 (gpointer, allocated * 2);
+ mono_ptr_array_init (async_results, allocated * 2);
INIT_POLLFD (pfds, data->pipe [0], MONO_POLLIN);
for (i = 1; i < allocated; i++)
INIT_POLLFD (&pfds [i], -1, 0);
- printf ("poll_wait\n");
while (1) {
int nsock = 0;
mono_pollfd *pfd;
MonoMList *list;
MonoObject *ares;
+ mono_gc_set_skip_thread (TRUE);
+
do {
if (nsock == -1) {
if (THREAD_WANTS_A_BREAK (thread))
nsock = mono_poll (pfds, maxfd, -1);
} while (nsock == -1 && errno == EINTR);
+ mono_gc_set_skip_thread (FALSE);
+
/*
* Apart from EINTR, we only check EBADF, for the rest:
* EINVAL: mono_poll() 'protects' us from descriptor
if ((pfds->revents & POLL_ERRORS) != 0) {
/* We're supposed to die now, as the pipe has been closed */
g_free (pfds);
- g_free (async_results);
+ mono_ptr_array_destroy (async_results);
socket_io_cleanup (socket_io_data);
return;
}
/* Got a new socket */
if ((pfds->revents & MONO_POLLIN) != 0) {
int nread;
+ gboolean found = FALSE;
for (i = 1; i < allocated; i++) {
pfd = &pfds [i];
- if (pfd->fd == -1 || pfd->fd == data->newpfd.fd)
+ if (pfd->fd == data->newpfd.fd) {
+ found = TRUE;
break;
+ }
+ }
+
+ if (!found) {
+ for (i = 1; i < allocated; i++) {
+ pfd = &pfds [i];
+ if (pfd->fd == -1)
+ break;
+ }
}
if (i == allocated) {
g_free (oldfd);
for (; i < allocated; i++)
INIT_POLLFD (&pfds [i], -1, 0);
- async_results = g_renew (gpointer, async_results, allocated * 2);
+ //async_results = g_renew (gpointer, async_results, allocated * 2);
}
#ifndef HOST_WIN32
nread = read (data->pipe [0], one, 1);
#endif
if (nread <= 0) {
g_free (pfds);
- g_free (async_results);
+ mono_ptr_array_destroy (async_results);
return; /* we're closed */
}
EnterCriticalSection (&socket_io_data->io_lock);
if (socket_io_data->inited == 3) {
g_free (pfds);
- g_free (async_results);
+ mono_ptr_array_destroy (async_results);
LeaveCriticalSection (&socket_io_data->io_lock);
return; /* cleanup called */
}
nresults = 0;
+ mono_ptr_array_clear (async_results);
+
for (i = 1; i < maxfd && nsock > 0; i++) {
pfd = &pfds [i];
if (pfd->fd == -1 || pfd->revents == 0)
list = mono_g_hash_table_lookup (socket_io_data->sock_to_state, GINT_TO_POINTER (pfd->fd));
if (list != NULL && (pfd->revents & (MONO_POLLIN | POLL_ERRORS)) != 0) {
ares = get_io_event (&list, MONO_POLLIN);
- if (ares != NULL)
- async_results [nresults++] = ares;
+ if (ares != NULL) {
+ mono_ptr_array_append (async_results, ares);
+ ++nresults;
+ }
}
if (list != NULL && (pfd->revents & (MONO_POLLOUT | POLL_ERRORS)) != 0) {
ares = get_io_event (&list, MONO_POLLOUT);
- if (ares != NULL)
- async_results [nresults++] = ares;
+ if (ares != NULL) {
+ mono_ptr_array_append (async_results, ares);
+ ++nresults;
+ }
}
if (list != NULL) {
}
}
LeaveCriticalSection (&socket_io_data->io_lock);
- threadpool_append_jobs (&async_io_tp, (MonoObject **) async_results, nresults);
- memset (async_results, 0, sizeof (gpointer) * nresults);
+ threadpool_append_jobs (&async_io_tp, (MonoObject **) async_results.data, nresults);
+ mono_ptr_array_clear (async_results);
}
}
projects / mono.git / blobdiff