Fix call to mono_sgen_gc_unlock () in mono_gc_toggleref_add ().

[mono.git] / mono / metadata / tpool-epoll.c

diff --git a/mono/metadata/tpool-epoll.c b/mono/metadata/tpool-epoll.c
index e25143a58792f27ba8cc07303c5f4f21fd9a69f0..43a196dc9ede90ebb3cb5cc2d1a2123e10b44b23 100644 (file)
--- a/mono/metadata/tpool-epoll.c
+++ b/mono/metadata/tpool-epoll.c
@@ -7,6 +7,7 @@
  *
  * Copyright 2001-2003 Ximian, Inc (http://www.ximian.com)
  * Copyright 2004-2011 Novell, Inc (http://www.novell.com)
+ * Copyright 2011 Xamarin Inc (http://www.xamarin.com)
  */
 
 struct _tp_epoll_data {
@@ -30,8 +31,18 @@ tp_epoll_init (SocketIOData *data)
        result->epollfd = epoll_create (256); /* The number does not really matter */
        fcntl (result->epollfd, F_SETFD, FD_CLOEXEC);
 #endif
-       if (result->epollfd == -1)
+       if (result->epollfd == -1) {
+               int err = errno;
+               if (g_getenv ("MONO_DEBUG")) {
+#ifdef EPOLL_CLOEXEC
+                       g_message ("epoll_create1(EPOLL_CLOEXEC) failed: %d %s", err, g_strerror (err));
+#else
+                       g_message ("epoll_create(256) failed: %d %s", err, g_strerror (err));
+#endif
+               }
+
                return NULL;
+       }
 
        data->shutdown = tp_epoll_shutdown;
        data->modify = tp_epoll_modify;
@@ -70,7 +81,7 @@ tp_epoll_shutdown (gpointer event_data)
        tp_epoll_data *data = event_data;
 
        close (data->epollfd);
-       data->epollfd = -1;
+       g_free (data);
 }
 
 #define EPOLL_ERRORS (EPOLLERR | EPOLLHUP)
@@ -108,14 +119,12 @@ tp_epoll_wait (gpointer p)
                        if (err != EBADF)
                                g_warning ("epoll_wait: %d %s", err, g_strerror (err));
 
-                       close (epollfd);
                        return;
                }
 
                EnterCriticalSection (&socket_io_data->io_lock);
                if (socket_io_data->inited == 3) {
                        g_free (events);
-                       close (epollfd);
                        LeaveCriticalSection (&socket_io_data->io_lock);
                        return; /* cleanup called */
                }
@@ -142,10 +151,17 @@ tp_epoll_wait (gpointer p)
                        }
 
                        if (list != NULL) {
+                               int p;
+
                                mono_g_hash_table_replace (socket_io_data->sock_to_state, GINT_TO_POINTER (fd), list);
-                               evt->events = get_events_from_list (list);
-                               if (epoll_ctl (epollfd, EPOLL_CTL_MOD, fd, evt)) {
-                                       epoll_ctl (epollfd, EPOLL_CTL_ADD, fd, evt); /* ignoring error here */
+                               p = get_events_from_list (list);
+                               evt->events = (p & MONO_POLLOUT) ? EPOLLOUT : 0;
+                               evt->events |= (p & MONO_POLLIN) ? EPOLLIN : 0;
+                               if (epoll_ctl (epollfd, EPOLL_CTL_MOD, fd, evt) == -1) {
+                                       if (epoll_ctl (epollfd, EPOLL_CTL_ADD, fd, evt) == -1) {
+                                               int err = errno;
+                                               g_message ("epoll(ADD): %d %s", err, g_strerror (err));
+                                       }
                                }
                        } else {
                                mono_g_hash_table_remove (socket_io_data->sock_to_state, GINT_TO_POINTER (fd));
@@ -154,7 +170,8 @@ tp_epoll_wait (gpointer p)
                }
                LeaveCriticalSection (&socket_io_data->io_lock);
                threadpool_append_jobs (&async_io_tp, (MonoObject **) async_results, nresults);
-               memset (async_results, 0, sizeof (gpointer) * nresults);
+               mono_gc_bzero (async_results, sizeof (gpointer) * nresults);
        }
 }
 #undef EPOLL_NEVENTS
+#undef EPOLL_ERRORS