diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-20 03:15:33 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-20 03:15:33 +0000 |
commit | 49f52937bd9461a677123a16a011c7bc261900a4 (patch) | |
tree | 49ca4d9a8d29003bbe34f89da56778043a1e6a53 | |
parent | fe5d65f1579aed0aac09329b185b25b61c13cd51 (diff) | |
download | ruby-49f52937bd9461a677123a16a011c7bc261900a4.tar.gz |
vm.c: disable dtrace in jit source
* vm.c: include dummy dtrace probes header in jit header.
* vm_insnhelper.c: probes headers are included by vm.c.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62489 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | eval.c | 1 | ||||
-rw-r--r-- | probes_helper.h | 1 | ||||
-rw-r--r-- | vm.c | 4 | ||||
-rw-r--r-- | vm_insnhelper.c | 2 |
4 files changed, 5 insertions, 3 deletions
@@ -18,6 +18,7 @@ #include "ruby/vm.h" #include "vm_core.h" #include "mjit.h" +#include "probes.h" #include "probes_helper.h" NORETURN(void rb_raise_jump(VALUE, VALUE)); diff --git a/probes_helper.h b/probes_helper.h index 1393436b29..115c78d467 100644 --- a/probes_helper.h +++ b/probes_helper.h @@ -2,7 +2,6 @@ #define RUBY_PROBES_HELPER_H #include "ruby/ruby.h" -#include "probes.h" struct ruby_dtrace_method_hook_args { const char *classname; @@ -17,7 +17,11 @@ #include "vm_debug.h" #include "iseq.h" #include "eval_intern.h" +#ifndef MJIT_HEADER #include "probes.h" +#else +#include "probes.dmyh" +#endif #include "probes_helper.h" VALUE rb_str_concat_literals(size_t, const VALUE*); diff --git a/vm_insnhelper.c b/vm_insnhelper.c index e595dc3187..6e53fe7f63 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -14,8 +14,6 @@ #include <math.h> #include "constant.h" #include "internal.h" -#include "probes.h" -#include "probes_helper.h" #include "ruby/config.h" #include "debug_counter.h" |