Wed Nov 29 22:01:46 CET 2006 Paolo Molaro <lupus@ximian.com>

	* profiler.c: provide defaults if none are set.

svn path=/trunk/mono/; revision=68698

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index d20c50544369f42634dc83d23b611adf768a1b01..44fbe7dd971a2ebf12597d1094a3b75eff79affb 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,4 +1,13 @@
 
+Wed Nov 29 22:01:46 CET 2006 Paolo Molaro <lupus@ximian.com>
+
+       * profiler.c: provide defaults if none are set.
+
+Tue Nov 28 12:54:51 CET 2006 Paolo Molaro <lupus@ximian.com>
+
+       * Makefile.am, attrdefs.h: new public header file with
+       constants for attributes for use by embedders.
+
 Tue Nov 28 11:44:52 CET 2006 Paolo Molaro <lupus@ximian.com>
 
        * icall.c: GetFields () fix for bug #80064.

diff --git a/mono/metadata/profiler.c b/mono/metadata/profiler.c
index d9bda6f7292079a556dde092e97cb71635fdcb61..984b8b70107e2a59173bfea1464f8ce4dd4be54c 100644 (file)
--- a/mono/metadata/profiler.c
+++ b/mono/metadata/profiler.c
@@ -1408,6 +1408,10 @@ mono_profiler_install_simple (const char *desc)
                        }
                }
        }
+       if (flags & MONO_PROFILE_ALLOCATIONS)
+               flags |= MONO_PROFILE_ENTER_LEAVE;
+       if (!flags)
+               flags = MONO_PROFILE_ENTER_LEAVE | MONO_PROFILE_ALLOCATIONS | MONO_PROFILE_JIT_COMPILATION;
 
        prof = create_profiler ();
        ALLOC_PROFILER ();