X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmetadata%2Fsgen-pinning-stats.c;h=ae9249b718e48afe86eae3206f1fe7deb10c550c;hb=34b1c9dbaaf6e9e195d7197c72a13f59ae4ef6fa;hp=c831757fa7c88f3f81d0ac6bb2addfa23e87ca9e;hpb=15af51806d816ad6ad966bc1dfbdd232b63fde52;p=mono.git

diff --git a/mono/metadata/sgen-pinning-stats.c b/mono/metadata/sgen-pinning-stats.c
index c831757fa7c..ae9249b718e 100644
--- a/mono/metadata/sgen-pinning-stats.c
+++ b/mono/metadata/sgen-pinning-stats.c
@@ -28,6 +28,7 @@
 
 #include "metadata/sgen-gc.h"
 #include "metadata/sgen-pinning.h"
+#include "metadata/sgen-hash-table.h"
 
 
 typedef struct _PinStatAddress PinStatAddress;
@@ -61,11 +62,11 @@ pin_stats_tree_free (PinStatAddress *node)
 		return;
 	pin_stats_tree_free (node->left);
 	pin_stats_tree_free (node->right);
-	mono_sgen_free_internal_dynamic (node, sizeof (PinStatAddress), INTERNAL_MEM_STATISTICS);
+	sgen_free_internal_dynamic (node, sizeof (PinStatAddress), INTERNAL_MEM_STATISTICS);
 }
 
 void
-mono_sgen_pin_stats_reset (void)
+sgen_pin_stats_reset (void)
 {
 	int i;
 	pin_stats_tree_free (pin_stat_addresses);
@@ -74,13 +75,13 @@ mono_sgen_pin_stats_reset (void)
 		pinned_byte_counts [i] = 0;
 	while (pinned_objects) {
 		ObjectList *next = pinned_objects->next;
-		mono_sgen_free_internal_dynamic (pinned_objects, sizeof (ObjectList), INTERNAL_MEM_STATISTICS);
+		sgen_free_internal_dynamic (pinned_objects, sizeof (ObjectList), INTERNAL_MEM_STATISTICS);
 		pinned_objects = next;
 	}
 }
 
 void
-mono_sgen_pin_stats_register_address (char *addr, int pin_type)
+sgen_pin_stats_register_address (char *addr, int pin_type)
 {
 	PinStatAddress **node_ptr = &pin_stat_addresses;
 	PinStatAddress *node;
@@ -98,7 +99,7 @@ mono_sgen_pin_stats_register_address (char *addr, int pin_type)
 			node_ptr = &node->right;
 	}
 
-	node = mono_sgen_alloc_internal_dynamic (sizeof (PinStatAddress), INTERNAL_MEM_STATISTICS);
+	node = sgen_alloc_internal_dynamic (sizeof (PinStatAddress), INTERNAL_MEM_STATISTICS, TRUE);
 	node->addr = addr;
 	node->pin_types = pin_type_bit;
 	node->left = node->right = NULL;
@@ -131,13 +132,13 @@ static gpointer
 lookup_class_entry (SgenHashTable *hash_table, MonoClass *class, gpointer empty_entry)
 {
 	char *name = g_strdup_printf ("%s.%s", class->name_space, class->name);
-	gpointer entry = mono_sgen_hash_table_lookup (hash_table, name);
+	gpointer entry = sgen_hash_table_lookup (hash_table, name);
 
 	if (entry) {
 		g_free (name);
 	} else {
-		mono_sgen_hash_table_replace (hash_table, name, empty_entry);
-		entry = mono_sgen_hash_table_lookup (hash_table, name);
+		sgen_hash_table_replace (hash_table, name, empty_entry, NULL);
+		entry = sgen_hash_table_lookup (hash_table, name);
 	}
 
 	return entry;
@@ -160,12 +161,12 @@ register_class (MonoClass *class, int pin_types)
 }
 
 void
-mono_sgen_pin_stats_register_object (char *obj, size_t size)
+sgen_pin_stats_register_object (char *obj, size_t size)
 {
 	int pin_types = 0;
 	ObjectList *list;
 
-	list = mono_sgen_alloc_internal_dynamic (sizeof (ObjectList), INTERNAL_MEM_STATISTICS);
+	list = sgen_alloc_internal_dynamic (sizeof (ObjectList), INTERNAL_MEM_STATISTICS, TRUE);
 	pin_stats_count_object_from_tree (obj, size, pin_stat_addresses, &pin_types);
 	list->obj = (MonoObject*)obj;
 	list->next = pinned_objects;
@@ -176,7 +177,7 @@ mono_sgen_pin_stats_register_object (char *obj, size_t size)
 }
 
 void
-mono_sgen_pin_stats_register_global_remset (char *obj)
+sgen_pin_stats_register_global_remset (char *obj)
 {
 	GlobalRemsetClassEntry empty_entry;
 	GlobalRemsetClassEntry *entry;
@@ -188,7 +189,7 @@ mono_sgen_pin_stats_register_global_remset (char *obj)
 }
 
 void
-mono_sgen_pin_stats_print_class_stats (void)
+sgen_pin_stats_print_class_stats (void)
 {
 	char *name;
 	PinnedClassEntry *pinned_entry;
@@ -210,13 +211,13 @@ mono_sgen_pin_stats_print_class_stats (void)
 }
 
 size_t
-mono_sgen_pin_stats_get_pinned_byte_count (int pin_type)
+sgen_pin_stats_get_pinned_byte_count (int pin_type)
 {
 	return pinned_byte_counts [pin_type];
 }
 
 ObjectList*
-mono_sgen_pin_stats_get_object_list (void)
+sgen_pin_stats_get_object_list (void)
 {
 	return pinned_objects;
 }