[PATCH 11/14] blocking mjit_finish

[Eric Wong <e@80x24.org>]

---
 mjit.c | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/mjit.c b/mjit.c
index 603b192c27..60b544e15e 100644
--- a/mjit.c
+++ b/mjit.c
@@ -1556,22 +1556,6 @@ mjit_resume(void)
     return Qtrue;
 }
 
-static void *
-wait_pch(void *ignored)
-{
-    rb_native_cond_wait(&mjit_pch_wakeup, &mjit_engine_mutex);
-    return 0;
-}
-
-static void
-ubf_pch(void *ignored)
-{
-    if (pthread_mutex_trylock(&mjit_engine_mutex) == 0) {
-        rb_native_cond_signal(&mjit_pch_wakeup);
-        rb_native_mutex_unlock(&mjit_engine_mutex);
-    }
-}
-
 /* Finish the threads processing units and creating PCH, finalize
    and free MJIT data.  It should be called last during MJIT
    life.  */
@@ -1592,7 +1576,7 @@ mjit_finish(void)
     while (pch_status == PCH_NOT_READY) {
         verbose(3, "Waiting wakeup from make_pch");
         /* release GVL to handle interrupts */
-        rb_thread_call_without_gvl(wait_pch, 0, ubf_pch, 0);
+        rb_native_cond_wait(&mjit_pch_wakeup, &mjit_engine_mutex);
     }
     CRITICAL_SECTION_FINISH(3, "in mjit_finish to wakeup from pch");
 
-- 
EW