[threads] Fix sleep compilation error on win32

[mono.git] / mono / sgen / sgen-debug.c

diff --git a/mono/sgen/sgen-debug.c b/mono/sgen/sgen-debug.c
index 07d423012f2b0aecf3db1ad8d2913fe6922edbef..79e23ed453bea3003b1ed3947e7fdc786770ec73 100644 (file)
--- a/mono/sgen/sgen-debug.c
+++ b/mono/sgen/sgen-debug.c
@@ -68,7 +68,7 @@ static void
 describe_pointer (char *ptr, gboolean need_setup)
 {
        GCVTable vtable;
-       mword desc;
+       SgenDescriptor desc;
        int type;
        char *start;
        char *forwarded;
@@ -180,7 +180,7 @@ check_consistency_callback (GCObject *obj, size_t size, void *dummy)
 {
        char *start = (char*)obj;
        GCVTable vt = LOAD_VTABLE (obj);
-       mword desc = sgen_vtable_get_descriptor (vt);
+       SgenDescriptor desc = sgen_vtable_get_descriptor (vt);
        SGEN_LOG (8, "Scanning object %p, vtable: %p (%s)", start, vt, sgen_client_vtable_get_name (vt));
 
 #include "sgen-scan-object.h"
@@ -239,7 +239,7 @@ check_mod_union_callback (GCObject *obj, size_t size, void *dummy)
        char *start = (char*)obj;
        gboolean in_los = (gboolean) (size_t) dummy;
        GCVTable vt = LOAD_VTABLE (obj);
-       mword desc = sgen_vtable_get_descriptor (vt);
+       SgenDescriptor desc = sgen_vtable_get_descriptor (vt);
        guint8 *cards;
        SGEN_LOG (8, "Scanning object %p, vtable: %p (%s)", obj, vt, sgen_client_vtable_get_name (vt));
 
@@ -279,7 +279,7 @@ static void
 check_major_refs_callback (GCObject *obj, size_t size, void *dummy)
 {
        char *start = (char*)obj;
-       mword desc = sgen_obj_get_descriptor (obj);
+       SgenDescriptor desc = sgen_obj_get_descriptor (obj);
 
 #include "sgen-scan-object.h"
 }
@@ -309,7 +309,7 @@ void
 check_object (GCObject *obj)
 {
        char *start = (char*)obj;
-       mword desc;
+       SgenDescriptor desc;
 
        if (!start)
                return;
@@ -336,7 +336,7 @@ setup_valid_nursery_objects (void)
        if (!valid_nursery_objects)
                valid_nursery_objects = sgen_alloc_os_memory (DEFAULT_NURSERY_SIZE, SGEN_ALLOC_INTERNAL | SGEN_ALLOC_ACTIVATE, "debugging data");
        valid_nursery_object_count = 0;
-       sgen_scan_area_with_callback (nursery_section->data, nursery_section->end_data, setup_mono_sgen_scan_area_with_callback, NULL, FALSE);
+       sgen_scan_area_with_callback (nursery_section->data, nursery_section->end_data, setup_mono_sgen_scan_area_with_callback, NULL, FALSE, FALSE);
 }
 
 static gboolean
@@ -453,7 +453,7 @@ verify_object_pointers_callback (GCObject *obj, size_t size, void *data)
 {
        char *start = (char*)obj;
        gboolean allow_missing_pinned = (gboolean) (size_t) data;
-       mword desc = sgen_obj_get_descriptor (obj);
+       SgenDescriptor desc = sgen_obj_get_descriptor (obj);
 
 #include "sgen-scan-object.h"
 }
@@ -469,7 +469,7 @@ sgen_check_whole_heap (gboolean allow_missing_pinned)
        setup_valid_nursery_objects ();
 
        broken_heap = FALSE;
-       sgen_scan_area_with_callback (nursery_section->data, nursery_section->end_data, verify_object_pointers_callback, (void*) (size_t) allow_missing_pinned, FALSE);
+       sgen_scan_area_with_callback (nursery_section->data, nursery_section->end_data, verify_object_pointers_callback, (void*) (size_t) allow_missing_pinned, FALSE, TRUE);
        major_collector.iterate_objects (ITERATE_OBJECTS_SWEEP_ALL, verify_object_pointers_callback, (void*) (size_t) allow_missing_pinned);
        sgen_los_iterate_objects (verify_object_pointers_callback, (void*) (size_t) allow_missing_pinned);
 
@@ -578,7 +578,7 @@ check_marked_callback (GCObject *obj, size_t size, void *dummy)
 {
        char *start = (char*)obj;
        gboolean flag = (gboolean) (size_t) dummy;
-       mword desc;
+       SgenDescriptor desc;
 
        if (sgen_ptr_in_nursery (start)) {
                if (flag)
@@ -623,7 +623,7 @@ sgen_check_nursery_objects_pinned (gboolean pinned)
 {
        sgen_clear_nursery_fragments ();
        sgen_scan_area_with_callback (nursery_section->data, nursery_section->end_data,
-                       (IterateObjectCallbackFunc)check_nursery_objects_pinned_callback, (void*) (size_t) pinned /* (void*)&ctx */, FALSE);
+                       (IterateObjectCallbackFunc)check_nursery_objects_pinned_callback, (void*) (size_t) pinned /* (void*)&ctx */, FALSE, TRUE);
 }
 
 static void
@@ -679,7 +679,7 @@ sgen_debug_verify_nursery (gboolean do_dump_nursery_content)
                                        is_array_fill);
                }
                if (nursery_canaries_enabled () && !is_array_fill) {
-                       CHECK_CANARY_FOR_OBJECT ((GCObject*)cur);
+                       CHECK_CANARY_FOR_OBJECT ((GCObject*)cur, TRUE);
                        CANARIFY_SIZE (size);
                }
                cur += size;
@@ -740,7 +740,7 @@ scan_object_for_specific_ref (GCObject *obj, GCObject *key)
 
        if (scan_object_for_specific_ref_precise) {
                char *start = (char*)obj;
-               mword desc = sgen_obj_get_descriptor_safe (obj);
+               SgenDescriptor desc = sgen_obj_get_descriptor_safe (obj);
                #include "sgen-scan-object.h"
        } else {
                mword *words = (mword*)obj;
@@ -787,7 +787,7 @@ scan_roots_for_specific_ref (GCObject *key, int root_type)
        check_key = key;
 
        SGEN_HASH_TABLE_FOREACH (&roots_hash [root_type], start_root, root) {
-               mword desc = root->root_desc;
+               SgenDescriptor desc = root->root_desc;
 
                check_root = root;
 
@@ -844,7 +844,7 @@ mono_gc_scan_for_specific_ref (GCObject *key, gboolean precise)
        scan_object_for_specific_ref_precise = precise;
 
        sgen_scan_area_with_callback (nursery_section->data, nursery_section->end_data,
-                       (IterateObjectCallbackFunc)scan_object_for_specific_ref_callback, key, TRUE);
+                       (IterateObjectCallbackFunc)scan_object_for_specific_ref_callback, key, TRUE, FALSE);
 
        major_collector.iterate_objects (ITERATE_OBJECTS_SWEEP_ALL, (IterateObjectCallbackFunc)scan_object_for_specific_ref_callback, key);
 
@@ -888,7 +888,7 @@ sgen_scan_for_registered_roots_in_domain (MonoDomain *domain, int root_type)
        RootRecord *root;
        check_domain = domain;
        SGEN_HASH_TABLE_FOREACH (&roots_hash [root_type], start_root, root) {
-               mword desc = root->root_desc;
+               SgenDescriptor desc = root->root_desc;
 
                /* The MonoDomain struct is allowed to hold
                   references to objects in its own domain. */
@@ -1030,7 +1030,7 @@ scan_object_for_xdomain_refs (GCObject *obj, mword size, void *data)
        char *start = (char*)obj;
        MonoVTable *vt = SGEN_LOAD_VTABLE (obj);
        MonoDomain *domain = vt->domain;
-       mword desc = sgen_vtable_get_descriptor (vt);
+       SgenDescriptor desc = sgen_vtable_get_descriptor (vt);
 
        #include "sgen-scan-object.h"
 }
@@ -1041,7 +1041,7 @@ sgen_check_for_xdomain_refs (void)
        LOSObject *bigobj;
 
        sgen_scan_area_with_callback (nursery_section->data, nursery_section->end_data,
-                       (IterateObjectCallbackFunc)scan_object_for_xdomain_refs, NULL, FALSE);
+                       (IterateObjectCallbackFunc)scan_object_for_xdomain_refs, NULL, FALSE, TRUE);
 
        major_collector.iterate_objects (ITERATE_OBJECTS_SWEEP_ALL, (IterateObjectCallbackFunc)scan_object_for_xdomain_refs, NULL);
 
@@ -1216,7 +1216,7 @@ sgen_find_object_for_ptr (char *ptr)
        if (ptr >= nursery_section->data && ptr < nursery_section->end_data) {
                found_obj = NULL;
                sgen_scan_area_with_callback (nursery_section->data, nursery_section->end_data,
-                               find_object_for_ptr_callback, ptr, TRUE);
+                               find_object_for_ptr_callback, ptr, TRUE, FALSE);
                if (found_obj)
                        return found_obj;
        }