[System] Process.WaitForExit now triggers event Exited.

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

diff --git a/mono/metadata/tpool-kqueue.c b/mono/metadata/tpool-kqueue.c
index 82ae14e7256e3eaf6c56f70709ebc29359734e1c..1cbd26f26e654e0fb38ab55da80a31ab51df94b0 100644 (file)
--- a/mono/metadata/tpool-kqueue.c
+++ b/mono/metadata/tpool-kqueue.c
@@ -12,7 +12,7 @@ struct _tp_kqueue_data {
 };
 
 typedef struct _tp_kqueue_data tp_kqueue_data;
-static void tp_kqueue_modify (gpointer event_data, int fd, int operation, int events, gboolean is_new);
+static void tp_kqueue_modify (gpointer p, int fd, int operation, int events, gboolean is_new);
 static void tp_kqueue_shutdown (gpointer event_data);
 static void tp_kqueue_wait (gpointer event_data);
 
@@ -42,11 +42,14 @@ kevent_change (int kfd, struct kevent *evt, const char *error_str)
 }
 
 static void
-tp_kqueue_modify (gpointer event_data, int fd, int operation, int events, gboolean is_new)
+tp_kqueue_modify (gpointer p, int fd, int operation, int events, gboolean is_new)
 {
-       tp_kqueue_data *data = event_data;
+       SocketIOData *socket_io_data;
+       socket_io_data = p;
+       tp_kqueue_data *data = socket_io_data->event_data;
        struct kevent evt;
 
+       memset (&evt, 0, sizeof (evt));
        if ((events & MONO_POLLIN) != 0) {
                EV_SET (&evt, fd, EVFILT_READ, EV_ADD | EV_ENABLE | EV_ONESHOT, 0, 0, 0);
                kevent_change (data->fd, &evt, "ADD read");
@@ -56,6 +59,7 @@ tp_kqueue_modify (gpointer event_data, int fd, int operation, int events, gboole
                EV_SET (&evt, fd, EVFILT_WRITE, EV_ADD | EV_ENABLE | EV_ONESHOT, 0, 0, 0);
                kevent_change (data->fd, &evt, "ADD write");
        }
+       mono_mutex_unlock (&socket_io_data->io_lock);
 }
 
 static void
@@ -73,7 +77,6 @@ tp_kqueue_wait (gpointer p)
 {
        SocketIOData *socket_io_data;
        int kfd;
-       MonoInternalThread *thread;
        struct kevent *events, *evt;
        int ready = 0, i;
        gpointer async_results [KQUEUE_NEVENTS * 2]; // * 2 because each loop can add up to 2 results here
@@ -83,7 +86,6 @@ tp_kqueue_wait (gpointer p)
        socket_io_data = p;
        data = socket_io_data->event_data;
        kfd = data->fd;
-       thread = mono_thread_internal_current ();
        events = g_new0 (struct kevent, KQUEUE_NEVENTS);
 
        while (1) {
@@ -92,8 +94,7 @@ tp_kqueue_wait (gpointer p)
 
                do {
                        if (ready == -1) {
-                               if (THREAD_WANTS_A_BREAK (thread))
-                                       mono_thread_interruption_checkpoint ();
+                               check_for_interruption_critical ();
                        }
                        ready = kevent (kfd, NULL, 0, events, KQUEUE_NEVENTS, NULL);
                } while (ready == -1 && errno == EINTR);
@@ -109,10 +110,10 @@ tp_kqueue_wait (gpointer p)
                        return;
                }
 
-               EnterCriticalSection (&socket_io_data->io_lock);
+               mono_mutex_lock (&socket_io_data->io_lock);
                if (socket_io_data->inited == 3) {
                        g_free (events);
-                       LeaveCriticalSection (&socket_io_data->io_lock);
+                       mono_mutex_unlock (&socket_io_data->io_lock);
                        return; /* cleanup called */
                }
 
@@ -154,9 +155,9 @@ tp_kqueue_wait (gpointer p)
                                mono_g_hash_table_remove (socket_io_data->sock_to_state, GINT_TO_POINTER (fd));
                        }
                }
-               LeaveCriticalSection (&socket_io_data->io_lock);
+               mono_mutex_unlock (&socket_io_data->io_lock);
                threadpool_append_jobs (&async_io_tp, (MonoObject **) async_results, nresults);
-               mono_gc_bzero (async_results, sizeof (gpointer) * nresults);
+               mono_gc_bzero_aligned (async_results, sizeof (gpointer) * nresults);
        }
 }
 #undef KQUEUE_NEVENTS