summaryrefslogtreecommitdiff
path: root/mjit.c
diff options
context:
space:
mode:
authork0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-19 22:10:12 +0000
committerk0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-19 22:10:12 +0000
commit27322735afae833bcecd54fbb551ad4132e96235 (patch)
tree1cd28fbf97850e3c6185e59f861ba3f9010dfd24 /mjit.c
parent797098f8e8c7575188dbd61b96c3f766002b87f6 (diff)
revert r65807
it didn't work. http://ci.rvm.jp/results/trunk-mjit@silicon-docker/1468677 and skips broken tests for now. But this issue should be fixed soon. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65814 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'mjit.c')
-rw-r--r--mjit.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/mjit.c b/mjit.c
index 9c2cfcfedf..1578c961ae 100644
--- a/mjit.c
+++ b/mjit.c
@@ -677,7 +677,7 @@ mjit_init(struct mjit_options *opts)
}
static void
-stop_worker(int check_ints_p)
+stop_worker(void)
{
rb_execution_context_t *ec = GET_EC();
@@ -687,17 +687,10 @@ stop_worker(int check_ints_p)
stop_worker_p = TRUE; /* Setting this inside loop because RUBY_VM_CHECK_INTS may make this FALSE. */
rb_native_cond_broadcast(&mjit_worker_wakeup);
CRITICAL_SECTION_FINISH(3, "in stop_worker");
- if (check_ints_p) RUBY_VM_CHECK_INTS(ec);
+ RUBY_VM_CHECK_INTS(ec);
}
}
-/* A function to stop MJIT worker when it's not safe to allow interrupts. */
-void
-mjit_pause_without_ints(void)
-{
- stop_worker(FALSE);
-}
-
/* Stop JIT-compiling methods but compiled code is kept available. */
VALUE
mjit_pause(int wait_p)
@@ -723,7 +716,7 @@ mjit_pause(int wait_p)
}
}
- stop_worker(TRUE);
+ stop_worker();
return Qtrue;
}
@@ -816,7 +809,7 @@ mjit_finish(void)
CRITICAL_SECTION_FINISH(3, "in mjit_finish to wakeup from pch");
/* Stop worker */
- stop_worker(TRUE);
+ stop_worker();
rb_native_mutex_destroy(&mjit_engine_mutex);
rb_native_cond_destroy(&mjit_pch_wakeup);