X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=mono%2Fmetadata%2Fthreadpool-ms-io-poll.c;h=88bdc9f839be81a2bdcff84a7f8ae9207143ca55;hb=9b163221b5bd548821375dd00bab054826c4c31e;hp=fd423b86c93afa62ca46c8db241c20a5bc1382da;hpb=46a6b5484007522283f2173534dbbd830ad625dc;p=mono.git

diff --git a/mono/metadata/threadpool-ms-io-poll.c b/mono/metadata/threadpool-ms-io-poll.c
index fd423b86c93..88bdc9f839b 100644
--- a/mono/metadata/threadpool-ms-io-poll.c
+++ b/mono/metadata/threadpool-ms-io-poll.c
@@ -68,7 +68,7 @@ poll_mark_bad_fds (mono_pollfd *poll_fds, gint poll_fds_size)
 }
 
 static void
-poll_update_add (gint fd, gint events, gboolean is_new)
+poll_register_fd (gint fd, gint events, gboolean is_new)
 {
 	gboolean found = FALSE;
 	gint j, k;
@@ -81,6 +81,12 @@ poll_update_add (gint fd, gint events, gboolean is_new)
 		}
 	}
 
+	if (events == 0) {
+		if (found)
+			POLL_INIT_FD (poll_fds + j, -1, 0);
+		return;
+	}
+
 	if (!found) {
 		for (j = 1; j < poll_fds_capacity; ++j) {
 			mono_pollfd *poll_fd = poll_fds + j;
@@ -175,21 +181,11 @@ poll_event_get_fd_max (void)
 	return poll_fds_size;
 }
 
-static void
-poll_event_reset_fd_at (gint i, gint events)
-{
-	g_assert (poll_fds [i].fd != -1);
-	g_assert (poll_fds [i].revents != 0);
-
-	POLL_INIT_FD (&poll_fds [i], events == 0 ? -1 : poll_fds [i].fd, events);
-}
-
 static ThreadPoolIOBackend backend_poll = {
 	.init = poll_init,
 	.cleanup = poll_cleanup,
-	.update_add = poll_update_add,
+	.register_fd = poll_register_fd,
 	.event_wait = poll_event_wait,
 	.event_get_fd_max = poll_event_get_fd_max,
 	.event_get_fd_at = poll_event_get_fd_at,
-	.event_reset_fd_at = poll_event_reset_fd_at,
 };