From 7007ce7ce0aa4b18fac346bcbf5f9f73c50039ea Mon Sep 17 00:00:00 2001 From: wanabe Date: Sun, 25 Aug 2013 01:16:31 +0900 Subject: add Exception#backtrace --- src/backtrace.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 85 insertions(+), 9 deletions(-) (limited to 'src/backtrace.c') diff --git a/src/backtrace.c b/src/backtrace.c index e05ad4326..d0574fda6 100644 --- a/src/backtrace.c +++ b/src/backtrace.c @@ -7,18 +7,70 @@ #include "mruby.h" #include "mruby/variable.h" #include "mruby/proc.h" +#include "mruby/array.h" +#include "mruby/string.h" +#include -void -mrb_print_backtrace(mrb_state *mrb) +typedef void (*output_stream_func)(mrb_state*, void*, int, const char*, ...); + +static void +print_backtrace_i(mrb_state *mrb, void *stream, int level, const char *format, ...) +{ + va_list ap; + + va_start(ap, format); + vfprintf((FILE*)stream, format, ap); + va_end(ap); +} + +#define MIN_BUFSIZE 127 + +static void +get_backtrace_i(mrb_state *mrb, void *stream, int level, const char *format, ...) +{ + va_list ap; + mrb_value ary; + int len, ai; + + if (level > 0) { + return; + } + + ai = mrb_gc_arena_save(mrb); + ary = mrb_obj_value((struct RArray*)stream); + va_start(ap, format); + len = vsnprintf(NULL, 0, format, ap); + va_end(ap); + + if (len < MIN_BUFSIZE) { + char buf[MIN_BUFSIZE + 1]; + + va_start(ap, format); + vsnprintf(buf, MIN_BUFSIZE, format, ap); + va_end(ap); + mrb_ary_push(mrb, ary, mrb_str_new(mrb, buf, len)); + } + else { + char *buf = (char*)mrb_alloca(mrb, len + 1); + + va_start(ap, format); + vsnprintf(buf, len, format, ap); + va_end(ap); + mrb_ary_push(mrb, ary, mrb_str_new(mrb, buf, len)); + } + mrb_gc_arena_restore(mrb, ai); +} + +static void +mrb_output_backtrace(mrb_state *mrb, struct RObject *exc, output_stream_func func, void *stream) { -#ifdef ENABLE_STDIO mrb_callinfo *ci; mrb_int ciidx; const char *filename, *method, *sep; int i, line; - fputs("trace:\n", stderr); - ciidx = mrb_fixnum(mrb_obj_iv_get(mrb, mrb->exc, mrb_intern2(mrb, "ciidx", 5))); + func(mrb, stream, 1, "trace:\n"); + ciidx = mrb_fixnum(mrb_obj_iv_get(mrb, exc, mrb_intern2(mrb, "ciidx", 5))); if (ciidx >= mrb->c->ciend - mrb->c->cibase) ciidx = 10; /* ciidx is broken... */ @@ -41,7 +93,7 @@ mrb_print_backtrace(mrb_state *mrb) pc = mrb->c->cibase[i+1].pc; } else { - pc = (mrb_code*)mrb_voidp(mrb_obj_iv_get(mrb, mrb->exc, mrb_intern2(mrb, "lastpc", 6))); + pc = (mrb_code*)mrb_voidp(mrb_obj_iv_get(mrb, exc, mrb_intern2(mrb, "lastpc", 6))); } if (irep->iseq <= pc && pc < irep->iseq + irep->ilen) { line = irep->lines[pc - irep->iseq - 1]; @@ -59,15 +111,39 @@ mrb_print_backtrace(mrb_state *mrb) const char *cn = mrb_class_name(mrb, ci->proc->target_class); if (cn) { - fprintf(stderr, "\t[%d] %s:%d:in %s%s%s\n", i, filename, line, cn, sep, method); + func(mrb, stream, 1, "\t[%d] ", i); + func(mrb, stream, 0, "%s:%d:in %s%s%s", filename, line, cn, sep, method); + func(mrb, stream, 1, "\n"); } else { - fprintf(stderr, "\t[%d] %s:%d:in %s\n", i, filename, line, method); + func(mrb, stream, 1, "\t[%d] ", i); + func(mrb, stream, 0, "%s:%d:in %s", filename, line, method); + func(mrb, stream, 1, "\n"); } } else { - fprintf(stderr, "\t[%d] %s:%d\n", i, filename, line); + func(mrb, stream, 1, "\t[%d] ", i); + func(mrb, stream, 0, "%s:%d", filename, line); + func(mrb, stream, 1, "\n"); } } +} + +void +mrb_print_backtrace(mrb_state *mrb) +{ +#ifdef ENABLE_STDIO + mrb_output_backtrace(mrb, mrb->exc, print_backtrace_i, stderr); #endif } + +mrb_value +mrb_get_backtrace(mrb_state *mrb, mrb_value self) +{ + mrb_value ary; + + ary = mrb_ary_new(mrb); + mrb_output_backtrace(mrb, mrb_obj_ptr(self), get_backtrace_i, mrb_ary_ptr(ary)); + + return ary; +} -- cgit v1.2.3 From dd4b7ead7eaaed8def165c1e79e48fe319685376 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Mon, 26 Aug 2013 16:00:37 +0900 Subject: undef print_backtrace_i() unless ENABLE_STDIO --- src/backtrace.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/backtrace.c') diff --git a/src/backtrace.c b/src/backtrace.c index d0574fda6..acddc2c42 100644 --- a/src/backtrace.c +++ b/src/backtrace.c @@ -13,6 +13,7 @@ typedef void (*output_stream_func)(mrb_state*, void*, int, const char*, ...); +#ifdef ENABLE_STDIO static void print_backtrace_i(mrb_state *mrb, void *stream, int level, const char *format, ...) { @@ -22,6 +23,7 @@ print_backtrace_i(mrb_state *mrb, void *stream, int level, const char *format, . vfprintf((FILE*)stream, format, ap); va_end(ap); } +#endif #define MIN_BUFSIZE 127 -- cgit v1.2.3 From f18837886ca0b41e3ee54df0655ee332eca22e3f Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Mon, 26 Aug 2013 16:10:42 +0900 Subject: add cast to void* --- src/backtrace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/backtrace.c') diff --git a/src/backtrace.c b/src/backtrace.c index acddc2c42..a70330add 100644 --- a/src/backtrace.c +++ b/src/backtrace.c @@ -135,7 +135,7 @@ void mrb_print_backtrace(mrb_state *mrb) { #ifdef ENABLE_STDIO - mrb_output_backtrace(mrb, mrb->exc, print_backtrace_i, stderr); + mrb_output_backtrace(mrb, mrb->exc, print_backtrace_i, (void*)stderr); #endif } @@ -145,7 +145,7 @@ mrb_get_backtrace(mrb_state *mrb, mrb_value self) mrb_value ary; ary = mrb_ary_new(mrb); - mrb_output_backtrace(mrb, mrb_obj_ptr(self), get_backtrace_i, mrb_ary_ptr(ary)); + mrb_output_backtrace(mrb, mrb_obj_ptr(self), get_backtrace_i, (void*)mrb_ary_ptr(ary)); return ary; } -- cgit v1.2.3 From f3c8cf673556ad6420dbe4e21ee532b1a68b3301 Mon Sep 17 00:00:00 2001 From: "Yukihiro \"Matz\" Matsumoto" Date: Mon, 26 Aug 2013 16:33:27 +0900 Subject: do not use mrb_alloca() that keeps memory until mrb_state freed --- src/backtrace.c | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) (limited to 'src/backtrace.c') diff --git a/src/backtrace.c b/src/backtrace.c index a70330add..77906e843 100644 --- a/src/backtrace.c +++ b/src/backtrace.c @@ -31,7 +31,7 @@ static void get_backtrace_i(mrb_state *mrb, void *stream, int level, const char *format, ...) { va_list ap; - mrb_value ary; + mrb_value ary, str; int len, ai; if (level > 0) { @@ -42,24 +42,10 @@ get_backtrace_i(mrb_state *mrb, void *stream, int level, const char *format, ... ary = mrb_obj_value((struct RArray*)stream); va_start(ap, format); len = vsnprintf(NULL, 0, format, ap); + str = mrb_str_new(mrb, 0, len); + vsnprintf(RSTRING_PTR(str), len, format, ap); + mrb_ary_push(mrb, ary, str); va_end(ap); - - if (len < MIN_BUFSIZE) { - char buf[MIN_BUFSIZE + 1]; - - va_start(ap, format); - vsnprintf(buf, MIN_BUFSIZE, format, ap); - va_end(ap); - mrb_ary_push(mrb, ary, mrb_str_new(mrb, buf, len)); - } - else { - char *buf = (char*)mrb_alloca(mrb, len + 1); - - va_start(ap, format); - vsnprintf(buf, len, format, ap); - va_end(ap); - mrb_ary_push(mrb, ary, mrb_str_new(mrb, buf, len)); - } mrb_gc_arena_restore(mrb, ai); } -- cgit v1.2.3