X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Futils%2Fmono-threads-posix.c;h=ce087bbc36bb4e5d7b9d5e12f1885d7a0a5dcd27;hb=f0d2ee46f839cc3cebcdaa674b3a31d9a3e22863;hp=7abb7a4045ed805dfa32978dca0194d772b4d723;hpb=9ee744d3883e29c9848cf3af5131bc99578978d0;p=mono.git

diff --git a/mono/utils/mono-threads-posix.c b/mono/utils/mono-threads-posix.c
index 7abb7a4045e..ce087bbc36b 100644
--- a/mono/utils/mono-threads-posix.c
+++ b/mono/utils/mono-threads-posix.c
@@ -13,8 +13,9 @@
 #include <mono/utils/mono-semaphore.h>
 #include <mono/utils/mono-threads.h>
 #include <mono/utils/mono-tls.h>
-#include <mono/utils/gc_wrapper.h>
+#include <mono/utils/mono-mmap.h>
 #include <mono/metadata/threads-types.h>
+#include <limits.h>
 
 #include <errno.h>
 
@@ -23,6 +24,7 @@ extern int tkill (pid_t tid, int signal);
 #endif
 
 #if defined(_POSIX_VERSION) || defined(__native_client__)
+#include <sys/resource.h>
 #include <signal.h>
 
 #if defined(__native_client__)
@@ -58,37 +60,43 @@ inner_start_thread (void *arg)
 	}
 	start_info->handle = handle;
 
-	if (!(flags & CREATE_NO_DETACH)) {
-		res = mono_gc_pthread_detach (pthread_self ());
-		g_assert (!res);
-	}
-
 	info = mono_thread_info_attach (&result);
 	info->runtime_thread = TRUE;
+	info->handle = handle;
+
+	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)
-		wapi_thread_suspend (handle);
+	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_set_exit_code (GPOINTER_TO_UINT (result), handle);
-
-	// FIXME: Why is this needed ?
-	mono_gc_pthread_exit (NULL);
+	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;
 }
@@ -134,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 */
@@ -150,6 +158,84 @@ mono_threads_core_create_thread (LPTHREAD_START_ROUTINE start_routine, gpointer
 	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__)
 
 #if !defined(__native_client__)
@@ -329,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