diff options
author | k0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-08-09 11:31:41 +0000 |
---|---|---|
committer | k0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-08-09 11:31:41 +0000 |
commit | 212a77ed46d73af3600756247f7c30d6c270eff1 (patch) | |
tree | 3fdac90fa7b0d433856c9f208cda027550e63712 | |
parent | 33dd5d6970489c0aef929880e8730126cc7ad4c6 (diff) |
process.c: fix outdated mjit_pause declaration
by sharing it with vm.c in internal.h.
vm.c: ditto
internal.h: ditto
mjit.h: share more.
mjit.c: make sure the third arguemnt is not used
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64253 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | internal.h | 5 | ||||
-rw-r--r-- | mjit.c | 2 | ||||
-rw-r--r-- | mjit.h | 1 | ||||
-rw-r--r-- | process.c | 6 | ||||
-rw-r--r-- | vm.c | 3 |
5 files changed, 7 insertions, 10 deletions
diff --git a/internal.h b/internal.h index 81c556c0be..3a2240c776 100644 --- a/internal.h +++ b/internal.h @@ -1399,6 +1399,11 @@ VALUE rb_math_sin(VALUE); VALUE rb_math_sinh(VALUE); VALUE rb_math_sqrt(VALUE); +/* mjit.c */ +extern int mjit_enabled; +VALUE mjit_pause(int argc, VALUE *argv, VALUE recv); +VALUE mjit_resume(void); + /* newline.c */ void Init_newline(void); @@ -1782,7 +1782,7 @@ stop_worker(void) /* Stop JIT-compiling methods but compiled code is kept available. */ VALUE -mjit_pause(int argc, VALUE *argv, VALUE recv) +mjit_pause(int argc, VALUE *argv, RB_UNUSED_VAR(VALUE self)) { VALUE options = Qnil; VALUE wait = Qtrue; @@ -54,7 +54,6 @@ struct mjit_options { typedef VALUE (*mjit_func_t)(rb_execution_context_t *, rb_control_frame_t *); -extern int mjit_enabled; RUBY_SYMBOL_EXPORT_BEGIN RUBY_EXTERN struct mjit_options mjit_opts; RUBY_EXTERN int mjit_call_p; @@ -148,10 +148,6 @@ static void check_uid_switch(void); static void check_gid_switch(void); static int exec_async_signal_safe(const struct rb_execarg *, char *, size_t); -/* mjit.c */ -extern int mjit_enabled; -VALUE mjit_pause(void); - #if 1 #define p_uid_from_name p_uid_from_name #define p_gid_from_name p_gid_from_name @@ -2887,7 +2883,7 @@ rb_f_exec(int argc, const VALUE *argv) execarg_obj = rb_execarg_new(argc, argv, TRUE, FALSE); eargp = rb_execarg_get(execarg_obj); - if (mjit_enabled) mjit_pause(); /* do not leak children */ + if (mjit_enabled) mjit_pause(0, NULL, Qnil); /* do not leak children */ before_exec(); /* stop timer thread before redirects */ rb_execarg_parent_start(execarg_obj); fail_str = eargp->use_shell ? eargp->invoke.sh.shell_script : eargp->invoke.cmd.command_name; @@ -2770,9 +2770,6 @@ mjit_enabled_p(void) return mjit_enabled ? Qtrue : Qfalse; } -extern VALUE mjit_pause(int argc, VALUE *argv, VALUE recv); -extern VALUE mjit_resume(void); - extern VALUE *rb_gc_stack_start; extern size_t rb_gc_stack_maxsize; #ifdef __ia64 |