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

Don't call Warning.warn unless the category is enabled

Browse Source 
The warning category should be enabled if we want to call
`Warning.warn`.

This commit speeds up the following benchmark:

```ruby
eval "def test; " +
  1000.times.map { "'  '.chomp!" }.join(";") + "; end"

def run_benchmark count
  i = 0
  while i < count
    start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
    yield
    ms = Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
    puts "itr ##{i}: #{(ms * 1000).to_i}ms"
    i += 1
  end
end

run_benchmark(25) do
  250.times do
    test
  end
end
```

On `master` this runs at about 92ms per iteration. With this patch, it
is 7ms per iteration.

[Bug #20573]
This commit is contained in:
Aaron Patterson 2024-06-10 16:05:03 -07:00 committed by Aaron Patterson
parent 0a6b1a4d9d
commit 1271ff72d5
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bootstraptest/test_yjit.rb
View File

@ -592,6 +592,8 @@ assert_equal 'string', %q{
# Check that exceptions work when getting global variable # Check that exceptions work when getting global variable
assert_equal 'rescued', %q{ assert_equal 'rescued', %q{
Warning[:deprecated] = true
module Warning module Warning
def warn(message) def warn(message)
raise raise

4
error.c
View File

@ -475,7 +475,7 @@ rb_warn(const char *fmt, ...)
void void
rb_category_warn(rb_warning_category_t category, const char *fmt, ...) rb_category_warn(rb_warning_category_t category, const char *fmt, ...)
{ {
if (!NIL_P(ruby_verbose)) { if (!NIL_P(ruby_verbose) && rb_warning_category_enabled_p(category)) {
with_warning_string(mesg, 0, fmt) { with_warning_string(mesg, 0, fmt) {
rb_warn_category(mesg, rb_warning_category_to_name(category)); rb_warn_category(mesg, rb_warning_category_to_name(category));
} }
@ -507,7 +507,7 @@ rb_warning(const char *fmt, ...)
void void
rb_category_warning(rb_warning_category_t category, const char *fmt, ...) rb_category_warning(rb_warning_category_t category, const char *fmt, ...)
{ {
if (RTEST(ruby_verbose)) { if (RTEST(ruby_verbose) && rb_warning_category_enabled_p(category)) {
with_warning_string(mesg, 0, fmt) { with_warning_string(mesg, 0, fmt) {
rb_warn_category(mesg, rb_warning_category_to_name(category)); rb_warn_category(mesg, rb_warning_category_to_name(category));
} }