From ef73bee8113638199595611240d74d310f8a4f57 Mon Sep 17 00:00:00 2001 From: k0kubun Date: Sat, 20 Apr 2019 07:37:29 +0000 Subject: [PATCH] Prefix rb_ to MJIT wait call since it's exported git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67643 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- mjit.c | 10 +++++----- mjit.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/mjit.c b/mjit.c index a65f990280..488bae657b 100644 --- a/mjit.c +++ b/mjit.c @@ -404,16 +404,16 @@ mjit_wait(struct rb_iseq_constant_body *body) while (body->jit_func == (mjit_func_t)NOT_READY_JIT_ISEQ_FUNC) { tries++; if (tries / 1000 > MJIT_WAIT_TIMEOUT_SECONDS || pch_status == PCH_FAILED) { - CRITICAL_SECTION_START(3, "in mjit_wait_call to set jit_func"); + CRITICAL_SECTION_START(3, "in rb_mjit_wait_call to set jit_func"); body->jit_func = (mjit_func_t)NOT_COMPILED_JIT_ISEQ_FUNC; // JIT worker seems dead. Give up. - CRITICAL_SECTION_FINISH(3, "in mjit_wait_call to set jit_func"); + CRITICAL_SECTION_FINISH(3, "in rb_mjit_wait_call to set jit_func"); mjit_warning("timed out to wait for JIT finish"); break; } - CRITICAL_SECTION_START(3, "in mjit_wait_call for a client wakeup"); + CRITICAL_SECTION_START(3, "in rb_mjit_wait_call for a client wakeup"); rb_native_cond_broadcast(&mjit_worker_wakeup); - CRITICAL_SECTION_FINISH(3, "in mjit_wait_call for a client wakeup"); + CRITICAL_SECTION_FINISH(3, "in rb_mjit_wait_call for a client wakeup"); rb_thread_wait_for(tv); } } @@ -421,7 +421,7 @@ mjit_wait(struct rb_iseq_constant_body *body) // Wait for JIT compilation finish for --jit-wait, and call the function pointer // if the compiled result is not NOT_COMPILED_JIT_ISEQ_FUNC. VALUE -mjit_wait_call(rb_execution_context_t *ec, struct rb_iseq_constant_body *body) +rb_mjit_wait_call(rb_execution_context_t *ec, struct rb_iseq_constant_body *body) { mjit_wait(body); if ((uintptr_t)body->jit_func <= (uintptr_t)LAST_JIT_ISEQ_FUNC) { diff --git a/mjit.h b/mjit.h index e71df7f07c..f50b364f6b 100644 --- a/mjit.h +++ b/mjit.h @@ -72,7 +72,7 @@ RUBY_EXTERN struct mjit_options mjit_opts; RUBY_EXTERN bool mjit_call_p; extern void rb_mjit_add_iseq_to_process(const rb_iseq_t *iseq); -extern VALUE mjit_wait_call(rb_execution_context_t *ec, struct rb_iseq_constant_body *body); +extern VALUE rb_mjit_wait_call(rb_execution_context_t *ec, struct rb_iseq_constant_body *body); extern struct rb_mjit_compile_info* rb_mjit_iseq_compile_info(const struct rb_iseq_constant_body *body); extern void rb_mjit_recompile_iseq(const rb_iseq_t *iseq); RUBY_SYMBOL_EXPORT_END @@ -135,7 +135,7 @@ mjit_exec(rb_execution_context_t *ec) RB_DEBUG_COUNTER_INC(mjit_exec_not_added_add_iseq); rb_mjit_add_iseq_to_process(iseq); if (UNLIKELY(mjit_opts.wait)) { - return mjit_wait_call(ec, body); + return rb_mjit_wait_call(ec, body); } } return Qundef;