1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor timeout-related code in re.c a little

Browse Source
This commit is contained in:
Yusuke Endoh 2022-10-24 18:12:49 +09:00
parent 8873c420d3
commit ef01482f64
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
re.c
View File

@ -3848,11 +3848,11 @@ rb_reg_initialize_m(int argc, VALUE *argv, VALUE self)
regex_t *reg = RREGEXP_PTR(self); regex_t *reg = RREGEXP_PTR(self);
{ {
double limit = NIL_P(timeout) ? 0.0 : NUM2DBL(timeout); double timeout_d = NIL_P(timeout) ? 0.0 : NUM2DBL(timeout);
if (!NIL_P(timeout) && limit <= 0) { if (!NIL_P(timeout) && timeout_d <= 0) {
rb_raise(rb_eArgError, "invalid timeout: %"PRIsVALUE, timeout); rb_raise(rb_eArgError, "invalid timeout: %"PRIsVALUE, timeout);
} }
double2hrtime(&reg->timelimit, limit); double2hrtime(&reg->timelimit, timeout_d);
} }
return self; return self;
@ -4476,18 +4476,18 @@ rb_reg_s_timeout_get(VALUE dummy)
*/ */
static VALUE static VALUE
rb_reg_s_timeout_set(VALUE dummy, VALUE limit) rb_reg_s_timeout_set(VALUE dummy, VALUE timeout)
{ {
double timeout = NIL_P(limit) ? 0.0 : NUM2DBL(limit); double timeout_d = NIL_P(timeout) ? 0.0 : NUM2DBL(timeout);
rb_ractor_ensure_main_ractor("can not access Regexp.timeout from non-main Ractors"); rb_ractor_ensure_main_ractor("can not access Regexp.timeout from non-main Ractors");
if (!NIL_P(limit) && timeout <= 0) { if (!NIL_P(timeout) && timeout_d <= 0) {
rb_raise(rb_eArgError, "invalid timeout: %"PRIsVALUE, limit); rb_raise(rb_eArgError, "invalid timeout: %"PRIsVALUE, timeout);
} }
double2hrtime(&rb_reg_match_time_limit, timeout); double2hrtime(&rb_reg_match_time_limit, timeout_d);
return limit; return timeout;
} }
/* /*