2006-12-14 Sebastien Pouliot <sebastien@ximian.com>

[mono.git] / libgc / darwin_stop_world.c

diff --git a/libgc/darwin_stop_world.c b/libgc/darwin_stop_world.c
index 3c2d8cfa655d44bb725e80733aa5cd662abea67b..04bb415e02624dafba3620141fa0810a05a7dbbf 100644 (file)
--- a/libgc/darwin_stop_world.c
+++ b/libgc/darwin_stop_world.c
@@ -75,12 +75,14 @@ void GC_push_all_stacks() {
   ptr_t lo, hi;
 #if defined(POWERPC)
   ppc_thread_state_t state;
+  mach_msg_type_number_t thread_state_count = PPC_THREAD_STATE_COUNT;
 #elif defined(I386)
   i386_thread_state_t state;
+  mach_msg_type_number_t thread_state_count = i386_THREAD_STATE_COUNT;
 #else
 # error FIXME for non-x86 || ppc architectures
-#endif
   mach_msg_type_number_t thread_state_count = MACHINE_THREAD_STATE_COUNT;
+#endif
   
   me = pthread_self();
   if (!GC_thr_initialized) GC_thr_init();
@@ -94,7 +96,7 @@ void GC_push_all_stacks() {
        /* Get the thread state (registers, etc) */
        r = thread_get_state(
                             p->stop_info.mach_thread,
-                            MACHINE_THREAD_STATE,
+                            GC_MACH_THREAD_STATE_FLAVOR,
                             (natural_t*)&state,
                             &thread_state_count);
        if(r != KERN_SUCCESS) ABORT("thread_get_state failed");
@@ -193,7 +195,7 @@ void GC_push_all_stacks() {
        ppc_thread_state64_t info;
 #      endif
        mach_msg_type_number_t outCount = THREAD_STATE_MAX;
-       r = thread_get_state(thread, MACHINE_THREAD_STATE,
+       r = thread_get_state(thread, GC_MACH_THREAD_STATE_FLAVOR,
                             (natural_t *)&info, &outCount);
        if(r != KERN_SUCCESS) continue;
 
@@ -236,7 +238,7 @@ void GC_push_all_stacks() {
        WARN("This is completely untested and likely will not work\n", 0);
        i386_thread_state_t info;
        mach_msg_type_number_t outCount = THREAD_STATE_MAX;
-       r = thread_get_state(thread, MACHINE_THREAD_STATE,
+       r = thread_get_state(thread, GC_MACH_THREAD_STATE_FLAVOR,
                             (natural_t *)&info, &outCount);
        if(r != KERN_SUCCESS) continue;
 
@@ -411,24 +413,31 @@ void GC_stop_world()
       prev_list = NULL;
       prevcount = 0;
       do {
-       int result;
+       int result;               
        kern_result = task_threads(my_task, &act_list, &listcount);
-       result = GC_suspend_thread_list(act_list, listcount,
-                                       prev_list, prevcount);
-       changes = result;
-       prev_list = act_list;
-       prevcount = listcount;
        
-       if(kern_result == KERN_SUCCESS) {
-               int i;
+       if(kern_result == KERN_SUCCESS) {       
+               result = GC_suspend_thread_list(act_list, listcount,
+                                                                               prev_list, prevcount);
+               changes = result;
                
-               for(i = 0; i < listcount; i++)
-                       mach_port_deallocate(my_task, act_list[i]);
+               if(prev_list != NULL) {
+                       for(i = 0; i < prevcount; i++)
+                               mach_port_deallocate(my_task, prev_list[i]);
+                       
+                       vm_deallocate(my_task, (vm_address_t)prev_list, sizeof(thread_t) * prevcount);
+               }
                
-               vm_deallocate(my_task, (vm_address_t)act_list, sizeof(thread_t) * listcount);
-       }
+               prev_list = act_list;
+               prevcount = listcount;
+       }               
       } while (changes);
-      
+     
+         for(i = 0; i < listcount; i++)
+                 mach_port_deallocate(my_task, act_list[i]);
+         
+         vm_deallocate(my_task, (vm_address_t)act_list, sizeof(thread_t) * listcount);
+         
  
 #   ifdef MPROTECT_VDB
       if(GC_incremental) {