From 7018acc946882f21d519af7c42ccf84b22a46b27 Mon Sep 17 00:00:00 2001
From: normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 30 Jul 2018 06:35:08 +0000
Subject: process.c (waitpid_nogvl): prevent conflicting use of sleep_cond

We reuse sleep_cond for waitpid notifications as well as GVL
waiting.  So we must take care to not hold onto sleep_cond
when we try to reacquire GVL.

[ruby-core:88183]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64117 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 process.c | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'process.c')

diff --git a/process.c b/process.c
index 57ad802631..5ac18315ef 100644
--- a/process.c
+++ b/process.c
@@ -1144,6 +1144,9 @@ waitpid_nogvl(void *x)
             rb_sigwait_fd_put(th, sigwait_fd);
         }
         else {
+            if (!w->cond)
+                w->cond = rb_sleep_cond_get(w->ec);
+
             /* another thread calling rb_sigwait_sleep will process
              * signals for us */
             if (SIGCHLD_LOSSY) {
@@ -1152,6 +1155,16 @@ waitpid_nogvl(void *x)
             rb_native_cond_wait(w->cond, &th->interrupt_lock);
         }
     }
+
+    /*
+     * we must release th->native_thread_data.sleep_cond when
+     * re-acquiring GVL:
+     */
+    if (w->cond) {
+        rb_sleep_cond_put(w->cond);
+        w->cond = 0;
+    }
+
     rb_native_mutex_unlock(&th->interrupt_lock);
 
     if (sigwait_fd >= 0)
@@ -1183,7 +1196,10 @@ waitpid_cleanup(VALUE x)
         list_del(&w->wnode);
         rb_native_mutex_unlock(&vm->waitpid_lock);
     }
-    rb_sleep_cond_put(w->cond);
+
+    /* we may have never released and re-acquired GVL */
+    if (w->cond)
+        rb_sleep_cond_put(w->cond);
 
     return Qfalse;
 }
-- 
cgit v1.2.3