X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Futils%2Fmono-threads-mach.c;h=6f2ddfa78af52357be210b50a2a43c3a73526b52;hb=f392080f211ca2acc53f5cb1f616fd6a7c9699c9;hp=e8011d350f9e75139ac87b62f6fd2c6aac05e47a;hpb=8f09dad4353bb75afebf96ad58d08f7e7f3bf56d;p=mono.git diff --git a/mono/utils/mono-threads-mach.c b/mono/utils/mono-threads-mach.c index e8011d350f9..6f2ddfa78af 100644 --- a/mono/utils/mono-threads-mach.c +++ b/mono/utils/mono-threads-mach.c @@ -9,19 +9,20 @@ #include "config.h" -#if defined(__MACH__) +/* For pthread_main_np, pthread_get_stackaddr_np and pthread_get_stacksize_np */ +#if defined (__MACH__) +#define _DARWIN_C_SOURCE 1 +#endif + +#include +#include + +#if defined (USE_MACH_BACKEND) #include #include -#include #include #include -#include -#include -#include - -#include -#include void mono_threads_init_platform (void) @@ -29,25 +30,30 @@ mono_threads_init_platform (void) mono_threads_init_dead_letter (); } -void -mono_threads_core_interrupt (MonoThreadInfo *info) +#if defined(HOST_WATCHOS) || defined(HOST_TVOS) + +gboolean +mono_threads_core_begin_async_suspend (MonoThreadInfo *info, gboolean interrupt_kernel) { - thread_abort (info->native_handle); + g_assert_not_reached (); } -void -mono_threads_core_abort_syscall (MonoThreadInfo *info) +gboolean +mono_threads_core_check_suspend_result (MonoThreadInfo *info) { + g_assert_not_reached (); } gboolean -mono_threads_core_needs_abort_syscall (void) +mono_threads_core_begin_async_resume (MonoThreadInfo *info) { - return FALSE; + g_assert_not_reached (); } +#else /* defined(HOST_WATCHOS) || defined(HOST_TVOS) */ + gboolean -mono_threads_core_suspend (MonoThreadInfo *info) +mono_threads_core_begin_async_suspend (MonoThreadInfo *info, gboolean interrupt_kernel) { kern_return_t ret; gboolean res; @@ -55,29 +61,53 @@ mono_threads_core_suspend (MonoThreadInfo *info) g_assert (info); ret = thread_suspend (info->native_handle); + THREADS_SUSPEND_DEBUG ("SUSPEND %p -> %d\n", (void*)info->native_handle, ret); if (ret != KERN_SUCCESS) return FALSE; + + /* We're in the middle of a self-suspend, resume and register */ + if (!mono_threads_transition_finish_async_suspend (info)) { + mono_threads_add_to_pending_operation_set (info); + g_assert (thread_resume (info->native_handle) == KERN_SUCCESS); + THREADS_SUSPEND_DEBUG ("FAILSAFE RESUME/1 %p -> %d\n", (void*)info->native_handle, 0); + //XXX interrupt_kernel doesn't make sense in this case as the target is not in a syscall + return TRUE; + } res = mono_threads_get_runtime_callbacks ()-> - thread_state_init_from_handle (&info->suspend_state, mono_thread_info_get_tid (info), info->native_handle); - if (!res) - thread_resume (info->native_handle); + thread_state_init_from_handle (&info->thread_saved_state [ASYNC_SUSPEND_STATE_INDEX], info); + THREADS_SUSPEND_DEBUG ("thread state %p -> %d\n", (void*)info->native_handle, res); + if (res) { + if (interrupt_kernel) + thread_abort (info->native_handle); + } else { + mono_threads_transition_async_suspend_compensation (info); + g_assert (thread_resume (info->native_handle) == KERN_SUCCESS); + THREADS_SUSPEND_DEBUG ("FAILSAFE RESUME/2 %p -> %d\n", (void*)info->native_handle, 0); + } return res; } gboolean -mono_threads_core_resume (MonoThreadInfo *info) +mono_threads_core_check_suspend_result (MonoThreadInfo *info) +{ + return TRUE; +} + +gboolean +mono_threads_core_begin_async_resume (MonoThreadInfo *info) { kern_return_t ret; if (info->async_target) { - MonoContext tmp = info->suspend_state.ctx; + MonoContext tmp = info->thread_saved_state [ASYNC_SUSPEND_STATE_INDEX].ctx; mach_msg_type_number_t num_state; thread_state_t state; ucontext_t uctx; mcontext_t mctx; mono_threads_get_runtime_callbacks ()->setup_async_callback (&tmp, info->async_target, info->user_data); - info->async_target = info->user_data = NULL; + info->user_data = NULL; + info->async_target = (void (*)(void *)) info->user_data; state = (thread_state_t) alloca (mono_mach_arch_get_thread_state_size ()); mctx = (mcontext_t) alloca (mono_mach_arch_get_mcontext_size ()); @@ -97,15 +127,24 @@ mono_threads_core_resume (MonoThreadInfo *info) return FALSE; } - ret = thread_resume (info->native_handle); + THREADS_SUSPEND_DEBUG ("RESUME %p -> %d\n", (void*)info->native_handle, ret); + return ret == KERN_SUCCESS; } +#endif /* defined(HOST_WATCHOS) || defined(HOST_TVOS) */ + void mono_threads_platform_register (MonoThreadInfo *info) { + char thread_name [64]; + info->native_handle = mach_thread_self (); + + snprintf (thread_name, sizeof (thread_name), "tid_%x", (int) info->native_handle); + pthread_setname_np (thread_name); + mono_threads_install_dead_letter (); } @@ -115,33 +154,27 @@ mono_threads_platform_free (MonoThreadInfo *info) mach_port_deallocate (current_task (), info->native_handle); } -MonoNativeThreadId -mono_native_thread_id_get (void) -{ - return pthread_self (); -} - -gboolean -mono_native_thread_id_equals (MonoNativeThreadId id1, MonoNativeThreadId id2) -{ - return pthread_equal (id1, id2); -} - -/* - * mono_native_thread_create: - * - * Low level thread creation function without any GC wrappers. - */ -gboolean -mono_native_thread_create (MonoNativeThreadId *tid, gpointer func, gpointer arg) -{ - return pthread_create (tid, NULL, func, arg) == 0; -} +#endif /* USE_MACH_BACKEND */ +#ifdef __MACH__ void -mono_threads_core_set_name (MonoNativeThreadId tid, const char *name) +mono_threads_core_get_stack_bounds (guint8 **staddr, size_t *stsize) { - /* pthread_setnmae_np() on Mac is not documented and doesn't receive thread id. */ + *staddr = (guint8*)pthread_get_stackaddr_np (pthread_self()); + *stsize = pthread_get_stacksize_np (pthread_self()); + +#ifdef TARGET_OSX + /* + * Mavericks reports stack sizes as 512kb: + * http://permalink.gmane.org/gmane.comp.java.openjdk.hotspot.devel/11590 + * https://bugs.openjdk.java.net/browse/JDK-8020753 + */ + if (pthread_main_np () && *stsize == 512 * 1024) + *stsize = 2048 * mono_pagesize (); +#endif + + /* staddr points to the start of the stack, not the end */ + *staddr -= *stsize; } #endif