*
* Authors:
* Dietmar Maurer (dietmar@ximian.com)
+ * Mono Team (mono-list@lists.ximian.com)
*
- * (C) 2001 Ximian, Inc.
+ * Copyright 2001-2003 Ximian, Inc.
+ * Copyright 2003-2008 Ximian, Inc.
*/
#include <config.h>
#include <execinfo.h>
#endif
-#ifndef PLATFORM_WIN32
+#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
+#endif
+
+#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>
-#include <unistd.h>
#endif
#ifdef HAVE_UNISTD_H
#include <mono/utils/mono-mmap.h>
#include "mini.h"
+#include "debug-mini.h"
#include "trace.h"
#ifndef MONO_ARCH_CONTEXT_DEF
try_more_restore_tramp = mono_create_specific_trampoline (try_more_restore, MONO_TRAMPOLINE_RESTORE_STACK_PROT, mono_domain_get (), NULL);
restore_stack_protection_tramp = mono_create_specific_trampoline (restore_stack_protection, MONO_TRAMPOLINE_RESTORE_STACK_PROT, mono_domain_get (), NULL);
#endif
+
+#ifdef MONO_ARCH_HAVE_EXCEPTIONS_INIT
+ mono_arch_exceptions_init ();
+#endif
}
gpointer
* start of the function or -1 if that info is not available.
*/
MonoJitInfo *
-mono_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls, MonoJitInfo *res, MonoJitInfo *prev_ji, MonoContext *ctx,
+mono_find_jit_info (MonoDomain *domain, MonoJitTlsData *jit_tls, MonoJitInfo *res, MonoJitInfo *prev_ji, MonoContext *ctx,
MonoContext *new_ctx, char **trace, MonoLMF **lmf, int *native_offset,
gboolean *managed)
{
if (ji == (gpointer)-1)
return ji;
- if (managed2 || ji->method->wrapper_type) {
+ if (managed2 || (ji && ji->method->wrapper_type)) {
const char *real_ip, *start;
gint32 offset;
return ji;
}
+static gpointer
+get_generic_info_from_stack_frame (MonoJitInfo *ji, MonoContext *ctx)
+{
+ MonoGenericJitInfo *gi;
+ gpointer info;
+
+ if (!ji->has_generic_jit_info)
+ return NULL;
+ gi = mono_jit_info_get_generic_jit_info (ji);
+ if (!gi->has_this)
+ return NULL;
+
+ if (gi->this_in_reg)
+ info = mono_arch_context_get_int_reg (ctx, gi->this_reg);
+ else
+ info = *(gpointer*)(gpointer)((char*)mono_arch_context_get_int_reg (ctx, gi->this_reg) +
+ gi->this_offset);
+ if (mono_method_get_context (ji->method)->method_inst) {
+ return info;
+ } else if ((ji->method->flags & METHOD_ATTRIBUTE_STATIC) || ji->method->klass->valuetype) {
+ return info;
+ } else {
+ /* Avoid returning a managed object */
+ MonoObject *this_obj = info;
+
+ return this_obj->vtable->klass;
+ }
+}
+
+static MonoGenericContext
+get_generic_context_from_stack_frame (MonoJitInfo *ji, gpointer generic_info)
+{
+ MonoGenericContext context = { NULL, NULL };
+ MonoClass *class, *method_container_class;
+
+ g_assert (generic_info);
+
+ g_assert (ji->method->is_inflated);
+ if (mono_method_get_context (ji->method)->method_inst) {
+ MonoMethodRuntimeGenericContext *mrgctx = generic_info;
+
+ class = mrgctx->class_vtable->klass;
+ context.method_inst = mrgctx->method_inst;
+ g_assert (context.method_inst);
+ } else if ((ji->method->flags & METHOD_ATTRIBUTE_STATIC) || ji->method->klass->valuetype) {
+ MonoVTable *vtable = generic_info;
+
+ class = vtable->klass;
+ } else {
+ class = generic_info;
+ }
+
+ g_assert (!ji->method->klass->generic_container);
+ if (ji->method->klass->generic_class)
+ method_container_class = ji->method->klass->generic_class->container_class;
+ else
+ method_container_class = ji->method->klass;
+
+ /* class might refer to a subclass of ji->method's class */
+ while (class->generic_class && class->generic_class->container_class != method_container_class) {
+ class = class->parent;
+ g_assert (class);
+ }
+
+ if (class->generic_class || class->generic_container)
+ context.class_inst = mini_class_get_context (class)->class_inst;
+
+ if (class->generic_class)
+ g_assert (mono_class_has_parent_and_ignore_generics (class->generic_class->container_class, method_container_class));
+ else
+ g_assert (mono_class_has_parent_and_ignore_generics (class, method_container_class));
+
+ return context;
+}
+
+static MonoMethod*
+get_method_from_stack_frame (MonoJitInfo *ji, gpointer generic_info)
+{
+ MonoGenericContext context;
+ MonoMethod *method;
+
+ if (!ji->has_generic_jit_info || !mono_jit_info_get_generic_jit_info (ji)->has_this)
+ return ji->method;
+ context = get_generic_context_from_stack_frame (ji, generic_info);
+
+ method = mono_method_get_declaring_generic_method (ji->method);
+ method = mono_class_inflate_generic_method (method, &context);
+
+ return method;
+}
+
MonoString *
ves_icall_System_Exception_get_trace (MonoException *ex)
{
/* Exception is not thrown yet */
return NULL;
- len = mono_array_length (ta);
+ len = mono_array_length (ta) >> 1;
trace_str = g_string_new ("");
for (i = 0; i < len; i++) {
MonoJitInfo *ji;
- gpointer ip = mono_array_get (ta, gpointer, i);
+ gpointer ip = mono_array_get (ta, gpointer, i * 2 + 0);
+ gpointer generic_info = mono_array_get (ta, gpointer, i * 2 + 1);
ji = mono_jit_info_table_find (domain, ip);
if (ji == NULL) {
} else {
gchar *location;
gint32 address;
+ MonoMethod *method = get_method_from_stack_frame (ji, generic_info);
address = (char *)ip - (char *)ji->code_start;
location = mono_debug_print_stack_frame (
- ji->method, address, ex->object.vtable->domain);
+ method, address, ex->object.vtable->domain);
g_string_append_printf (trace_str, "%s\n", location);
g_free (location);
/* Exception is not thrown yet */
return mono_array_new (domain, mono_defaults.stack_frame_class, 0);
}
-
- len = mono_array_length (ta);
+
+ len = mono_array_length (ta) >> 1;
res = mono_array_new (domain, mono_defaults.stack_frame_class, len > skip ? len - skip : 0);
for (i = skip; i < len; i++) {
MonoJitInfo *ji;
MonoStackFrame *sf = (MonoStackFrame *)mono_object_new (domain, mono_defaults.stack_frame_class);
- gpointer ip = mono_array_get (ta, gpointer, i);
+ gpointer ip = mono_array_get (ta, gpointer, i * 2 + 0);
+ gpointer generic_info = mono_array_get (ta, gpointer, i * 2 + 1);
+ MonoMethod *method;
ji = mono_jit_info_table_find (domain, ip);
if (ji == NULL) {
g_assert (ji != NULL);
+ method = get_method_from_stack_frame (ji, generic_info);
if (ji->method->wrapper_type) {
char *s;
sf->method = NULL;
- s = mono_method_full_name (ji->method, TRUE);
+ s = mono_method_full_name (method, TRUE);
MONO_OBJECT_SETREF (sf, internal_method_name, mono_string_new (domain, s));
g_free (s);
}
else
- MONO_OBJECT_SETREF (sf, method, mono_method_get_object (domain, ji->method, NULL));
+ MONO_OBJECT_SETREF (sf, method, mono_method_get_object (domain, method, NULL));
sf->native_offset = (char *)ip - (char *)ji->code_start;
/*
MonoJitTlsData *jit_tls = TlsGetValue (mono_jit_tls_id);
MonoLMF *lmf = mono_get_lmf ();
MonoJitInfo *ji, rji;
- MonoContext ctx, new_ctx;
+ MonoContext ctx, new_ctx, ji_ctx;
MonoDebugSourceLocation *location;
- MonoMethod *last_method = NULL;
+ MonoMethod *last_method = NULL, *actual_method;
MONO_ARCH_CONTEXT_DEF;
#endif
do {
- ji = mono_find_jit_info (domain, jit_tls, &rji, NULL, &ctx, &new_ctx, NULL, &lmf, native_offset, NULL);
-
+ ji_ctx = ctx;
+ ji = mono_find_jit_info (domain, jit_tls, &rji, NULL, &ctx, &new_ctx, NULL, &lmf, (int*) native_offset, NULL);
ctx = new_ctx;
-
+
+ if (ji && ji != (gpointer)-1 &&
+ MONO_CONTEXT_GET_IP (&ctx) >= ji->code_start &&
+ (guint8*)MONO_CONTEXT_GET_IP (&ctx) < (guint8*)ji->code_start + ji->code_size) {
+ ji_ctx = ctx;
+ }
+
if (!ji || ji == (gpointer)-1 || MONO_CONTEXT_GET_SP (&ctx) >= jit_tls->end_of_stack)
return FALSE;
} while (skip >= 0);
- *method = mono_method_get_object (domain, ji->method, NULL);
+ actual_method = get_method_from_stack_frame (ji, get_generic_info_from_stack_frame (ji, &ji_ctx));
+
+ mono_gc_wbarrier_generic_store (method, (MonoObject*) mono_method_get_object (domain, actual_method, NULL));
location = mono_debug_lookup_source_location (ji->method, *native_offset, domain);
if (location)
if (need_file_info) {
if (location) {
- *file = mono_string_new (domain, location->source_file);
+ mono_gc_wbarrier_generic_store (file, (MonoObject*) mono_string_new (domain, location->source_file));
*line = location->row;
*column = location->column;
} else {
get_exception_catch_class (MonoJitExceptionInfo *ei, MonoJitInfo *ji, MonoContext *ctx)
{
MonoClass *catch_class = ei->data.catch_class;
- MonoGenericJitInfo *gi;
- gpointer info;
- MonoClass *class, *method_container_class;
MonoType *inflated_type;
- MonoGenericContext context = { NULL, NULL };
+ MonoGenericContext context;
if (!catch_class)
return NULL;
- if (!ji->has_generic_jit_info)
+ if (!ji->has_generic_jit_info || !mono_jit_info_get_generic_jit_info (ji)->has_this)
return catch_class;
-
- gi = mono_jit_info_get_generic_jit_info (ji);
- if (!gi->has_this)
- return catch_class;
-
- if (gi->this_in_reg)
- info = mono_arch_context_get_int_reg (ctx, gi->this_reg);
- else
- info = *(gpointer*)(gpointer)((char*)mono_arch_context_get_int_reg (ctx, gi->this_reg) +
- gi->this_offset);
-
- g_assert (ji->method->is_inflated);
-
- if (mono_method_get_context (ji->method)->method_inst) {
- MonoMethodRuntimeGenericContext *mrgctx = info;
-
- class = mrgctx->class_vtable->klass;
- context.method_inst = mrgctx->method_inst;
- g_assert (context.method_inst);
- } else if ((ji->method->flags & METHOD_ATTRIBUTE_STATIC) || ji->method->klass->valuetype) {
- MonoVTable *vtable = info;
-
- class = vtable->klass;
- } else {
- MonoObject *this = info;
-
- class = this->vtable->klass;
- }
-
- if (class->generic_class || class->generic_container)
- context.class_inst = mini_class_get_context (class)->class_inst;
-
- g_assert (!ji->method->klass->generic_container);
- if (ji->method->klass->generic_class)
- method_container_class = ji->method->klass->generic_class->container_class;
- else
- method_container_class = ji->method->klass;
-
- if (class->generic_class)
- g_assert (class->generic_class->container_class == method_container_class);
- else
- g_assert (!class->generic_container && class == method_container_class);
+ context = get_generic_context_from_stack_frame (ji, get_generic_info_from_stack_frame (ji, ctx));
/* FIXME: we shouldn't inflate but instead put the
type in the rgctx and fetch it from there. It
return catch_class;
}
+/*
+ * mini_jit_info_table_find:
+ *
+ * Same as mono_jit_info_table_find, but search all the domains of the current thread
+ * if ADDR is not found in DOMAIN. The domain where the method was found is stored into
+ * OUT_DOMAIN if it is not NULL.
+ */
+MonoJitInfo*
+mini_jit_info_table_find (MonoDomain *domain, char *addr, MonoDomain **out_domain)
+{
+ MonoJitInfo *ji;
+ MonoInternalThread *t = mono_thread_internal_current ();
+ GSList *l;
+
+ if (out_domain)
+ *out_domain = NULL;
+
+ ji = mono_jit_info_table_find (domain, addr);
+ if (ji) {
+ if (out_domain)
+ *out_domain = domain;
+ return ji;
+ }
+
+ for (l = t->appdomain_refs; l; l = l->next) {
+ if (l->data != domain) {
+ ji = mono_jit_info_table_find ((MonoDomain*)l->data, addr);
+ if (ji) {
+ if (out_domain)
+ *out_domain = (MonoDomain*)l->data;
+ return ji;
+ }
+ }
+ }
+
+ return NULL;
+}
+
/**
* mono_handle_exception_internal:
* @ctx: saved processor state
* the first filter clause which caught the exception.
*/
static gboolean
-mono_handle_exception_internal (MonoContext *ctx, gpointer obj, gpointer original_ip, gboolean test_only, gint32 *out_filter_idx)
+mono_handle_exception_internal (MonoContext *ctx, gpointer obj, gpointer original_ip, gboolean test_only, gint32 *out_filter_idx, MonoJitInfo **out_ji)
{
MonoDomain *domain = mono_domain_get ();
MonoJitInfo *ji, rji;
mono_ex = NULL;
}
- if (mono_ex && jit_tls->class_cast_to && !strcmp (mono_ex->object.vtable->klass->name, "InvalidCastException")) {
+ if (mono_ex && jit_tls->class_cast_from && !strcmp (mono_ex->object.vtable->klass->name, "InvalidCastException")) {
char *from_name = mono_type_get_full_name (jit_tls->class_cast_from);
char *to_name = mono_type_get_full_name (jit_tls->class_cast_to);
char *msg = g_strdup_printf ("Unable to cast object of type '%s' to type '%s'.", from_name, to_name);
if (!test_only) {
MonoContext ctx_cp = *ctx;
if (mono_trace_is_enabled ())
- g_print ("EXCEPTION handling: %s\n", mono_object_class (obj)->name);
+ g_print ("[%p:] EXCEPTION handling: %s\n", (void*)GetCurrentThreadId (), mono_object_class (obj)->name);
mono_profiler_exception_thrown (obj);
- if (!mono_handle_exception_internal (&ctx_cp, obj, original_ip, TRUE, &first_filter_idx)) {
+ if (!mono_handle_exception_internal (&ctx_cp, obj, original_ip, TRUE, &first_filter_idx, out_ji)) {
if (mono_break_on_exc)
G_BREAKPOINT ();
// FIXME: This runs managed code so it might cause another stack overflow when
// we are handling a stack overflow
mono_unhandled_exception (obj);
-
- if (mono_debugger_unhandled_exception (original_ip, MONO_CONTEXT_GET_SP (ctx), obj)) {
- /*
- * If this returns true, then we're running inside the
- * Mono Debugger and the debugger wants us to restore the
- * context and continue (normally, the debugger inserts
- * a breakpoint on the `original_ip', so it regains control
- * immediately after restoring the context).
- */
- MONO_CONTEXT_SET_IP (ctx, original_ip);
- restore_context (ctx);
- g_assert_not_reached ();
- }
}
}
if (out_filter_idx)
*out_filter_idx = -1;
+ if (out_ji)
+ *out_ji = NULL;
filter_idx = 0;
initial_ctx = *ctx;
memset (&rji, 0, sizeof (rji));
*/
if (!initial_trace_ips && (frame_count < 1000)) {
trace_ips = g_list_prepend (trace_ips, MONO_CONTEXT_GET_IP (ctx));
+ trace_ips = g_list_prepend (trace_ips,
+ get_generic_info_from_stack_frame (ji, ctx));
}
}
}
if (ei->flags == MONO_EXCEPTION_CLAUSE_FILTER) {
- // mono_debugger_handle_exception (ei->data.filter, MONO_CONTEXT_GET_SP (ctx), obj);
if (test_only) {
mono_perfcounters->exceptions_filters++;
+ mono_debugger_call_exception_handler (ei->data.filter, MONO_CONTEXT_GET_SP (ctx), obj);
filtered = call_filter (ctx, ei->data.filter);
if (filtered && out_filter_idx)
*out_filter_idx = filter_idx;
+ if (out_ji)
+ *out_ji = ji;
}
else {
/*
if (mono_trace_is_enabled () && mono_trace_eval (ji->method))
g_print ("EXCEPTION: catch found at clause %d of %s\n", i, mono_method_full_name (ji->method, TRUE));
mono_profiler_exception_clause_handler (ji->method, ei->flags, i);
- mono_debugger_handle_exception (ei->handler_start, MONO_CONTEXT_GET_SP (ctx), obj);
+ mono_debugger_call_exception_handler (ei->handler_start, MONO_CONTEXT_GET_SP (ctx), obj);
MONO_CONTEXT_SET_IP (ctx, ei->handler_start);
*(mono_get_lmf_addr ()) = lmf;
mono_perfcounters->exceptions_depth += frame_count;
if (mono_trace_is_enabled () && mono_trace_eval (ji->method))
g_print ("EXCEPTION: fault clause %d of %s\n", i, mono_method_full_name (ji->method, TRUE));
mono_profiler_exception_clause_handler (ji->method, ei->flags, i);
- mono_debugger_handle_exception (ei->handler_start, MONO_CONTEXT_GET_SP (ctx), obj);
+ mono_debugger_call_exception_handler (ei->handler_start, MONO_CONTEXT_GET_SP (ctx), obj);
call_filter (ctx, ei->handler_start);
}
if (!test_only && ei->try_start <= MONO_CONTEXT_GET_IP (ctx) &&
if (mono_trace_is_enabled () && mono_trace_eval (ji->method))
g_print ("EXCEPTION: finally clause %d of %s\n", i, mono_method_full_name (ji->method, TRUE));
mono_profiler_exception_clause_handler (ji->method, ei->flags, i);
- mono_debugger_handle_exception (ei->handler_start, MONO_CONTEXT_GET_SP (ctx), obj);
+ mono_debugger_call_exception_handler (ei->handler_start, MONO_CONTEXT_GET_SP (ctx), obj);
mono_perfcounters->exceptions_finallys++;
+ *(mono_get_lmf_addr ()) = lmf;
call_filter (ctx, ei->handler_start);
}
g_assert_not_reached ();
}
+/*
+ * mono_debugger_handle_exception:
+ *
+ * Notify the debugger about exceptions. Returns TRUE if the debugger wants us to stop
+ * at the exception and FALSE to resume with the normal exception handling.
+ *
+ * The arch code is responsible to setup @ctx in a way that MONO_CONTEXT_GET_IP () and
+ * MONO_CONTEXT_GET_SP () point to the throw instruction; ie. before executing the
+ * `callq throw' instruction.
+ */
+gboolean
+mono_debugger_handle_exception (MonoContext *ctx, MonoObject *obj)
+{
+ MonoDebuggerExceptionAction action;
+
+ if (!mono_debug_using_mono_debugger ())
+ return FALSE;
+
+ if (!obj) {
+ MonoException *ex = mono_get_exception_null_reference ();
+ MONO_OBJECT_SETREF (ex, message, mono_string_new (mono_domain_get (), "Object reference not set to an instance of an object"));
+ obj = (MonoObject *)ex;
+ }
+
+ action = _mono_debugger_throw_exception (MONO_CONTEXT_GET_IP (ctx), MONO_CONTEXT_GET_SP (ctx), obj);
+
+ if (action == MONO_DEBUGGER_EXCEPTION_ACTION_STOP) {
+ /*
+ * The debugger wants us to stop on the `throw' instruction.
+ * By the time we get here, it already inserted a breakpoint there.
+ */
+ return TRUE;
+ } else if (action == MONO_DEBUGGER_EXCEPTION_ACTION_STOP_UNHANDLED) {
+ MonoContext ctx_cp = *ctx;
+ MonoJitInfo *ji = NULL;
+ gboolean ret;
+
+ /*
+ * The debugger wants us to stop only if this exception is user-unhandled.
+ */
+
+ ret = mono_handle_exception_internal (&ctx_cp, obj, MONO_CONTEXT_GET_IP (ctx), TRUE, NULL, &ji);
+ if (ret && (ji != NULL) && (ji->method->wrapper_type == MONO_WRAPPER_RUNTIME_INVOKE)) {
+ /*
+ * The exception is handled in a runtime-invoke wrapper, that means that it's unhandled
+ * inside the method being invoked, so we handle it like a user-unhandled exception.
+ */
+ ret = FALSE;
+ }
+
+ if (!ret) {
+ /*
+ * The exception is user-unhandled - tell the debugger to stop.
+ */
+ return _mono_debugger_unhandled_exception (MONO_CONTEXT_GET_IP (ctx), MONO_CONTEXT_GET_SP (ctx), obj);
+ }
+
+ /*
+ * The exception is catched somewhere - resume with the normal exception handling and don't
+ * stop in the debugger.
+ */
+ }
+
+ return FALSE;
+}
+
/**
* mono_debugger_run_finally:
* @start_ctx: saved processor state
{
if (!test_only)
mono_perfcounters->exceptions_thrown++;
- return mono_handle_exception_internal (ctx, obj, original_ip, test_only, NULL);
+ return mono_handle_exception_internal (ctx, obj, original_ip, test_only, NULL, NULL);
}
#ifdef MONO_ARCH_SIGSEGV_ON_ALTSTACK
#error "Can't use sigaltstack without sigaction"
#endif
+#define ALIGN_TO(val,align) ((((guint64)val) + ((align) - 1)) & ~((align) - 1))
+
void
mono_setup_altstack (MonoJitTlsData *tls)
{
/*g_print ("thread %p, stack_base: %p, stack_size: %d\n", (gpointer)pthread_self (), staddr, stsize);*/
tls->stack_ovf_guard_base = staddr + mono_pagesize ();
- tls->stack_ovf_guard_size = mono_pagesize () * 8;
+ tls->stack_ovf_guard_size = ALIGN_TO (8 * 4096, mono_pagesize ());
if (mono_mprotect (tls->stack_ovf_guard_base, tls->stack_ovf_guard_size, MONO_MMAP_NONE)) {
/* mprotect can fail for the main thread stack */
}
gpointer
-mono_altstack_restore_prot (gssize *regs, guint8 *code, gpointer *tramp_data, guint8* tramp)
+mono_altstack_restore_prot (mgreg_t *regs, guint8 *code, gpointer *tramp_data, guint8* tramp)
{
void (*func)(void) = (gpointer)tramp_data;
func ();
void
mono_handle_native_sigsegv (int signal, void *ctx)
{
-#ifndef PLATFORM_WIN32
+#ifdef MONO_ARCH_USE_SIGACTION
struct sigaction sa;
#endif
MonoJitTlsData *jit_tls = TlsGetValue (mono_jit_tls_id);
if (handling_sigsegv)
return;
+ if (mini_get_debug_options ()->suspend_on_sigsegv) {
+ fprintf (stderr, "Received SIGSEGV, suspending...");
+ while (1)
+ ;
+ }
+
/* To prevent infinite loops when the stack walk causes a crash */
handling_sigsegv = TRUE;
int res;
int stdout_pipe [2] = { -1, -1 };
pid_t pid;
- const char *argv [16];
- char buf1 [128];
int status;
char buffer [1024];
* glibc fork acquires some locks, so if the crash happened inside malloc/free,
* it will deadlock. Call the syscall directly instead.
*/
- pid = syscall (SYS_fork);
+ pid = mono_runtime_syscall_fork ();
+
if (pid == 0) {
close (stdout_pipe [0]);
dup2 (stdout_pipe [1], STDOUT_FILENO);
for (i = getdtablesize () - 1; i >= 3; i--)
close (i);
- argv [0] = g_find_program_in_path ("gdb");
- if (argv [0] == NULL) {
+ if (!mono_gdb_render_native_backtraces ())
close (STDOUT_FILENO);
- exit (1);
- }
- argv [1] = "-ex";
- sprintf (buf1, "attach %ld", (long)getpid ());
- argv [2] = buf1;
- argv [3] = "--ex";
- argv [4] = "info threads";
- argv [5] = "--ex";
- argv [6] = "thread apply all bt";
- argv [7] = "--batch";
- argv [8] = 0;
-
- execv (argv [0], (char**)argv);
exit (1);
}
}
#endif
-#ifndef PLATFORM_WIN32
+#ifdef MONO_ARCH_USE_SIGACTION
/* Remove our SIGABRT handler */
sa.sa_handler = SIG_DFL;
void
mono_print_thread_dump (void *sigctx)
{
- MonoThread *thread = mono_thread_current ();
+ MonoInternalThread *thread = mono_thread_internal_current ();
#if defined(__i386__) || defined(__x86_64__)
MonoContext ctx;
#endif
GString* text = g_string_new (0);
- char *name;
+ char *name, *wapi_desc;
GError *error = NULL;
if (thread->name) {
g_string_append_printf (text, "\n\"%s\"", name);
g_free (name);
}
+ else if (thread->threadpool_thread)
+ g_string_append (text, "\n\"<threadpool thread>\"");
else
- g_string_append (text, "\n\"\"");
+ g_string_append (text, "\n\"<unnamed thread>\"");
- g_string_append_printf (text, " tid=0x%p this=0x%p:\n", (gpointer)(gsize)thread->tid, thread);
+#ifndef PLATFORM_WIN32
+ wapi_desc = wapi_current_thread_desc ();
+ g_string_append_printf (text, " tid=0x%p this=0x%p %s\n", (gpointer)(gsize)thread->tid, thread, wapi_desc);
+ free (wapi_desc);
+#endif
- /* FIXME: */
-#if defined(__i386__) || defined(__x86_64__)
+#ifdef MONO_ARCH_HAVE_SIGCTX_TO_MONOCTX
if (!sigctx)
MONO_INIT_CONTEXT_FROM_FUNC (&ctx, mono_print_thread_dump);
else
printf ("\t<Stack traces in thread dumps not supported on this platform>\n");
#endif
- fprintf (stdout, text->str);
+ fprintf (stdout, "%s", text->str);
g_string_free (text, TRUE);
fflush (stdout);
}
projects / mono.git / blobdiff