summaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorKouhei Sutou <[email protected]>2015-12-29 20:36:12 +0900
committerKouhei Sutou <[email protected]>2015-12-29 20:36:12 +0900
commita561bdb25ff51809c5de63ab7083ebf25d37cda9 (patch)
tree7c19c9a51246879dc01b1b112f483352c6f4480c /include
parente132de9e8eaf095f6f8b826e34a1c145403c3311 (diff)
downloadmruby-a561bdb25ff51809c5de63ab7083ebf25d37cda9.tar.gz
mruby-a561bdb25ff51809c5de63ab7083ebf25d37cda9.zip
Support backtrace after method calls
GitHub: fix #2902, #2917 The current implementation traverses stack to retrieve backtrace. But stack will be changed when some operations are occurred. It means that backtrace may be broken after some operations. This change (1) saves the minimum information to retrieve backtrace when exception is raised and (2) restores backtrace from the minimum information when backtrace is needed. It reduces overhead for creating backtrace Ruby objects. The space for the minimum information is reused by multiple exceptions. So memory allocation isn't occurred for each exception.
Diffstat (limited to 'include')
-rw-r--r--include/mruby.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/include/mruby.h b/include/mruby.h
index 1ea0156e8..33af08133 100644
--- a/include/mruby.h
+++ b/include/mruby.h
@@ -113,6 +113,14 @@ struct mrb_context {
struct mrb_jmpbuf;
+typedef struct {
+ const char *filename;
+ int lineno;
+ struct RClass *klass;
+ const char *sep;
+ mrb_sym method_id;
+} mrb_backtrace_entry;
+
typedef void (*mrb_atexit_func)(struct mrb_state*);
typedef struct mrb_state {
@@ -125,6 +133,12 @@ typedef struct mrb_state {
struct mrb_context *root_c;
struct RObject *exc; /* exception */
+ struct {
+ struct RObject *exc;
+ int n;
+ int n_allocated;
+ mrb_backtrace_entry *entries;
+ } backtrace;
struct iv_tbl *globals; /* global variable table */
struct RObject *top_self;