Merge pull request #2802 from BrzVlad/feature-evacuation-opt2

[mono.git] / mono / profiler / mono-profiler-aot.c

diff --git a/mono/profiler/mono-profiler-aot.c b/mono/profiler/mono-profiler-aot.c
index acab7545afb024d4522ae92e71c6e3b2da072cbe..4cf48bbd1b2491a54e3155c2c793b1934d5bb441 100644 (file)
--- a/mono/profiler/mono-profiler-aot.c
+++ b/mono/profiler/mono-profiler-aot.c
@@ -9,8 +9,10 @@
  * The AOT compiler can load these files during compilation.
  * Currently, only the order in which methods were compiled is saved, 
  * allowing more efficient function ordering in the AOT files.
+ * Licensed under the MIT license. See LICENSE file in the project root for full license information.
  */
 
+#include <config.h>
 #include <mono/metadata/profiler.h>
 #include <mono/metadata/tokentype.h>
 #include <mono/metadata/tabledefs.h>
@@ -19,8 +21,13 @@
 #include <string.h>
 #include <errno.h>
 #include <stdlib.h>
+#include <glib.h>
 #include <sys/stat.h>
 
+#ifdef HOST_WIN32
+#include <direct.h>
+#endif
+
 struct _MonoProfiler {
        GHashTable *images;
 };
@@ -41,11 +48,14 @@ foreach_method (gpointer data, gpointer user_data)
 {
        ForeachData *udata = (ForeachData*)user_data;
        MonoMethod *method = (MonoMethod*)data;
+       char *name;
 
        if (!mono_method_get_token (method) || mono_class_get_image (mono_method_get_class (method)) != udata->image)
                return;
 
-       fprintf (udata->outfile, "%d\n", mono_method_get_token (method));
+       name = mono_method_full_name (method, TRUE);
+       fprintf (udata->outfile, "%s\n", name);
+       g_free (name);
 }
 
 static void
@@ -62,7 +72,7 @@ output_image (gpointer key, gpointer value, gpointer user_data)
        tmp = g_strdup_printf ("%s/.mono/aot-profile-data", g_get_home_dir ());
 
        if (!g_file_test (tmp, G_FILE_TEST_IS_DIR)) {
-#ifdef PLATFORM_WIN32
+#ifdef HOST_WIN32
                err = mkdir (tmp);
 #else
                err = mkdir (tmp, 0777);
@@ -75,7 +85,7 @@ output_image (gpointer key, gpointer value, gpointer user_data)
 
        i = 0;
        while (TRUE) {
-               outfile_name = g_strdup_printf ("%s/%s-%s-%d", tmp, mono_image_get_name (image), mono_image_get_guid (image), i);
+               outfile_name = g_strdup_printf ("%s/%s-%d", tmp, mono_image_get_name (image), i);
 
                if (!g_file_test (outfile_name, G_FILE_TEST_IS_REGULAR))
                        break;
@@ -88,7 +98,7 @@ output_image (gpointer key, gpointer value, gpointer user_data)
        outfile = fopen (outfile_name, "w+");
        g_assert (outfile);
 
-       fprintf (outfile, "#VER:%d\n", 1);
+       fprintf (outfile, "#VER:%d\n", 2);
 
        data.prof = prof;
        data.outfile = outfile;
@@ -115,7 +125,7 @@ prof_jit_leave (MonoProfiler *prof, MonoMethod *method, int result)
        MonoImage *image = mono_class_get_image (mono_method_get_class (method));
        PerImageData *data;
 
-       data = g_hash_table_lookup (prof->images, image);
+       data = (PerImageData *)g_hash_table_lookup (prof->images, image);
        if (!data) {
                data = g_new0 (PerImageData, 1);
                g_hash_table_insert (prof->images, image, data);
@@ -124,6 +134,9 @@ prof_jit_leave (MonoProfiler *prof, MonoMethod *method, int result)
        data->methods = g_list_append (data->methods, method);
 }
 
+void
+mono_profiler_startup (const char *desc);
+
 /* the entry point */
 void
 mono_profiler_startup (const char *desc)