X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Futils%2Fmono-threads-posix.c;h=ce087bbc36bb4e5d7b9d5e12f1885d7a0a5dcd27;hb=f0d2ee46f839cc3cebcdaa674b3a31d9a3e22863;hp=8dba68fe7fba6b44855283f4fedaa16d2d49e013;hpb=51927cb4192e9ab4ef42cfad8b8be638c0e615c8;p=mono.git diff --git a/mono/utils/mono-threads-posix.c b/mono/utils/mono-threads-posix.c index 8dba68fe7fb..ce087bbc36b 100644 --- a/mono/utils/mono-threads-posix.c +++ b/mono/utils/mono-threads-posix.c @@ -13,7 +13,9 @@ #include #include #include +#include #include +#include #include @@ -22,60 +24,216 @@ extern int tkill (pid_t tid, int signal); #endif #if defined(_POSIX_VERSION) || defined(__native_client__) +#include #include +#if defined(__native_client__) +void nacl_shutdown_gc_thread(void); +#endif + typedef struct { void *(*start_routine)(void*); void *arg; int flags; MonoSemType registered; -} ThreadStartInfo; - + HANDLE handle; +} StartInfo; static void* inner_start_thread (void *arg) { - ThreadStartInfo *start_info = arg; + StartInfo *start_info = arg; void *t_arg = start_info->arg; - int post_result; + int res; void *(*start_func)(void*) = start_info->start_routine; + guint32 flags = start_info->flags; void *result; + HANDLE handle; + MonoThreadInfo *info; + + /* Register the thread with the io-layer */ + handle = wapi_create_thread_handle (); + if (!handle) { + res = MONO_SEM_POST (&(start_info->registered)); + g_assert (!res); + return NULL; + } + start_info->handle = handle; - mono_thread_info_attach (&result)->runtime_thread = TRUE; + info = mono_thread_info_attach (&result); + info->runtime_thread = TRUE; + info->handle = handle; - post_result = MONO_SEM_POST (&(start_info->registered)); - g_assert (!post_result); + if (flags & CREATE_SUSPENDED) { + info->create_suspended = TRUE; + MONO_SEM_INIT (&info->create_suspended_sem, 0); + } + /* start_info is not valid after this */ + res = MONO_SEM_POST (&(start_info->registered)); + g_assert (!res); + start_info = NULL; + + if (flags & CREATE_SUSPENDED) { + while (MONO_SEM_WAIT (&info->create_suspended_sem) != 0 && + errno == EINTR); + MONO_SEM_DESTROY (&info->create_suspended_sem); + } + + /* Run the actual main function of the thread */ result = start_func (t_arg); - g_assert (!mono_domain_get ()); - mono_thread_info_dettach (); + /* + mono_thread_info_detach (); + */ + +#if defined(__native_client__) + nacl_shutdown_gc_thread(); +#endif + wapi_thread_handle_set_exited (handle, GPOINTER_TO_UINT (result)); + /* This is needed by mono_threads_core_unregister () which is called later */ + info->handle = NULL; + + g_assert (mono_threads_get_callbacks ()->thread_exit); + mono_threads_get_callbacks ()->thread_exit (NULL); + g_assert_not_reached (); return result; } -int -mono_threads_pthread_create (pthread_t *new_thread, const pthread_attr_t *attr, void *(*start_routine)(void *), void *arg) +HANDLE +mono_threads_core_create_thread (LPTHREAD_START_ROUTINE start_routine, gpointer arg, guint32 stack_size, guint32 creation_flags, MonoNativeThreadId *out_tid) { - ThreadStartInfo *start_info; - int result; - - start_info = g_malloc0 (sizeof (ThreadStartInfo)); - if (!start_info) - return ENOMEM; - MONO_SEM_INIT (&(start_info->registered), 0); - start_info->arg = arg; - start_info->start_routine = start_routine; - - result = mono_threads_get_callbacks ()->mono_gc_pthread_create (new_thread, attr, inner_start_thread, start_info); - if (result == 0) { - while (MONO_SEM_WAIT (&(start_info->registered)) != 0) { - /*if (EINTR != errno) ABORT("sem_wait failed"); */ - } + pthread_attr_t attr; + int res; + pthread_t thread; + StartInfo start_info; + + res = pthread_attr_init (&attr); + g_assert (!res); + + if (stack_size == 0) { +#if HAVE_VALGRIND_MEMCHECK_H + if (RUNNING_ON_VALGRIND) + stack_size = 1 << 20; + else + stack_size = (SIZEOF_VOID_P / 4) * 1024 * 1024; +#else + stack_size = (SIZEOF_VOID_P / 4) * 1024 * 1024; +#endif } - MONO_SEM_DESTROY (&(start_info->registered)); - g_free (start_info); - return result; + +#ifdef PTHREAD_STACK_MIN + if (stack_size < PTHREAD_STACK_MIN) + stack_size = PTHREAD_STACK_MIN; +#endif + +#ifdef HAVE_PTHREAD_ATTR_SETSTACKSIZE + res = pthread_attr_setstacksize (&attr, stack_size); + g_assert (!res); +#endif + + memset (&start_info, 0, sizeof (StartInfo)); + start_info.start_routine = (gpointer)start_routine; + start_info.arg = arg; + start_info.flags = creation_flags; + MONO_SEM_INIT (&(start_info.registered), 0); + + /* Actually start the thread */ + res = mono_threads_get_callbacks ()->mono_gc_pthread_create (&thread, &attr, inner_start_thread, &start_info); + if (res) { + MONO_SEM_DESTROY (&(start_info.registered)); + return NULL; + } + + /* Wait until the thread register itself in various places */ + while (MONO_SEM_WAIT (&(start_info.registered)) != 0) { + /*if (EINTR != errno) ABORT("sem_wait failed"); */ + } + MONO_SEM_DESTROY (&(start_info.registered)); + + if (out_tid) + *out_tid = thread; + + return start_info.handle; +} + +/* + * mono_threads_core_resume_created: + * + * Resume a newly created thread created using CREATE_SUSPENDED. + */ +void +mono_threads_core_resume_created (MonoThreadInfo *info, MonoNativeThreadId tid) +{ + MONO_SEM_POST (&info->create_suspended_sem); +} + +gboolean +mono_threads_core_yield (void) +{ + return sched_yield () == 0; +} + +void +mono_threads_core_exit (int exit_code) +{ + MonoThreadInfo *current = mono_thread_info_current (); + +#if defined(__native_client__) + nacl_shutdown_gc_thread(); +#endif + + wapi_thread_handle_set_exited (current->handle, exit_code); + + g_assert (mono_threads_get_callbacks ()->thread_exit); + mono_threads_get_callbacks ()->thread_exit (NULL); +} + +void +mono_threads_core_unregister (MonoThreadInfo *info) +{ + if (info->handle) { + wapi_thread_handle_set_exited (info->handle, 0); + info->handle = NULL; + } +} + +HANDLE +mono_threads_core_open_handle (void) +{ + MonoThreadInfo *info; + + info = mono_thread_info_current (); + g_assert (info); + + if (!info->handle) + info->handle = wapi_create_thread_handle (); + else + wapi_ref_thread_handle (info->handle); + return info->handle; +} + +int +mono_threads_get_max_stack_size (void) +{ + struct rlimit lim; + + /* If getrlimit fails, we don't enforce any limits. */ + if (getrlimit (RLIMIT_STACK, &lim)) + return INT_MAX; + /* rlim_t is an unsigned long long on 64bits OSX but we want an int response. */ + if (lim.rlim_max > (rlim_t)INT_MAX) + return INT_MAX; + return (int)lim.rlim_max; +} + +HANDLE +mono_threads_core_open_thread_handle (HANDLE handle, MonoNativeThreadId tid) +{ + wapi_ref_thread_handle (handle); + + return handle; } #if !defined (__MACH__) @@ -257,6 +415,22 @@ mono_native_thread_create (MonoNativeThreadId *tid, gpointer func, gpointer arg) return pthread_create (tid, NULL, func, arg) == 0; } +void +mono_threads_core_set_name (MonoNativeThreadId tid, const char *name) +{ +#ifdef HAVE_PTHREAD_SETNAME_NP + if (!name) { + pthread_setname_np (tid, ""); + } else { + char n [16]; + + strncpy (n, name, 16); + n [15] = '\0'; + pthread_setname_np (tid, n); + } +#endif +} + #endif /*!defined (__MACH__)*/ #endif