2009-03-02 Zoltan Varga <vargaz@gmail.com>

[mono.git] / mono / metadata / boehm-gc.c

diff --git a/mono/metadata/boehm-gc.c b/mono/metadata/boehm-gc.c
index 7a84fe87f4342222b5776150cf5aa1d6965485ba..a48428614f48a74f17602df54e3d87fd97feead2 100644 (file)
--- a/mono/metadata/boehm-gc.c
+++ b/mono/metadata/boehm-gc.c
@@ -1,6 +1,8 @@
 /*
  * boehm-gc.c: GC implementation using either the installed or included Boehm GC.
  *
+ * Copyright 2001-2003 Ximian, Inc (http://www.ximian.com)
+ * Copyright 2004-2009 Novell, Inc (http://www.novell.com)
  */
 
 #include "config.h"
@@ -13,6 +15,7 @@
 #include <mono/metadata/method-builder.h>
 #include <mono/metadata/opcodes.h>
 #include <mono/utils/mono-logger.h>
+#include <mono/utils/mono-time.h>
 #include <mono/utils/dtrace.h>
 
 #if HAVE_BOEHM_GC
@@ -100,7 +103,7 @@ mono_gc_base_init (void)
 #ifdef HAVE_GC_GCJ_MALLOC
        GC_init_gcj_malloc (5, NULL);
 #endif
-
+       mono_gc_enable_events ();
        gc_initialized = TRUE;
 }
 
@@ -108,7 +111,8 @@ void
 mono_gc_collect (int generation)
 {
        MONO_PROBE_GC_BEGIN (generation);
-       
+
+       mono_perfcounters->gc_induced++;
        GC_gcollect ();
        
        MONO_PROBE_GC_END (generation);
@@ -233,15 +237,34 @@ mono_object_is_alive (MonoObject* o)
 
 #ifdef USE_INCLUDED_LIBGC
 
+static gint64 gc_start_time;
+
 static void
 on_gc_notification (GCEventType event)
 {
+       if (event == MONO_GC_EVENT_START) {
+               mono_perfcounters->gc_collections0++;
+               mono_stats.major_gc_count ++;
+               gc_start_time = mono_100ns_ticks ();
+       } else if (event == MONO_GC_EVENT_END) {
+               guint64 heap_size = GC_get_heap_size ();
+               guint64 used_size = heap_size - GC_get_free_bytes ();
+               mono_perfcounters->gc_total_bytes = used_size;
+               mono_perfcounters->gc_committed_bytes = heap_size;
+               mono_perfcounters->gc_reserved_bytes = heap_size;
+               mono_perfcounters->gc_gen0size = heap_size;
+               mono_stats.major_gc_time_usecs += (mono_100ns_ticks () - gc_start_time) / 10;
+       }
        mono_profiler_gc_event ((MonoGCEvent) event, 0);
 }
  
 static void
 on_gc_heap_resize (size_t new_size)
 {
+       guint64 heap_size = GC_get_heap_size ();
+       mono_perfcounters->gc_committed_bytes = heap_size;
+       mono_perfcounters->gc_reserved_bytes = heap_size;
+       mono_perfcounters->gc_gen0size = heap_size;
        mono_profiler_gc_heap_resize (new_size);
 }
 
@@ -716,6 +739,12 @@ mono_gc_get_managed_allocator_by_type (int atype)
        return res;
 }
 
+guint32
+mono_gc_get_managed_allocator_types (void)
+{
+       return ATYPE_NUM;
+}
+
 #else
 
 MonoMethod*
@@ -736,6 +765,12 @@ mono_gc_get_managed_allocator_by_type (int atype)
        return NULL;
 }
 
+guint32
+mono_gc_get_managed_allocator_types (void)
+{
+       return 0;
+}
+
 #endif
 
 #endif /* no Boehm GC */