summaryrefslogtreecommitdiff
path: root/mjit_worker.c
diff options
context:
space:
mode:
authorTakashi Kokubun <takashikkbn@gmail.com>2020-12-07 19:57:15 -0800
committerTakashi Kokubun <takashikkbn@gmail.com>2020-12-07 19:57:15 -0800
commita8f16df615daa55901bb351efe038e86b61fbb92 (patch)
tree5aaac7d18fe6c5527eef39893e22cf4e51cce65f /mjit_worker.c
parentea18c8bb96c019a609b37671ceec5f51d61476cd (diff)
Wait for GC before unload_units
Diffstat (limited to 'mjit_worker.c')
-rw-r--r--mjit_worker.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/mjit_worker.c b/mjit_worker.c
index 586ac13..945d1ef 100644
--- a/mjit_worker.c
+++ b/mjit_worker.c
@@ -1361,16 +1361,27 @@ mjit_worker(void)
while (!stop_worker_p) {
struct rb_mjit_unit *unit;
- // wait until unit is available
+ // Wait until a unit becomes available
CRITICAL_SECTION_START(3, "in worker dequeue");
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);
verbose(3, "Getting wakeup from client");
+ // Unload some units as needed
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);
unload_units();
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
mjit_opts.max_cache_size++; // avoid infinite loop on `rb_mjit_wait_call`. Note that --jit-wait is just for testing.