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

Revert some recent JIT changes

Browse source 
Revert "Lock the entire active_units loop"

This reverts commit 5c2ff88be2.

Revert "Lock active_units references on compaction"

This reverts commit 556a728508.

Revert "Wait for GC before unload_units"

This reverts commit a8f16df615.

Well, the previous revert actually didn't fix it, but this series of
reverts seems to rollback the situation a little.
This commit is contained in:
Takashi Kokubun 2020-12-07 21:06:00 -08:00
parent 73b07c437e
commit b7dc04e518
No known key found for this signature in database
GPG key ID: 6FFC433B12EE23DD
1 changed files with 1 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
mjit_worker.c
View file

@ -936,7 +936,6 @@ compile_compact_jit_code(char* c_file)
// TODO: Consider using a more granular lock after we implement inlining across // TODO: Consider using a more granular lock after we implement inlining across
// compacted functions (not done yet). // compacted functions (not done yet).
bool success = true; bool success = true;
CRITICAL_SECTION_START(3, "before active_units list_for_each");
list_for_each(&active_units.head, child_unit, unode) { list_for_each(&active_units.head, child_unit, unode) {
char funcname[MAXPATHLEN]; char funcname[MAXPATHLEN];
sprint_funcname(funcname, child_unit); sprint_funcname(funcname, child_unit);
@ -952,7 +951,6 @@ compile_compact_jit_code(char* c_file)
fprintf(f, "\n/* %s%s%s:%ld */\n", iseq_label, sep, iseq_path, iseq_lineno); fprintf(f, "\n/* %s%s%s:%ld */\n", iseq_label, sep, iseq_path, iseq_lineno);
success &= mjit_compile(f, child_unit->iseq, funcname, child_unit->id); success &= mjit_compile(f, child_unit->iseq, funcname, child_unit->id);
} }
CRITICAL_SECTION_FINISH(3, "after active_units list_for_each");
// release blocking mjit_gc_start_hook // release blocking mjit_gc_start_hook
CRITICAL_SECTION_START(3, "after mjit_compile to wakeup client for GC"); CRITICAL_SECTION_START(3, "after mjit_compile to wakeup client for GC");
@ -1361,27 +1359,16 @@ mjit_worker(void)
while (!stop_worker_p) { while (!stop_worker_p) {
struct rb_mjit_unit *unit; struct rb_mjit_unit *unit;
// Wait until a unit becomes available // wait until unit is available
CRITICAL_SECTION_START(3, "in worker dequeue"); CRITICAL_SECTION_START(3, "in worker dequeue");
while ((list_empty(&unit_queue.head) || active_units.length >= mjit_opts.max_cache_size) && !stop_worker_p) { while ((list_empty(&unit_queue.head) || active_units.length >= mjit_opts.max_cache_size) && !stop_worker_p) {
rb_native_cond_wait(&mjit_worker_wakeup, &mjit_engine_mutex); rb_native_cond_wait(&mjit_worker_wakeup, &mjit_engine_mutex);
verbose(3, "Getting wakeup from client"); verbose(3, "Getting wakeup from client");
// Unload some units as needed
if (unload_requests >= throttle_threshold) { if (unload_requests >= throttle_threshold) {
while (in_gc) {
verbose(3, "Waiting wakeup from GC");
rb_native_cond_wait(&mjit_gc_wakeup, &mjit_engine_mutex);
}
in_jit = true; // Lock GC
RB_DEBUG_COUNTER_INC(mjit_unload_units); RB_DEBUG_COUNTER_INC(mjit_unload_units);
unload_units(); unload_units();
unload_requests = 0; unload_requests = 0;
in_jit = false; // Unlock GC
verbose(3, "Sending wakeup signal to client in a mjit-worker for GC");
rb_native_cond_signal(&mjit_client_wakeup);
} }
if (active_units.length == mjit_opts.max_cache_size && mjit_opts.wait) { // Sometimes all methods may be in use if (active_units.length == mjit_opts.max_cache_size && mjit_opts.wait) { // Sometimes all methods may be in use
mjit_opts.max_cache_size++; // avoid infinite loop on `rb_mjit_wait_call`. Note that --jit-wait is just for testing. mjit_opts.max_cache_size++; // avoid infinite loop on `rb_mjit_wait_call`. Note that --jit-wait is just for testing.