[threads] Enable blocking transition with MONO_ENABLE_BLOCKING_TRANSITION env variabl...

[mono.git] / mono / utils / mono-threads-coop.c

diff --git a/mono/utils/mono-threads-coop.c b/mono/utils/mono-threads-coop.c
index ed6b1807a3a22a97bcba35b62862c27e3a09e670..440eff85125121729d9c330de899bf5d74e43d0f 100644 (file)
--- a/mono/utils/mono-threads-coop.c
+++ b/mono/utils/mono-threads-coop.c
@@ -1,5 +1,6 @@
- /*
- * mono-threads.c: Coop threading
+/**
+ * \file
+ * Coop threading
  *
  * Author:
  *     Rodrigo Kumpera (kumpera@gmail.com)
@@ -116,7 +117,7 @@ mono_threads_state_poll (void)
 static void
 mono_threads_state_poll_with_info (MonoThreadInfo *info)
 {
-       g_assert (mono_threads_is_coop_enabled ());
+       g_assert (mono_threads_is_blocking_transition_enabled ());
 
        ++coop_do_polling_count;
 
@@ -205,7 +206,7 @@ mono_threads_enter_gc_safe_region_with_info (MonoThreadInfo *info, gpointer *sta
 {
        gpointer cookie;
 
-       if (!mono_threads_is_coop_enabled ())
+       if (!mono_threads_is_blocking_transition_enabled ())
                return NULL;
 
        cookie = mono_threads_enter_gc_safe_region_unbalanced_with_info (info, stackdata);
@@ -227,7 +228,7 @@ mono_threads_enter_gc_safe_region_unbalanced (gpointer *stackdata)
 static gpointer
 mono_threads_enter_gc_safe_region_unbalanced_with_info (MonoThreadInfo *info, gpointer *stackdata)
 {
-       if (!mono_threads_is_coop_enabled ())
+       if (!mono_threads_is_blocking_transition_enabled ())
                return NULL;
 
        ++coop_do_blocking_count;
@@ -254,7 +255,7 @@ retry:
 void
 mono_threads_exit_gc_safe_region (gpointer cookie, gpointer *stackdata)
 {
-       if (!mono_threads_is_coop_enabled ())
+       if (!mono_threads_is_blocking_transition_enabled ())
                return;
 
 #ifdef ENABLE_CHECKED_BUILD_GC
@@ -270,7 +271,7 @@ mono_threads_exit_gc_safe_region_unbalanced (gpointer cookie, gpointer *stackdat
 {
        MonoThreadInfo *info;
 
-       if (!mono_threads_is_coop_enabled ())
+       if (!mono_threads_is_blocking_transition_enabled ())
                return;
 
        info = (MonoThreadInfo *)cookie;
@@ -313,7 +314,7 @@ mono_threads_enter_gc_unsafe_region_with_info (THREAD_INFO_TYPE *info, gpointer
 {
        gpointer cookie;
 
-       if (!mono_threads_is_coop_enabled ())
+       if (!mono_threads_is_blocking_transition_enabled ())
                return NULL;
 
        cookie = mono_threads_enter_gc_unsafe_region_unbalanced_with_info (info, stackdata);
@@ -335,7 +336,7 @@ mono_threads_enter_gc_unsafe_region_unbalanced (gpointer *stackdata)
 gpointer
 mono_threads_enter_gc_unsafe_region_unbalanced_with_info (MonoThreadInfo *info, gpointer *stackdata)
 {
-       if (!mono_threads_is_coop_enabled ())
+       if (!mono_threads_is_blocking_transition_enabled ())
                return NULL;
 
        ++coop_reset_blocking_count;
@@ -375,7 +376,7 @@ mono_threads_enter_gc_unsafe_region_cookie (void)
 {
        MonoThreadInfo *info;
 
-       g_assert (mono_threads_is_coop_enabled ());
+       g_assert (mono_threads_is_blocking_transition_enabled ());
 
        info = mono_thread_info_current_unchecked ();
 
@@ -392,7 +393,7 @@ mono_threads_enter_gc_unsafe_region_cookie (void)
 void
 mono_threads_exit_gc_unsafe_region (gpointer cookie, gpointer *stackdata)
 {
-       if (!mono_threads_is_coop_enabled ())
+       if (!mono_threads_is_blocking_transition_enabled ())
                return;
 
 #ifdef ENABLE_CHECKED_BUILD_GC
@@ -406,7 +407,7 @@ mono_threads_exit_gc_unsafe_region (gpointer cookie, gpointer *stackdata)
 void
 mono_threads_exit_gc_unsafe_region_unbalanced (gpointer cookie, gpointer *stackdata)
 {
-       if (!mono_threads_is_coop_enabled ())
+       if (!mono_threads_is_blocking_transition_enabled ())
                return;
 
        if (!cookie)
@@ -429,16 +430,29 @@ mono_threads_is_coop_enabled (void)
 #else
        static int is_coop_enabled = -1;
        if (G_UNLIKELY (is_coop_enabled == -1))
-               is_coop_enabled = g_getenv ("MONO_ENABLE_COOP") != NULL ? 1 : 0;
+               is_coop_enabled = g_hasenv ("MONO_ENABLE_COOP") ? 1 : 0;
        return is_coop_enabled == 1;
 #endif
 }
 
+gboolean
+mono_threads_is_blocking_transition_enabled (void)
+{
+#if defined(USE_COOP_GC)
+       return TRUE;
+#else
+       static int is_blocking_transition_enabled = -1;
+       if (G_UNLIKELY (is_blocking_transition_enabled == -1))
+               is_blocking_transition_enabled = (g_hasenv ("MONO_ENABLE_COOP") || g_hasenv ("MONO_ENABLE_BLOCKING_TRANSITION")) ? 1 : 0;
+       return is_blocking_transition_enabled == 1;
+#endif
+}
+
 
 void
 mono_threads_coop_init (void)
 {
-       if (!mono_threads_is_coop_enabled ())
+       if (!mono_threads_is_coop_enabled () && !mono_threads_is_blocking_transition_enabled ())
                return;
 
        mono_counters_register ("Coop Reset Blocking", MONO_COUNTER_GC | MONO_COUNTER_INT, &coop_reset_blocking_count);