mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* Release GVL while OpenSSL's public key generation.
t = Thread.new { print "."; sleep 0.1 } key = OpenSSL::PKey::RSA.new(2048) #=> Thread t works in parallel with public key generation if OS/machine allows it. This works with OpenSSL >= 0.9.8. From this version, it has new public key generation function which allows us to interrupt the execution while pkey generation iterations. * ext/openssl/extconf.rb: Check existence of OpenSSL's new public key generation function. (DH_generate_parameters_ex, DSA_generate_parameters_ex and RSA_generate_key_ex. * ext/openssl/ossl_pkey.{h,c} (ossl_generate_cb_2, ossl_generate_cb_stop): Added new callback function for OpenSSL pkey generation which handles Thread interruption by Ruby. ossl_generate_cb_stop is the unblock function(ubf) for Ruby which sets a stop flag. New pkey generation callback ossl_generate_cb_2 checks the stop flag at each iterations of OpenSSL and interrupts pkey generation when the flag is set. * ext/openssl/ossl_pkey_dsa.c (dsa_generate): Call rb_thread_blocking_region with the above unblock function to release GVL while pkey generation. * ext/openssl/ossl_pkey_rsa.c (rsa_generate): ditto. * ext/openssl/ossl_pkey_dh.c (dh_generate): ditto. * test/openssl/test_pkey_{dh,dsa,rsa}.rb: Test it. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
ca3b4133fd
commit
d3507e3ea6
10 changed files with 284 additions and 10 deletions
|
@ -33,6 +33,42 @@ ossl_generate_cb(int p, int n, void *arg)
|
|||
rb_yield(ary);
|
||||
}
|
||||
|
||||
#if HAVE_BN_GENCB
|
||||
/* OpenSSL 2nd version of GN generation callback */
|
||||
int
|
||||
ossl_generate_cb_2(int p, int n, BN_GENCB *cb)
|
||||
{
|
||||
VALUE ary, ret;
|
||||
struct ossl_generate_cb_arg *arg;
|
||||
int state;
|
||||
|
||||
arg = (struct ossl_generate_cb_arg *)cb->arg;
|
||||
if (arg->yield) {
|
||||
ary = rb_ary_new2(2);
|
||||
rb_ary_store(ary, 0, INT2NUM(p));
|
||||
rb_ary_store(ary, 1, INT2NUM(n));
|
||||
|
||||
/*
|
||||
* can be break by raising exception or 'break'
|
||||
*/
|
||||
ret = rb_protect(rb_yield, ary, &state);
|
||||
if (state) {
|
||||
arg->stop = 1;
|
||||
arg->state = state;
|
||||
}
|
||||
}
|
||||
if (arg->stop) return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
void
|
||||
ossl_generate_cb_stop(void *ptr)
|
||||
{
|
||||
struct ossl_generate_cb_arg *arg = (struct ossl_generate_cb_arg *)ptr;
|
||||
arg->stop = 1;
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Public
|
||||
*/
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue