X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Fsgen-marksweep.c;h=10600a0d085c2dfe9be8a652e8abdb4c57c4e863;hb=504e2341ba82a3ebbf566ce3c4d8a00f2c571d83;hp=78bc368efac47029d85ea396629c5ef6591cca4a;hpb=5b3f143191d599c1fcca89125793405150c79424;p=mono.git

diff --git a/mono/metadata/sgen-marksweep.c b/mono/metadata/sgen-marksweep.c
index 78bc368efac..10600a0d085 100644
--- a/mono/metadata/sgen-marksweep.c
+++ b/mono/metadata/sgen-marksweep.c
@@ -911,6 +911,73 @@ major_iterate_objects (gboolean non_pinned, gboolean pinned, IterateObjectCallba
 	} END_FOREACH_BLOCK;
 }
 
+static gboolean
+major_is_valid_object (char *object)
+{
+	MSBlockInfo *block;
+
+	ms_wait_for_sweep_done ();
+	FOREACH_BLOCK (block) {
+		int idx;
+		char *obj;
+
+		if ((block->block > object) || ((block->block + MS_BLOCK_SIZE) <= object))
+			continue;
+
+		idx = MS_BLOCK_OBJ_INDEX (object, block);
+		obj = (char*)MS_BLOCK_OBJ (block, idx);
+		if (obj != object)
+			return FALSE;
+		return MS_OBJ_ALLOCED (obj, block);
+	} END_FOREACH_BLOCK;
+
+	return FALSE;
+}
+
+
+static gboolean
+major_describe_pointer (char *ptr)
+{
+	MSBlockInfo *block;
+
+	FOREACH_BLOCK (block) {
+		int idx;
+		char *obj;
+		gboolean live;
+		MonoVTable *vtable;
+
+		if ((block->block > ptr) || ((block->block + MS_BLOCK_SIZE) <= ptr))
+			continue;
+
+		fprintf (gc_debug_file, "major-ptr (block %p sz %d pin %d ref %d) ",
+			block->block, block->obj_size, block->pinned, block->has_references);
+
+		idx = MS_BLOCK_OBJ_INDEX (ptr, block);
+		obj = (char*)MS_BLOCK_OBJ (block, idx);
+		live = MS_OBJ_ALLOCED (obj, block);
+		vtable = live ? (MonoVTable*)SGEN_LOAD_VTABLE (obj) : NULL;
+		
+		if (obj == ptr) {
+			if (live)
+				fprintf (gc_debug_file, "(object %s.%s)", vtable->klass->name_space, vtable->klass->name);
+			else
+				fprintf (gc_debug_file, "(dead-object)");
+		} else {
+			if (live)
+				fprintf (gc_debug_file, "(interior-ptr offset %td of %p %s.%s)",
+					ptr - obj,
+					obj, vtable->klass->name_space, vtable->klass->name);
+			else
+				fprintf (gc_debug_file, "(dead-interior-ptr to %td to %p)",
+					ptr - obj, obj);
+		}
+
+		return TRUE;
+	} END_FOREACH_BLOCK;
+
+	return FALSE;
+}
+
 static void
 major_check_scan_starts (void)
 {
@@ -1089,7 +1156,13 @@ major_copy_or_mark_object (void **ptr, SgenGrayQueue *queue)
 			 *
 			 * FIXME (2): We should rework this to avoid all those nursery checks.
 			 */
-			if (!sgen_ptr_in_nursery (obj)) { /*marking a nursery object is pretty stupid.*/
+			/*
+			 * For the split nursery allocator the object
+			 * might still be in the nursery despite
+			 * having being promoted, in which case we
+			 * can't mark it.
+			 */
+			if (!sgen_ptr_in_nursery (obj)) {
 				block = MS_BLOCK_FOR_OBJ (obj);
 				MS_CALC_MARK_BIT (word, bit, obj);
 				DEBUG (9, g_assert (!MS_MARK_BIT (block, word, bit)));
@@ -1226,7 +1299,12 @@ major_copy_or_mark_object (void **ptr, SgenGrayQueue *queue)
 		 *
 		 * FIXME (2): We should rework this to avoid all those nursery checks.
 		 */
-		if (!sgen_ptr_in_nursery (obj)) { /*marking a nursery object is pretty stupid.*/
+		/*
+		 * For the split nursery allocator the object might
+		 * still be in the nursery despite having being
+		 * promoted, in which case we can't mark it.
+		 */
+		if (!sgen_ptr_in_nursery (obj)) {
 			block = MS_BLOCK_FOR_OBJ (obj);
 			MS_CALC_MARK_BIT (word, bit, obj);
 			DEBUG (9, g_assert (!MS_MARK_BIT (block, word, bit)));
@@ -1458,7 +1536,7 @@ ms_sweep_thread_func (void *dummy)
 
 		while ((result = MONO_SEM_WAIT (&ms_sweep_cmd_semaphore)) != 0) {
 			if (errno != EINTR)
-				g_error ("MONO_SEM_WAIT");
+				g_error ("MONO_SEM_WAIT FAILED with %d errno %d (%s)", result, errno, strerror (errno));
 		}
 
 		ms_sweep ();
@@ -2084,8 +2162,9 @@ sgen_marksweep_init
 	collector->print_gc_param_usage = major_print_gc_param_usage;
 	collector->is_worker_thread = major_is_worker_thread;
 	collector->post_param_init = post_param_init;
+	collector->is_valid_object = major_is_valid_object;
+	collector->describe_pointer = major_describe_pointer;
 
-	/* FIXME this macro mess */
 	collector->major_ops.copy_or_mark_object = major_copy_or_mark_object;
 	collector->major_ops.scan_object = major_scan_object;