1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Lock GC while searching the best iseq

Browse Source 
To fix
http://ci.rvm.jp/results/trunk-mjit-wait@phosphorus-docker/3286265
This commit is contained in:
Takashi Kokubun 2020-12-11 19:58:45 -08:00
parent 4e5156621e
commit 3e23991345
No known key found for this signature in database
GPG Key ID: 6FFC433B12EE23DD
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mjit_worker.c
View File

@ -500,9 +500,14 @@ mjit_valid_class_serial_p(rb_serial_t class_serial)
static struct rb_mjit_unit * static struct rb_mjit_unit *
get_from_list(struct rb_mjit_unit_list *list) get_from_list(struct rb_mjit_unit_list *list)
{ {
struct rb_mjit_unit *unit = NULL, *next, *best = NULL; while (in_gc) {
verbose(3, "Waiting wakeup from GC");
rb_native_cond_wait(&mjit_gc_wakeup, &mjit_engine_mutex);
}
in_jit = true; // Lock GC
// Find iseq with max total_calls // Find iseq with max total_calls
struct rb_mjit_unit *unit = NULL, *next, *best = NULL;
list_for_each_safe(&list->head, unit, next, unode) { list_for_each_safe(&list->head, unit, next, unode) {
if (unit->iseq == NULL) { // ISeq is GCed. if (unit->iseq == NULL) { // ISeq is GCed.
remove_from_list(unit, list); remove_from_list(unit, list);
@ -514,6 +519,11 @@ get_from_list(struct rb_mjit_unit_list *list)
best = unit; best = unit;
} }
} }
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 (best) { if (best) {
remove_from_list(best, list); remove_from_list(best, list);
} }