From 24c6373028960be21d68dfcffee8d389d93ee030 Mon Sep 17 00:00:00 2001
From: yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 25 Dec 2008 09:56:12 +0000
Subject: merges r20971 from trunk into ruby_1_9_1. * error.c, vm_dump.c:
 change message by rb_bug().

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21028 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 vm_dump.c | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

(limited to 'vm_dump.c')

diff --git a/vm_dump.c b/vm_dump.c
index d922b5beab..2098f129dd 100644
--- a/vm_dump.c
+++ b/vm_dump.c
@@ -580,9 +580,16 @@ rb_vm_bugreport(void)
 	SDR();
 
 	bt = rb_make_backtrace();
-	if (TYPE(bt) == T_ARRAY)
-	for (i = 0; i < RARRAY_LEN(bt); i++) {
-	    dp(RARRAY_PTR(bt)[i]);
+
+	if (bt) {
+	    fprintf(stderr, "-- Ruby level backtrace information"
+		    "-----------------------------------------\n");
+
+	    for (i = 0; i < RARRAY_LEN(bt); i++) {
+		VALUE str = RARRAY_PTR(bt)[i];
+		fprintf(stderr, "%s\n", RSTRING_PTR(str));
+	    }
+	    fprintf(stderr, "\n");
 	}
     }
 
@@ -592,13 +599,20 @@ rb_vm_bugreport(void)
     {
 	static void *trace[MAX_NATIVE_TRACE];
 	int n = backtrace(trace, MAX_NATIVE_TRACE);
+	char **syms = backtrace_symbols(trace, n);
 	int i;
 
-	fprintf(stderr, "-- backtrace of native function call (Use addr2line) --\n");
+	fprintf(stderr, "-- C level backtrace information "
+		"-------------------------------------------\n");
 	for (i=0; i<n; i++) {
-	    fprintf(stderr, "%p\n", trace[i]);
+	    char *info = syms ? syms[i] : "";
+	    fprintf(stderr, "%p %s\n", trace[i], info);
+	}
+	fprintf(stderr, "\n");
+
+	if (syms) {
+	    free(syms);
 	}
-	fprintf(stderr, "-------------------------------------------------------\n");
     }
 #endif
 }
-- 
cgit v1.2.3