Fixed warning in MSVC: 'different types for formal and actual parameter'.

[mono.git] / mono / metadata / profiler.c

diff --git a/mono/metadata/profiler.c b/mono/metadata/profiler.c
index b67945aa2ba17543732caf5e5305b58e075e1e6f..ea779238aa063df21656b422516b854df810bfaf 100644 (file)
--- a/mono/metadata/profiler.c
+++ b/mono/metadata/profiler.c
@@ -1032,6 +1032,46 @@ typedef void (*ProfilerInitializer) (const char*);
 #define INITIALIZER_NAME "mono_profiler_startup"
 
 
+static gboolean
+load_profiler (MonoDl *pmodule, const char *desc, const char *symbol)
+{
+       char *err;
+       ProfilerInitializer func;
+
+       if (!pmodule)
+               return FALSE;
+
+       if ((err = mono_dl_symbol (pmodule, symbol, (gpointer *) &func))) {
+               g_free (err);
+               return FALSE;
+       } else {
+               func (desc);
+       }
+       return TRUE;
+}
+
+static gboolean
+load_embedded_profiler (const char *desc, const char *name)
+{
+       char *err = NULL;
+       char *symbol;
+       MonoDl *pmodule = NULL;
+       gboolean result;
+
+       pmodule = mono_dl_open (NULL, MONO_DL_LAZY, &err);
+       if (!pmodule) {
+               g_warning ("Could not open main executable (%s)", err);
+               g_free (err);
+               return FALSE;
+       }
+
+       symbol = g_strdup_printf (INITIALIZER_NAME "_%s", name);
+       result = load_profiler (pmodule, desc, symbol);
+       g_free (symbol);
+
+       return result;
+}
+
 static gboolean
 load_profiler_from_directory (const char *directory, const char *libname, const char *desc)
 {
@@ -1043,26 +1083,27 @@ load_profiler_from_directory (const char *directory, const char *libname, const
        iter = NULL;
        err = NULL;
        while ((path = mono_dl_build_path (directory, libname, &iter))) {
-               g_free (err);
                pmodule = mono_dl_open (path, MONO_DL_LAZY, &err);
-               if (pmodule) {
-                       ProfilerInitializer func;
-                       if ((err = mono_dl_symbol (pmodule, INITIALIZER_NAME, (gpointer *)&func))) {
-                               g_warning ("Cannot find initializer function %s in profiler module: %s (%s)", INITIALIZER_NAME, libname, err);
-                               g_free (err);
-                               err = NULL;
-                       } else {
-                               func (desc);
-                       }
-                       g_free (path);
-                       return TRUE;
-               }
                g_free (path);
+               g_free (err);
+               if (pmodule)
+                       return load_profiler (pmodule, desc, INITIALIZER_NAME);
        }
                
        return FALSE;
 }
 
+static gboolean
+load_profiler_from_mono_instalation (const char *libname, const char *desc)
+{
+       char *err = NULL;
+       MonoDl *pmodule = mono_dl_open_runtime_lib (libname, MONO_DL_LAZY, &err);
+       g_free (err);
+       if (pmodule)
+               return load_profiler (pmodule, desc, INITIALIZER_NAME);
+       return FALSE;
+}
+
 /**
  * mono_profiler_load:
  * @desc: arguments to configure the profiler
@@ -1111,18 +1152,29 @@ mono_profiler_load (const char *desc)
                const char* col = strchr (desc, ':');
                char* libname;
                char *mname;
+               gboolean res = FALSE;
+
                if (col != NULL) {
                        mname = g_memdup (desc, col - desc + 1);
                        mname [col - desc] = 0;
                } else {
                        mname = g_strdup (desc);
                }
-               libname = g_strdup_printf ("mono-profiler-%s", mname);
-               if (!load_profiler_from_directory (NULL, libname, desc))
-                       if (!load_profiler_from_directory (mono_assembly_getrootdir (), libname, desc))
-                               g_warning ("Error loading profiler module '%s'", libname);
-                       
-               g_free (libname);
+               if (!load_embedded_profiler (desc, mname)) {
+                       libname = g_strdup_printf ("mono-profiler-%s", mname);
+                       if (!load_profiler_from_directory (NULL, libname, desc)) {
+                               res = FALSE;
+#if defined (MONO_ASSEMBLIES)
+                               res = load_profiler_from_directory (mono_assembly_getrootdir (), libname, desc);
+#endif
+                               if (!res)
+                                       res = load_profiler_from_mono_instalation (libname, desc);
+
+                               if (!res)
+                                       g_warning ("The '%s' profiler wasn't found in the main executable nor could it be loaded from '%s'.", mname, libname);
+                       }
+                       g_free (libname);
+               }
                g_free (mname);
        }
        g_free (cdesc);