#include "mono/metadata/domain-internals.h"
#include "mono/metadata/gc-internal.h"
#include "mono/io-layer/io-layer.h"
+#include "mono/utils/mono-dl.h"
#include <string.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
-#include <gmodule.h>
+#endif
#ifdef HAVE_BACKTRACE_SYMBOLS
#include <execinfo.h>
#endif
static MonoProfileMethodFunc method_enter;
static MonoProfileMethodFunc method_leave;
+static MonoProfileExceptionFunc exception_throw_cb;
+static MonoProfileMethodFunc exception_method_leave_cb;
+static MonoProfileExceptionClauseFunc exception_clause_cb;
+
static MonoProfileThreadFunc thread_start;
static MonoProfileThreadFunc thread_end;
statistical_cb = callback;
}
+void mono_profiler_install_exception (MonoProfileExceptionFunc throw_callback, MonoProfileMethodFunc exc_method_leave, MonoProfileExceptionClauseFunc clause_callback)
+{
+ exception_throw_cb = throw_callback;
+ exception_method_leave_cb = exc_method_leave;
+ exception_clause_cb = clause_callback;
+}
+
void
mono_profiler_install_coverage_filter (MonoProfileCoverageFilterFunc callback)
{
statistical_cb (current_profiler, ip, context);
}
+void
+mono_profiler_exception_thrown (MonoObject *exception)
+{
+ if ((mono_profiler_events & MONO_PROFILE_EXCEPTIONS) && exception_throw_cb)
+ exception_throw_cb (current_profiler, exception);
+}
+
+void
+mono_profiler_exception_method_leave (MonoMethod *method)
+{
+ if ((mono_profiler_events & MONO_PROFILE_EXCEPTIONS) && exception_method_leave_cb)
+ exception_method_leave_cb (current_profiler, method);
+}
+
+void
+mono_profiler_exception_clause_handler (MonoMethod *method, int clause_type, int clause_num)
+{
+ if ((mono_profiler_events & MONO_PROFILE_EXCEPTIONS) && exception_clause_cb)
+ exception_clause_cb (current_profiler, method, clause_type, clause_num);
+}
+
void
mono_profiler_thread_start (gsize tid)
{
for (i = 0; i < info->entries; ++i) {
cil_code = info->data [i].cil_code;
if (cil_code && cil_code >= start && cil_code < end) {
+ char *fname = NULL;
offset = cil_code - start;
entry.iloffset = offset;
entry.method = method;
if (location) {
entry.line = location->row;
entry.col = location->column;
- entry.filename = g_strdup (location->source_file);
+ entry.filename = fname = g_strdup (location->source_file);
mono_debug_free_source_location (location);
}
}
func (prof, &entry);
- g_free (entry.filename);
+ g_free (fname);
}
}
}
static void output_callers (MethodProfile *p);
+/* This isn't defined on older glib versions and on some platforms */
+#ifndef G_GUINT64_FORMAT
+#define G_GUINT64_FORMAT "ul"
+#endif
+#ifndef G_GINT64_FORMAT
+#define G_GINT64_FORMAT "lld"
+#endif
+
static void
output_profile (GList *funcs)
{
m = method_get_name (p->method);
fprintf (poutput, "########################\n");
fprintf (poutput, "% 8.3f ", (double) (p->total * 1000));
- fprintf (poutput, "%7llu ", (unsigned long long)p->count);
+ fprintf (poutput, "%7" G_GUINT64_FORMAT " ", (unsigned long long)p->count);
fprintf (poutput, "% 8.3f ", (double) (p->total * 1000)/(double)p->count);
fprintf (poutput, " %s\n", m);
/* callers */
output_callers (p);
}
- fprintf (poutput, "Total number of calls: %lld\n", (long long)total_calls);
+ fprintf (poutput, "Total number of calls: %" G_GINT64_FORMAT "\n", (long long)total_calls);
}
typedef struct {
}
}
-/* This isn't defined on older glib versions and on some platforms */
-#ifndef G_GUINT64_FORMAT
-#define G_GUINT64_FORMAT "ul"
-#endif
-
static void
output_newobj_profile (GList *proflist)
{
const char *addr_argv[] = {"addr2line", "-f", "-e", binary, NULL};
int child_pid;
int ch_in, ch_out;
+#ifdef __linux__
+ char monobin [1024];
+ /* non-linux platforms will need different code here */
+ if (strcmp (binary, "mono") == 0) {
+ int count = readlink ("/proc/self/exe", monobin, sizeof (monobin));
+ if (count >= 0 && count < sizeof (monobin)) {
+ monobin [count] = 0;
+ addr_argv [3] = monobin;
+ }
+ }
+#endif
if (!g_spawn_async_with_pipes (NULL, (char**)addr_argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL,
&child_pid, &ch_in, &ch_out, NULL, NULL)) {
return g_strdup (binary);
const char *arg = *ptr;
if (!strcmp (arg, "time"))
- flags |= MONO_PROFILE_ENTER_LEAVE;
+ flags |= MONO_PROFILE_ENTER_LEAVE | MONO_PROFILE_EXCEPTIONS;
else if (!strcmp (arg, "alloc"))
flags |= MONO_PROFILE_ALLOCATIONS;
else if (!strcmp (arg, "stat"))
}
}
}
+ if (flags & MONO_PROFILE_ALLOCATIONS)
+ flags |= MONO_PROFILE_ENTER_LEAVE | MONO_PROFILE_EXCEPTIONS;
+ if (!flags)
+ flags = MONO_PROFILE_ENTER_LEAVE | MONO_PROFILE_ALLOCATIONS | MONO_PROFILE_JIT_COMPILATION | MONO_PROFILE_EXCEPTIONS;
prof = create_profiler ();
ALLOC_PROFILER ();
mono_profiler_install (prof, simple_shutdown);
mono_profiler_install_enter_leave (simple_method_enter, simple_method_leave);
+ mono_profiler_install_exception (NULL, simple_method_leave, NULL);
mono_profiler_install_jit_compile (simple_method_jit, simple_method_end_jit);
mono_profiler_install_allocation (simple_allocation);
mono_profiler_install_appdomain (NULL, NULL, simple_appdomain_unload, NULL);
}
#endif
{
- GModule *pmodule;
+ MonoDl *pmodule;
const char* col = strchr (desc, ':');
char* libname;
char* path;
char *mname;
+ char *err;
+ void *iter;
if (col != NULL) {
- mname = g_memdup (desc, col - desc);
+ mname = g_memdup (desc, col - desc + 1);
mname [col - desc] = 0;
} else {
mname = g_strdup (desc);
}
libname = g_strdup_printf ("mono-profiler-%s", mname);
- path = g_module_build_path (NULL, libname);
- pmodule = g_module_open (path, G_MODULE_BIND_LAZY);
- if (pmodule) {
- ProfilerInitializer func;
- if (!g_module_symbol (pmodule, INITIALIZER_NAME, (gpointer *)&func)) {
- g_warning ("Cannot find initializer function %s in profiler module: %s", INITIALIZER_NAME, libname);
- } else {
- func (desc);
+ iter = NULL;
+ err = NULL;
+ while ((path = mono_dl_build_path (NULL, 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);
+ }
+ break;
}
- } else {
- g_warning ("Error loading profiler module '%s': %s", libname, g_module_error ());
+ g_free (path);
+ }
+ if (!pmodule) {
+ g_warning ("Error loading profiler module '%s': %s", libname, err);
+ g_free (err);
}
-
g_free (libname);
g_free (mname);
g_free (path);
projects / mono.git / blobdiff