1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* vm_dump.c (bugreport_backtrace): ditto.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27346 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-04-15 05:50:24 +00:00
parent 584829aa81
commit 7475244ec4
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,4 +1,4 @@
Thu Apr 15 14:38:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Apr 15 14:50:19 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm.c (vm_backtrace_each): get rid of use of malloc from signal * vm.c (vm_backtrace_each): get rid of use of malloc from signal
handler by using ruby_engine_name. [ruby-core:29497] handler by using ruby_engine_name. [ruby-core:29497]
@ -6,6 +6,8 @@ Thu Apr 15 14:38:03 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_eval.c (print_backtrace): file may be nil when segfaulted in * vm_eval.c (print_backtrace): file may be nil when segfaulted in
very early stage. very early stage.
* vm_dump.c (bugreport_backtrace): ditto.
Thu Apr 15 11:51:49 2010 NAKAMURA Usaku <usa@ruby-lang.org> Thu Apr 15 11:51:49 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* common.mk (help): small fix. * common.mk (help): small fix.

8
vm_dump.c
View File

@ -570,12 +570,18 @@ rb_vmdebug_thread_dump_state(VALUE self)
static int static int
bugreport_backtrace(void *arg, VALUE file, int line, VALUE method) bugreport_backtrace(void *arg, VALUE file, int line, VALUE method)
{ {
const char *filename = NIL_P(file) ? "ruby" : RSTRING_PTR(file);
if (!*(int *)arg) { if (!*(int *)arg) {
fprintf(stderr, "-- Ruby level backtrace information " fprintf(stderr, "-- Ruby level backtrace information "
"----------------------------------------\n"); "----------------------------------------\n");
*(int *)arg = 1; *(int *)arg = 1;
} }
fprintf(stderr, "%s:%d:in `%s'\n", RSTRING_PTR(file), line, RSTRING_PTR(method)); if (NIL_P(method)) {
fprintf(stderr, "%s:%d:in unknown method\n", filename, line);
}
else {
fprintf(stderr, "%s:%d:in `%s'\n", filename, line, RSTRING_PTR(method));
}
return 0; return 0;
} }