Merge pull request #2634 from ludovic-henry/coop-fix-managed-to-native

[mono.git] / mono / mini / tasklets.c

diff --git a/mono/mini/tasklets.c b/mono/mini/tasklets.c
index 9abca97a1b9fd3b11e34748588cd4188cc2d85f9..9457633bafc1b81e5dcf27980522e6702e214274 100644 (file)
--- a/mono/mini/tasklets.c
+++ b/mono/mini/tasklets.c
@@ -2,14 +2,14 @@
 #include "config.h"
 #include "tasklets.h"
 #include "mono/metadata/exception.h"
-#include "mono/metadata/gc-internal.h"
+#include "mono/metadata/gc-internals.h"
 #include "mini.h"
 
 #if defined(MONO_SUPPORT_TASKLETS)
 
 static mono_mutex_t tasklets_mutex;
-#define tasklets_lock() mono_mutex_lock(&tasklets_mutex)
-#define tasklets_unlock() mono_mutex_unlock(&tasklets_mutex)
+#define tasklets_lock() mono_os_mutex_lock(&tasklets_mutex)
+#define tasklets_unlock() mono_os_mutex_unlock(&tasklets_mutex)
 
 /* LOCKING: tasklets_mutex is assumed to e taken */
 static void
@@ -47,10 +47,10 @@ continuation_mark_frame (MonoContinuation *cont)
        if (cont->domain)
                return mono_get_exception_argument ("cont", "Already marked");
 
-       jit_tls = mono_native_tls_get_value (mono_jit_tls_id);
+       jit_tls = (MonoJitTlsData *)mono_native_tls_get_value (mono_jit_tls_id);
        lmf = mono_get_lmf();
        cont->domain = mono_domain_get ();
-       cont->thread_id = GetCurrentThreadId ();
+       cont->thread_id = mono_native_thread_id_get ();
 
        /* get to the frame that called Mark () */
        memset (&rji, 0, sizeof (rji));
@@ -82,7 +82,7 @@ continuation_store (MonoContinuation *cont, int state, MonoException **e)
                *e =  mono_get_exception_argument ("cont", "Continuation not initialized");
                return 0;
        }
-       if (cont->domain != mono_domain_get () || cont->thread_id != GetCurrentThreadId ()) {
+       if (cont->domain != mono_domain_get () || !mono_native_thread_id_equals (cont->thread_id, mono_native_thread_id_get ())) {
                *e = mono_get_exception_argument ("cont", "Continuation from another thread or domain");
                return 0;
        }
@@ -124,7 +124,7 @@ continuation_restore (MonoContinuation *cont, int state)
 
        if (!cont->domain || !cont->return_sp)
                return mono_get_exception_argument ("cont", "Continuation not initialized");
-       if (cont->domain != mono_domain_get () || cont->thread_id != GetCurrentThreadId ())
+       if (cont->domain != mono_domain_get () || !mono_native_thread_id_equals (cont->thread_id, mono_native_thread_id_get ()))
                return mono_get_exception_argument ("cont", "Continuation from another thread or domain");
 
        /*g_print ("restore: %p, state: %d\n", cont, state);*/
@@ -136,7 +136,7 @@ continuation_restore (MonoContinuation *cont, int state)
 void
 mono_tasklets_init (void)
 {
-       mono_mutex_init_recursive (&tasklets_mutex);
+       mono_os_mutex_init_recursive (&tasklets_mutex);
 
        mono_add_internal_call ("Mono.Tasklets.Continuation::alloc", continuation_alloc);
        mono_add_internal_call ("Mono.Tasklets.Continuation::free", continuation_free);