kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Prefix rb_ to MJIT wait call since it's exported

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67643 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
k0kubun 2019-04-20 07:37:29 +00:00
parent e4a0304aef
commit ef73bee811
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mjit.c
View file

@ -404,16 +404,16 @@ mjit_wait(struct rb_iseq_constant_body *body)
while (body->jit_func == (mjit_func_t)NOT_READY_JIT_ISEQ_FUNC) { while (body->jit_func == (mjit_func_t)NOT_READY_JIT_ISEQ_FUNC) {
tries++; tries++;
if (tries / 1000 > MJIT_WAIT_TIMEOUT_SECONDS || pch_status == PCH_FAILED) { 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. 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"); mjit_warning("timed out to wait for JIT finish");
break; 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); 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); 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 // Wait for JIT compilation finish for --jit-wait, and call the function pointer
// if the compiled result is not NOT_COMPILED_JIT_ISEQ_FUNC. // if the compiled result is not NOT_COMPILED_JIT_ISEQ_FUNC.
VALUE 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); mjit_wait(body);
if ((uintptr_t)body->jit_func <= (uintptr_t)LAST_JIT_ISEQ_FUNC) { if ((uintptr_t)body->jit_func <= (uintptr_t)LAST_JIT_ISEQ_FUNC) {

4
mjit.h
View file

@ -72,7 +72,7 @@ RUBY_EXTERN struct mjit_options mjit_opts;
RUBY_EXTERN bool mjit_call_p; RUBY_EXTERN bool mjit_call_p;
extern void rb_mjit_add_iseq_to_process(const rb_iseq_t *iseq); 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 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); extern void rb_mjit_recompile_iseq(const rb_iseq_t *iseq);
RUBY_SYMBOL_EXPORT_END 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_DEBUG_COUNTER_INC(mjit_exec_not_added_add_iseq);
rb_mjit_add_iseq_to_process(iseq); rb_mjit_add_iseq_to_process(iseq);
if (UNLIKELY(mjit_opts.wait)) { if (UNLIKELY(mjit_opts.wait)) {
return mjit_wait_call(ec, body); return rb_mjit_wait_call(ec, body);
} }
} }
return Qundef; return Qundef;