X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Futils%2Fmono-threads-posix.c;h=ce087bbc36bb4e5d7b9d5e12f1885d7a0a5dcd27;hb=f0d2ee46f839cc3cebcdaa674b3a31d9a3e22863;hp=36bab7c9be76f3bc9af44efda4c15d052ac4569b;hpb=2cf74970a10bb9b8c13f54721ba6552f3502650a;p=mono.git diff --git a/mono/utils/mono-threads-posix.c b/mono/utils/mono-threads-posix.c index 36bab7c9be7..ce087bbc36b 100644 --- a/mono/utils/mono-threads-posix.c +++ b/mono/utils/mono-threads-posix.c @@ -9,17 +9,13 @@ #include -#if defined(__OpenBSD__) || defined(__FreeBSD__) -#include -#include -#endif - #include #include #include #include #include #include +#include #include @@ -27,12 +23,8 @@ extern int tkill (pid_t tid, int signal); #endif -#if defined(PLATFORM_MACOSX) && defined(HAVE_PTHREAD_GET_STACKADDR_NP) -void *pthread_get_stackaddr_np(pthread_t); -size_t pthread_get_stacksize_np(pthread_t); -#endif - #if defined(_POSIX_VERSION) || defined(__native_client__) +#include #include #if defined(__native_client__) @@ -150,8 +142,8 @@ mono_threads_core_create_thread (LPTHREAD_START_ROUTINE start_routine, gpointer /* Actually start the thread */ res = mono_threads_get_callbacks ()->mono_gc_pthread_create (&thread, &attr, inner_start_thread, &start_info); if (res) { - // FIXME: - g_assert_not_reached (); + MONO_SEM_DESTROY (&(start_info.registered)); + return NULL; } /* Wait until the thread register itself in various places */ @@ -177,114 +169,6 @@ mono_threads_core_resume_created (MonoThreadInfo *info, MonoNativeThreadId tid) MONO_SEM_POST (&info->create_suspended_sem); } -void -mono_threads_core_get_stack_bounds (guint8 **staddr, size_t *stsize) -{ -#if defined(HAVE_PTHREAD_GET_STACKSIZE_NP) && defined(HAVE_PTHREAD_GET_STACKADDR_NP) - /* Mac OS X */ - *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 (*stsize == 512 * 1024) - *stsize = 2048 * mono_pagesize (); -#endif - - /* staddr points to the start of the stack, not the end */ - *staddr -= *stsize; - - /* When running under emacs, sometimes staddr is not aligned to a page size */ - *staddr = (guint8*)((gssize)*staddr & ~(mono_pagesize() - 1)); - return; - -#elif (defined(HAVE_PTHREAD_GETATTR_NP) || defined(HAVE_PTHREAD_ATTR_GET_NP)) && defined(HAVE_PTHREAD_ATTR_GETSTACK) - /* Linux, BSD */ - - pthread_attr_t attr; - guint8 *current = (guint8*)&attr; - - *staddr = NULL; - *stsize = (size_t)-1; - - pthread_attr_init (&attr); - -#if defined(HAVE_PTHREAD_GETATTR_NP) - /* Linux */ - pthread_getattr_np (pthread_self(), &attr); - -#elif defined(HAVE_PTHREAD_ATTR_GET_NP) - /* BSD */ - pthread_attr_get_np (pthread_self(), &attr); - -#else -#error Cannot determine which API is needed to retrieve pthread attributes. -#endif - - pthread_attr_getstack (&attr, (void**)staddr, stsize); - pthread_attr_destroy (&attr); - - if (*staddr) - g_assert ((current > *staddr) && (current < *staddr + *stsize)); - - /* When running under emacs, sometimes staddr is not aligned to a page size */ - *staddr = (guint8*)((gssize)*staddr & ~(mono_pagesize () - 1)); - return; - -#elif defined(__OpenBSD__) - /* OpenBSD */ - /* TODO : Determine if this code is actually still needed. It may already be covered by the case above. */ - - pthread_attr_t attr; - guint8 *current = (guint8*)&attr; - - *staddr = NULL; - *stsize = (size_t)-1; - - pthread_attr_init (&attr); - - stack_t ss; - int rslt; - - rslt = pthread_stackseg_np(pthread_self(), &ss); - g_assert (rslt == 0); - - *staddr = (guint8*)((size_t)ss.ss_sp - ss.ss_size); - *stsize = ss.ss_size; - - pthread_attr_destroy (&attr); - - if (*staddr) - g_assert ((current > *staddr) && (current < *staddr + *stsize)); - - /* When running under emacs, sometimes staddr is not aligned to a page size */ - *staddr = (guint8*)((gssize)*staddr & ~(mono_pagesize () - 1)); - return; - -#elif defined(sun) || defined(__native_client__) - /* Solaris/Illumos, NaCl */ - pthread_attr_t attr; - pthread_attr_init (&attr); - pthread_attr_getstacksize (&attr, &stsize); - pthread_attr_destroy (&attr); - *staddr = NULL; - return; - -#else - /* FIXME: It'd be better to use the 'error' preprocessor macro here so we know - at compile-time if the target platform isn't supported. */ -#warning "Unable to determine how to retrieve a thread's stack-bounds for this platform in 'mono_thread_get_stack_bounds()'." - *staddr = NULL; - *stsize = 0; - return; -#endif -} - gboolean mono_threads_core_yield (void) { @@ -330,6 +214,28 @@ mono_threads_core_open_handle (void) 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__) #if !defined(__native_client__) @@ -509,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