rb_thread_call_without_gvl

* include/ruby/thread.h: new header file for thread stuff.
* thread.c (rb_thread_call_without_gvl): export.  [Feature#4328]
  returns void* instead of VALUE.  [Feature #5543]
* thread.c (rb_thread_blocking_region): deprecate.  [ruby-core:46295]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36355 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 10 insertions, 9 deletions

diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
index f8023bc8c6..88e4506fa8 100644
--- a/ext/openssl/ossl.h
+++ b/ext/openssl/ossl.h
@@ -30,6 +30,7 @@ extern "C" {
 #endif
 #include <ruby.h>
 #include <ruby/io.h>
+#include <ruby/thread.h>
 
 /*
  * Check the OpenSSL version
diff --git a/ext/openssl/ossl_pkey_dh.c b/ext/openssl/ossl_pkey_dh.c
index 819fbced42..c8fb40e1ff 100644
--- a/ext/openssl/ossl_pkey_dh.c
+++ b/ext/openssl/ossl_pkey_dh.c
@@ -90,12 +90,12 @@ struct dh_blocking_gen_arg {
     int result;
 };
 
-static VALUE
+static void *
 dh_blocking_gen(void *arg)
 {
     struct dh_blocking_gen_arg *gen = (struct dh_blocking_gen_arg *)arg;
     gen->result = DH_generate_parameters_ex(gen->dh, gen->size, gen->gen, gen->cb);
-    return Qnil;
+    return 0;
 }
 #endif
 
@@ -123,7 +123,7 @@ dh_generate(int size, int gen)
 	dh_blocking_gen(&gen_arg);
     } else {
 	/* there's a chance to unblock */
-	rb_thread_blocking_region(dh_blocking_gen, &gen_arg, ossl_generate_cb_stop, &cb_arg);
+	rb_thread_call_without_gvl(dh_blocking_gen, &gen_arg, ossl_generate_cb_stop, &cb_arg);
     }
 
     if (!gen_arg.result) {
diff --git a/ext/openssl/ossl_pkey_dsa.c b/ext/openssl/ossl_pkey_dsa.c
index d3e91f00e3..ba28ba028d 100644
--- a/ext/openssl/ossl_pkey_dsa.c
+++ b/ext/openssl/ossl_pkey_dsa.c
@@ -87,12 +87,12 @@ struct dsa_blocking_gen_arg {
     int result;
 };
 
-static VALUE
+static void *
 dsa_blocking_gen(void *arg)
 {
     struct dsa_blocking_gen_arg *gen = (struct dsa_blocking_gen_arg *)arg;
     gen->result = DSA_generate_parameters_ex(gen->dsa, gen->size, gen->seed, gen->seed_len, gen->counter, gen->h, gen->cb);
-    return Qnil;
+    return 0;
 }
 #endif
 
@@ -130,7 +130,7 @@ dsa_generate(int size)
 	dsa_blocking_gen(&gen_arg);
     } else {
 	/* there's a chance to unblock */
-	rb_thread_blocking_region(dsa_blocking_gen, &gen_arg, ossl_generate_cb_stop, &cb_arg);
+	rb_thread_call_without_gvl(dsa_blocking_gen, &gen_arg, ossl_generate_cb_stop, &cb_arg);
     }
     if (!gen_arg.result) {
 	DSA_free(dsa);
diff --git a/ext/openssl/ossl_pkey_rsa.c b/ext/openssl/ossl_pkey_rsa.c
index 3fbd87fb48..e395e7108f 100644
--- a/ext/openssl/ossl_pkey_rsa.c
+++ b/ext/openssl/ossl_pkey_rsa.c
@@ -85,12 +85,12 @@ struct rsa_blocking_gen_arg {
     int result;
 };
 
-static VALUE
+static void *
 rsa_blocking_gen(void *arg)
 {
     struct rsa_blocking_gen_arg *gen = (struct rsa_blocking_gen_arg *)arg;
     gen->result = RSA_generate_key_ex(gen->rsa, gen->size, gen->e, gen->cb);
-    return Qnil;
+    return 0;
 }
 #endif
 
@@ -133,7 +133,7 @@ rsa_generate(int size, unsigned long exp)
 	rsa_blocking_gen(&gen_arg);
     } else {
 	/* there's a chance to unblock */
-	rb_thread_blocking_region(rsa_blocking_gen, &gen_arg, ossl_generate_cb_stop, &cb_arg);
+	rb_thread_call_without_gvl(rsa_blocking_gen, &gen_arg, ossl_generate_cb_stop, &cb_arg);
     }
     if (!gen_arg.result) {
 	BN_free(e);