diff options
| author | Rodrigo Kumpera <kumpera@gmail.com> | 2009-08-21 04:01:21 +0400 |
|---|---|---|
| committer | Rodrigo Kumpera <kumpera@gmail.com> | 2009-08-21 04:01:21 +0400 |
| commit | 771e24b7ad6ad3375216ab69f03ebdc04ac1278d (patch) | |
| tree | 5afbd26a65f5739abbe4a77bcb2f36dd087a98f4 | |
| parent | 6ce9ae68f9fc0a9aa1d4a99129a8a3d6f0234052 (diff) | |
2009-08-19 Rodrigo Kumpera <rkumpera@novell.com>
* class.c (mono_class_create_from_typedef): Emit profiler events
in all cases.
svn path=/trunk/mono/; revision=140391
| -rw-r--r-- | mono/metadata/ChangeLog | 5 | ||||
| -rw-r--r-- | mono/metadata/class.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index 7ad09ffacb5..98ff9067e06 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,5 +1,10 @@ 2009-08-19 Rodrigo Kumpera <rkumpera@novell.com> + * class.c (mono_class_create_from_typedef): Emit profiler events + in all cases. + +2009-08-19 Rodrigo Kumpera <rkumpera@novell.com> + * icall.c (ves_icall_Type_GetMethodsByName): Don't leak loader errors. Release memory on failure. diff --git a/mono/metadata/class.c b/mono/metadata/class.c index eb1e6a16b5b..37d122a9c78 100644 --- a/mono/metadata/class.c +++ b/mono/metadata/class.c @@ -4383,6 +4383,7 @@ mono_class_create_from_typedef (MonoImage *image, guint32 type_token) if (!enum_basetype) { mono_class_set_failure (class, MONO_EXCEPTION_TYPE_LOAD, NULL); mono_loader_unlock (); + mono_profiler_class_loaded (class, MONO_PROFILE_FAILED); return NULL; } class->cast_class = class->element_class = mono_class_from_mono_type (enum_basetype); @@ -4399,6 +4400,7 @@ mono_class_create_from_typedef (MonoImage *image, guint32 type_token) mono_class_set_failure (class, MONO_EXCEPTION_TYPE_LOAD, error); g_free (class_name); mono_loader_unlock (); + mono_profiler_class_loaded (class, MONO_PROFILE_FAILED); return NULL; } |