X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Futils%2Fmono-threads-posix-signals.c;h=b39277393f5d87a979793202fcae936459086a32;hb=ef7a4c06206976de7ef2e974267407347ddb75a4;hp=0c8e6b462b187f14f9a02dba0918722e0e2c54a5;hpb=94b8270e9bdbd9280de1ec144af20877d8c8d055;p=mono.git diff --git a/mono/utils/mono-threads-posix-signals.c b/mono/utils/mono-threads-posix-signals.c index 0c8e6b462b1..b39277393f5 100644 --- a/mono/utils/mono-threads-posix-signals.c +++ b/mono/utils/mono-threads-posix-signals.c @@ -1,5 +1,6 @@ -/* - * mono-threads-posix-signals.c: Shared facility for Posix signals support +/** + * \file + * Shared facility for Posix signals support * * Author: * Ludovic Henry (ludovic@gmail.com) @@ -17,19 +18,11 @@ #include #include -#include "mono-threads-debug.h" - -#if defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) -#define DEFAULT_SUSPEND_SIGNAL SIGXFSZ -#else -#define DEFAULT_SUSPEND_SIGNAL SIGPWR +#ifdef HAVE_ANDROID_LEGACY_SIGNAL_INLINES_H +#include #endif -#define DEFAULT_RESTART_SIGNAL SIGXCPU - -static int abort_signal_num; -static sigset_t suspend_signal_mask; -static sigset_t suspend_ack_signal_mask; +#include "mono-threads-debug.h" gint mono_threads_suspend_search_alternative_signal (void) @@ -50,31 +43,30 @@ mono_threads_suspend_search_alternative_signal (void) #endif } +static int suspend_signal_num = -1; +static int restart_signal_num = -1; +static int abort_signal_num = -1; + +static sigset_t suspend_signal_mask; +static sigset_t suspend_ack_signal_mask; + static void -signal_add_handler (int signo, gpointer handler, int flags) +signal_add_handler (int signo, void (*handler)(int, siginfo_t *, void *), int flags) { -#if defined(__native_client__) - g_assert_not_reached (); -#else - /*FIXME, move the code from mini to utils and do the right thing!*/ struct sigaction sa; - struct sigaction previous_sa; int ret; - sa.sa_sigaction = (void (*)(int, siginfo_t *, void *))handler; + sa.sa_sigaction = handler; sigfillset (&sa.sa_mask); - sa.sa_flags = SA_SIGINFO | flags; - ret = sigaction (signo, &sa, &previous_sa); - + ret = sigaction (signo, &sa, NULL); g_assert (ret != -1); -#endif } static int abort_signal_get (void) { -#if defined(PLATFORM_ANDROID) +#if defined(HOST_ANDROID) return SIGTTIN; #elif defined (SIGRTMIN) static int abort_signum = -1; @@ -84,37 +76,62 @@ abort_signal_get (void) #elif defined (SIGTTIN) return SIGTTIN; #else - return -1; + g_error ("unable to get abort signal"); +#endif +} + +static int +suspend_signal_get (void) +{ +#if defined(HOST_ANDROID) + return SIGPWR; +#elif defined (SIGRTMIN) + static int suspend_signum = -1; + if (suspend_signum == -1) + suspend_signum = mono_threads_suspend_search_alternative_signal (); + return suspend_signum; +#else +#if defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + return SIGXFSZ; +#else + return SIGPWR; +#endif +#endif +} + +static int +restart_signal_get (void) +{ +#if defined(HOST_ANDROID) + return SIGXCPU; +#elif defined (SIGRTMIN) + static int restart_signum = -1; + if (restart_signum == -1) + restart_signum = mono_threads_suspend_search_alternative_signal (); + return restart_signum; +#else + return SIGXCPU; #endif } static void restart_signal_handler (int _dummy, siginfo_t *_info, void *context) { -#if defined(__native_client__) - g_assert_not_reached (); -#else MonoThreadInfo *info; int old_errno = errno; info = mono_thread_info_current (); - info->signal = DEFAULT_RESTART_SIGNAL; + info->signal = restart_signal_num; errno = old_errno; -#endif } static void suspend_signal_handler (int _dummy, siginfo_t *info, void *context) { -#if defined(__native_client__) - g_assert_not_reached (); -#else int old_errno = errno; int hp_save_index = mono_hazard_pointer_save_for_signal_handler (); - MonoThreadInfo *current = mono_thread_info_current (); - gboolean ret; THREADS_SUSPEND_DEBUG ("SIGNAL HANDLER FOR %p [%p]\n", mono_thread_info_get_tid (current), (void*)current->native_handle); if (current->syscall_break_signal) { @@ -162,7 +179,7 @@ suspend_signal_handler (int _dummy, siginfo_t *info, void *context) do { current->signal = 0; sigsuspend (&suspend_signal_mask); - } while (current->signal != DEFAULT_RESTART_SIGNAL); + } while (current->signal != restart_signal_num); /* Unblock the restart signal. */ pthread_sigmask (SIG_UNBLOCK, &suspend_ack_signal_mask, NULL); @@ -185,7 +202,6 @@ suspend_signal_handler (int _dummy, siginfo_t *info, void *context) done: mono_hazard_pointer_restore_for_signal_handler (hp_save_index); errno = old_errno; -#endif } void @@ -195,18 +211,27 @@ mono_threads_suspend_init_signals (void) sigemptyset (&signal_set); + /* add suspend signal */ + suspend_signal_num = suspend_signal_get (); + + signal_add_handler (suspend_signal_num, suspend_signal_handler, SA_RESTART); + + sigaddset (&signal_set, suspend_signal_num); + + /* add restart signal */ + restart_signal_num = restart_signal_get (); + sigfillset (&suspend_signal_mask); - sigdelset (&suspend_signal_mask, DEFAULT_RESTART_SIGNAL); + sigdelset (&suspend_signal_mask, restart_signal_num); sigemptyset (&suspend_ack_signal_mask); - sigaddset (&suspend_ack_signal_mask, DEFAULT_RESTART_SIGNAL); + sigaddset (&suspend_ack_signal_mask, restart_signal_num); - signal_add_handler (DEFAULT_SUSPEND_SIGNAL, suspend_signal_handler, SA_RESTART); - signal_add_handler (DEFAULT_RESTART_SIGNAL, restart_signal_handler, SA_RESTART); + signal_add_handler (restart_signal_num, restart_signal_handler, SA_RESTART); - sigaddset (&signal_set, DEFAULT_SUSPEND_SIGNAL); - sigaddset (&signal_set, DEFAULT_RESTART_SIGNAL); + sigaddset (&signal_set, restart_signal_num); + /* add abort signal */ abort_signal_num = abort_signal_get (); /* the difference between abort and suspend here is made by not @@ -218,23 +243,36 @@ mono_threads_suspend_init_signals (void) /* ensure all the new signals are unblocked */ sigprocmask (SIG_UNBLOCK, &signal_set, NULL); + + /* + On 32bits arm Android, signals with values >=32 are not usable as their headers ship a broken sigset_t. + See 5005c6f3fbc1da584c6a550281689cc23f59fe6d for more details. + */ +#ifdef HOST_ANDROID + g_assert (suspend_signal_num < 32); + g_assert (restart_signal_num < 32); + g_assert (abort_signal_num < 32); +#endif } gint mono_threads_suspend_get_suspend_signal (void) { - return DEFAULT_SUSPEND_SIGNAL; + g_assert (suspend_signal_num != -1); + return suspend_signal_num; } gint mono_threads_suspend_get_restart_signal (void) { - return DEFAULT_RESTART_SIGNAL; + g_assert (restart_signal_num != -1); + return restart_signal_num; } gint mono_threads_suspend_get_abort_signal (void) { + g_assert (abort_signal_num != -1); return abort_signal_num; }