[sgen] Remove obsolete check in #ifdef.

[mono.git] / mono / metadata / console-unix.c

diff --git a/mono/metadata/console-unix.c b/mono/metadata/console-unix.c
index 773833deabcd73f42783b41ca20c0ea5e4fffdfc..6a70b350085b9d7183412a63aaf9f9860fc28cf0 100644 (file)
--- a/mono/metadata/console-unix.c
+++ b/mono/metadata/console-unix.c
@@ -17,6 +17,9 @@
 #include <fcntl.h>
 #include <errno.h>
 #include <signal.h>
+#ifdef HAVE_SYS_SELECT_H
+#    include <sys/select.h>
+#endif
 #ifdef HAVE_SYS_TIME_H
 #    include <sys/time.h>
 #endif
@@ -28,8 +31,10 @@
 #include <mono/metadata/object-internals.h>
 #include <mono/metadata/class-internals.h>
 #include <mono/metadata/domain-internals.h>
+#include <mono/metadata/gc-internal.h>
 #include <mono/metadata/metadata.h>
 #include <mono/metadata/threadpool.h>
+#include <mono/utils/mono-signal-handler.h>
 
 /* On solaris, curses.h must come before both termios.h and term.h */
 #ifdef HAVE_CURSES_H
@@ -200,13 +205,15 @@ terminal_get_dimensions (void)
 static void
 tty_teardown (void)
 {
+       int unused;
+
        MONO_ARCH_SAVE_REGS;
 
        if (!setup_finished)
                return;
 
        if (teardown_str != NULL) {
-               write (STDOUT_FILENO, teardown_str, strlen (teardown_str));
+               unused = write (STDOUT_FILENO, teardown_str, strlen (teardown_str));
                g_free (teardown_str);
                teardown_str = NULL;
        }
@@ -229,6 +236,7 @@ do_console_cancel_event (void)
        MonoMethod *im;
        MonoVTable *vtable;
 
+       /* FIXME: this should likely iterate all the domains, instead */
        if (!domain->domain)
                return;
 
@@ -256,9 +264,20 @@ do_console_cancel_event (void)
        mono_thread_pool_add ((MonoObject *) load_value, msg, NULL, NULL);
 }
 
+static int need_cancel = FALSE;
+/* this is executed from the finalizer thread */
+void
+mono_console_handle_async_ops (void)
+{
+       if (need_cancel) {
+               need_cancel = FALSE;
+               do_console_cancel_event ();
+       }
+}
+
 static gboolean in_sigint;
-static void
-sigint_handler (int signo)
+
+MONO_SIGNAL_HANDLER_FUNC (static, sigint_handler, (int signo))
 {
        int save_errno;
        MONO_ARCH_SAVE_REGS;
@@ -268,21 +287,22 @@ sigint_handler (int signo)
 
        in_sigint = TRUE;
        save_errno = errno;
-       do_console_cancel_event ();
+       need_cancel = TRUE;
+       mono_gc_finalize_notify ();
        errno = save_errno;
        in_sigint = FALSE;
 }
 
 static struct sigaction save_sigcont, save_sigint, save_sigwinch;
 
-static void
-sigcont_handler (int signo, void *the_siginfo, void *data)
+MONO_SIGNAL_HANDLER_FUNC (static, sigcont_handler, (int signo, void *the_siginfo, void *data))
 {
+       int unused;
        // Ignore error, there is not much we can do in the sigcont handler.
        tcsetattr (STDIN_FILENO, TCSANOW, &mono_attr);
 
        if (keypad_xmit_str != NULL)
-               write (STDOUT_FILENO, keypad_xmit_str, strlen (keypad_xmit_str));
+               unused = write (STDOUT_FILENO, keypad_xmit_str, strlen (keypad_xmit_str));
 
        // Call previous handler
        if (save_sigcont.sa_sigaction != NULL &&
@@ -291,8 +311,7 @@ sigcont_handler (int signo, void *the_siginfo, void *data)
                (*save_sigcont.sa_sigaction) (signo, the_siginfo, data);
 }
 
-static void
-sigwinch_handler (int signo, void *the_siginfo, void *data)
+MONO_SIGNAL_HANDLER_FUNC (static, sigwinch_handler, (int signo, void *the_siginfo, void *data))
 {
        int dims = terminal_get_dimensions ();
        if (dims != -1)
@@ -341,7 +360,7 @@ console_set_signal_handlers ()
        sigaction (SIGCONT, &sigcont, &save_sigcont);
        
        // Interrupt handler
-       sigint.sa_handler = sigint_handler;
+       sigint.sa_handler = (void *) sigint_handler;
        sigint.sa_flags = 0;
        sigemptyset (&sigint.sa_mask);
        sigaction (SIGINT, &sigint, &save_sigint);
@@ -435,10 +454,10 @@ ves_icall_System_ConsoleDriver_TtySetup (MonoString *keypad, MonoString *teardow
        if (dims == -1){
                int cols = 0, rows = 0;
                                      
-               char *str = getenv ("COLUMNS");
+               const char *str = g_getenv ("COLUMNS");
                if (str != NULL)
                        cols = atoi (str);
-               str = getenv ("LINES");
+               str = g_getenv ("LINES");
                if (str != NULL)
                        rows = atoi (str);