Merge pull request #2698 from esdrubal/iosxmlarray

[mono.git] / mono / metadata / sgen-os-mach.c

diff --git a/mono/metadata/sgen-os-mach.c b/mono/metadata/sgen-os-mach.c
index 403d04c3d9a56f95560c27f08f8b55e2d0a0bdd9..666ef3ce8cfb3103bd06720529a1a44424430e58 100644 (file)
--- a/mono/metadata/sgen-os-mach.c
+++ b/mono/metadata/sgen-os-mach.c
@@ -28,22 +28,24 @@
 
 
 #include <glib.h>
-#include "metadata/sgen-gc.h"
-#include "metadata/sgen-archdep.h"
-#include "metadata/sgen-protocol.h"
-#include "metadata/sgen-thread-pool.h"
+#include "sgen/sgen-gc.h"
+#include "sgen/sgen-archdep.h"
+#include "sgen/sgen-protocol.h"
+#include "sgen/sgen-thread-pool.h"
 #include "metadata/object-internals.h"
-#include "metadata/gc-internal.h"
+#include "metadata/gc-internals.h"
 
 #if defined(__MACH__)
 #include "utils/mach-support.h"
 #endif
 
 #if defined(__MACH__) && MONO_MACH_ARCH_SUPPORTED
+
+#if !defined(USE_COOP_GC)
 gboolean
 sgen_resume_thread (SgenThreadInfo *info)
 {
-       return thread_resume (info->info.native_handle) == KERN_SUCCESS;
+       return thread_resume (info->client_info.info.native_handle) == KERN_SUCCESS;
 }
 
 gboolean
@@ -60,41 +62,40 @@ sgen_suspend_thread (SgenThreadInfo *info)
        state = (thread_state_t) alloca (mono_mach_arch_get_thread_state_size ());
        mctx = (mcontext_t) alloca (mono_mach_arch_get_mcontext_size ());
 
-       ret = thread_suspend (info->info.native_handle);
+       ret = thread_suspend (info->client_info.info.native_handle);
        if (ret != KERN_SUCCESS)
                return FALSE;
 
-       ret = mono_mach_arch_get_thread_state (info->info.native_handle, state, &num_state);
+       ret = mono_mach_arch_get_thread_state (info->client_info.info.native_handle, state, &num_state);
        if (ret != KERN_SUCCESS)
                return FALSE;
 
        mono_mach_arch_thread_state_to_mcontext (state, mctx);
        ctx.uc_mcontext = mctx;
 
-       info->stopped_domain = mono_thread_info_tls_get (info, TLS_KEY_DOMAIN);
-       info->stopped_ip = (gpointer) mono_mach_arch_get_ip (state);
-       info->stack_start = NULL;
+       info->client_info.stopped_domain = mono_thread_info_tls_get (info, TLS_KEY_DOMAIN);
+       info->client_info.stopped_ip = (gpointer) mono_mach_arch_get_ip (state);
+       info->client_info.stack_start = NULL;
        stack_start = (char*) mono_mach_arch_get_sp (state) - REDZONE_SIZE;
        /* If stack_start is not within the limits, then don't set it in info and we will be restarted. */
-       if (stack_start >= info->stack_start_limit && info->stack_start <= info->stack_end) {
-               info->stack_start = stack_start;
+       if (stack_start >= info->client_info.stack_start_limit && stack_start <= info->client_info.stack_end) {
+               info->client_info.stack_start = stack_start;
 
 #ifdef USE_MONO_CTX
-               mono_sigctx_to_monoctx (&ctx, &info->ctx);
+               mono_sigctx_to_monoctx (&ctx, &info->client_info.ctx);
 #else
-               ARCH_COPY_SIGCTX_REGS (&info->regs, &ctx);
+               ARCH_COPY_SIGCTX_REGS (&info->client_info.regs, &ctx);
 #endif
        } else {
-               g_assert (!info->stack_start);
+               g_assert (!info->client_info.stack_start);
        }
 
        /* Notify the JIT */
        if (mono_gc_get_gc_callbacks ()->thread_suspend_func)
-               mono_gc_get_gc_callbacks ()->thread_suspend_func (info->runtime_data, &ctx, NULL);
-
-       SGEN_LOG (2, "thread %p stopped at %p stack_start=%p", (void*)(gsize)info->info.native_handle, info->stopped_ip, info->stack_start);
+               mono_gc_get_gc_callbacks ()->thread_suspend_func (info->client_info.runtime_data, &ctx, NULL);
 
-       binary_protocol_thread_suspend ((gpointer)mono_thread_info_get_tid (info), info->stopped_ip);
+       SGEN_LOG (2, "thread %p stopped at %p stack_start=%p", (void*)(gsize)info->client_info.info.native_handle, info->client_info.stopped_ip, info->client_info.stack_start);
+       binary_protocol_thread_suspend ((gpointer)mono_thread_info_get_tid (info), info->client_info.stopped_ip);
 
        return TRUE;
 }
@@ -111,29 +112,28 @@ sgen_thread_handshake (BOOL suspend)
 {
        SgenThreadInfo *cur_thread = mono_thread_info_current ();
        kern_return_t ret;
-       SgenThreadInfo *info;
 
        int count = 0;
 
-       cur_thread->suspend_done = TRUE;
-       FOREACH_THREAD_SAFE (info) {
+       cur_thread->client_info.suspend_done = TRUE;
+       FOREACH_THREAD (info) {
                if (info == cur_thread || sgen_thread_pool_is_thread_pool_thread (mono_thread_info_get_tid (info)))
                        continue;
 
-               info->suspend_done = FALSE;
-               if (info->gc_disabled)
+               info->client_info.suspend_done = FALSE;
+               if (info->client_info.gc_disabled)
                        continue;
 
                if (suspend) {
                        if (!sgen_suspend_thread (info))
                                continue;
                } else {
-                       ret = thread_resume (info->info.native_handle);
+                       ret = thread_resume (info->client_info.info.native_handle);
                        if (ret != KERN_SUCCESS)
                                continue;
                }
                count ++;
-       } END_FOREACH_THREAD_SAFE
+       } FOREACH_THREAD_END
        return count;
 }
 
@@ -155,3 +155,4 @@ mono_gc_get_restart_signal (void)
 }
 #endif
 #endif
+#endif