Merge pull request #2721 from ludovic-henry/fix-mono_ms_ticks

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

diff --git a/mono/metadata/console-unix.c b/mono/metadata/console-unix.c
index 0ac3b3981f1a6dc5d0bc3f83c317c4c031321635..29ce37fc141bc4b8a92049e55590f10c7eef16b4 100644 (file)
--- a/mono/metadata/console-unix.c
+++ b/mono/metadata/console-unix.c
@@ -5,6 +5,7 @@
  *     Gonzalo Paniagua Javier (gonzalo@ximian.com)
  *
  * Copyright (C) 2005-2009 Novell, Inc. (http://www.novell.com)
+ * Licensed under the MIT license. See LICENSE file in the project root for full license information.
  */
 #if defined(__native_client__)
 #include "console-null.c"
@@ -221,6 +222,7 @@ static void
 do_console_cancel_event (void)
 {
        static MonoClassField *cancel_handler_field;
+       MonoError error;
        MonoDomain *domain = mono_domain_get ();
        MonoClass *klass;
        MonoDelegate *load_value;
@@ -231,7 +233,7 @@ do_console_cancel_event (void)
        if (!domain->domain)
                return;
 
-       klass = mono_class_from_name (mono_defaults.corlib, "System", "Console");
+       klass = mono_class_try_load_from_name (mono_defaults.corlib, "System", "Console");
        if (klass == NULL)
                return;
 
@@ -240,9 +242,11 @@ do_console_cancel_event (void)
                g_assert (cancel_handler_field);
        }
 
-       vtable = mono_class_vtable_full (domain, klass, FALSE);
-       if (vtable == NULL)
+       vtable = mono_class_vtable_full (domain, klass, &error);
+       if (vtable == NULL || !is_ok (&error)) {
+               mono_error_cleanup (&error);
                return;
+       }
        mono_field_static_get_value (vtable, cancel_handler_field, &load_value);
        if (load_value == NULL)
                return;
@@ -251,7 +255,11 @@ do_console_cancel_event (void)
        method = mono_class_get_method_from_name (klass, "BeginInvoke", -1);
        g_assert (method != NULL);
 
-       mono_threadpool_ms_begin_invoke (domain, (MonoObject*) load_value, method, NULL);
+       mono_threadpool_ms_begin_invoke (domain, (MonoObject*) load_value, method, NULL, &error);
+       if (!is_ok (&error)) {
+               g_warning ("Couldn't invoke System.Console cancel handler due to %s", mono_error_get_message (&error));
+               mono_error_cleanup (&error);
+       }
 }
 
 static int need_cancel = FALSE;
@@ -345,19 +353,19 @@ console_set_signal_handlers ()
        
        // Continuing
        sigcont.sa_handler = (void (*)(int)) sigcont_handler;
-       sigcont.sa_flags = 0;
+       sigcont.sa_flags = SA_RESTART;
        sigemptyset (&sigcont.sa_mask);
        sigaction (SIGCONT, &sigcont, &save_sigcont);
        
        // Interrupt handler
        sigint.sa_handler = (void (*)(int)) sigint_handler;
-       sigint.sa_flags = 0;
+       sigint.sa_flags = SA_RESTART;
        sigemptyset (&sigint.sa_mask);
        sigaction (SIGINT, &sigint, &save_sigint);
 
        // Window size changed
        sigwinch.sa_handler = (void (*)(int)) sigwinch_handler;
-       sigwinch.sa_flags = 0;
+       sigwinch.sa_flags = SA_RESTART;
        sigemptyset (&sigwinch.sa_mask);
        sigaction (SIGWINCH, &sigwinch, &save_sigwinch);
 #endif
@@ -437,6 +445,8 @@ set_control_chars (MonoArray *control_chars, const guchar *cc)
 MonoBoolean
 ves_icall_System_ConsoleDriver_TtySetup (MonoString *keypad, MonoString *teardown, MonoArray **control_chars, int **size)
 {
+       MonoError error;
+
        int dims;
 
        dims = terminal_get_dimensions ();
@@ -462,7 +472,10 @@ ves_icall_System_ConsoleDriver_TtySetup (MonoString *keypad, MonoString *teardow
 
        /* 17 is the number of entries set in set_control_chars() above.
         * NCCS is the total size, but, by now, we only care about those 17 values*/
-       mono_gc_wbarrier_generic_store (control_chars, (MonoObject*) mono_array_new (mono_domain_get (), mono_defaults.byte_class, 17));
+       MonoArray *control_chars_arr = mono_array_new_checked (mono_domain_get (), mono_defaults.byte_class, 17, &error);
+       if (mono_error_set_pending_exception (&error))
+               return FALSE;
+       mono_gc_wbarrier_generic_store (control_chars, (MonoObject*) control_chars_arr);
        if (tcgetattr (STDIN_FILENO, &initial_attr) == -1)
                return FALSE;