diff options
author | Marc-André Lafortune <github@marc-andre.ca> | 2021-01-30 13:50:46 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-30 13:50:46 -0500 |
commit | a2721a035b8ee34d735a277bc359511190621b3e (patch) | |
tree | f71df6a5a7277b2f5031d29dbdef7dbe81b2188d /lib | |
parent | 0abce07b908fa0128223a3e11f2eeb4be0c191d6 (diff) | |
parent | 285c461cd2c7f7cf2afb1782cefe11462813e3af (diff) | |
download | psych-a2721a035b8ee34d735a277bc359511190621b3e.zip |
Merge pull request #474 from Shopify/cache-load-types-in-to-ruby
Avoid repeated access to Ractor.current
Diffstat (limited to 'lib')
-rw-r--r-- | lib/psych/visitors/to_ruby.rb | 10 | ||||
-rw-r--r-- | lib/psych/visitors/visitor.rb | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/lib/psych/visitors/to_ruby.rb b/lib/psych/visitors/to_ruby.rb index ec80701..a100188 100644 --- a/lib/psych/visitors/to_ruby.rb +++ b/lib/psych/visitors/to_ruby.rb @@ -24,6 +24,7 @@ module Psych super() @st = {} @ss = ss + @load_tags = Psych.load_tags @domain_types = Psych.domain_types @class_loader = class_loader @symbolize_names = symbolize_names @@ -48,7 +49,7 @@ module Psych end def deserialize o - if klass = resolve_class(Psych.load_tags[o.tag]) + if klass = resolve_class(@load_tags[o.tag]) instance = klass.allocate if instance.respond_to?(:init_with) @@ -128,7 +129,7 @@ module Psych end def visit_Psych_Nodes_Sequence o - if klass = resolve_class(Psych.load_tags[o.tag]) + if klass = resolve_class(@load_tags[o.tag]) instance = klass.allocate if instance.respond_to?(:init_with) @@ -160,8 +161,8 @@ module Psych end def visit_Psych_Nodes_Mapping o - if Psych.load_tags[o.tag] - return revive(resolve_class(Psych.load_tags[o.tag]), o) + if @load_tags[o.tag] + return revive(resolve_class(@load_tags[o.tag]), o) end return revive_hash(register(o, {}), o) unless o.tag @@ -326,6 +327,7 @@ module Psych end private + def register node, object @st[node.anchor] = object if node.anchor object diff --git a/lib/psych/visitors/visitor.rb b/lib/psych/visitors/visitor.rb index e2585c0..21052aa 100644 --- a/lib/psych/visitors/visitor.rb +++ b/lib/psych/visitors/visitor.rb @@ -17,7 +17,7 @@ module Psych if defined?(Ractor) def dispatch - Ractor.current[:Psych_Visitors_Visitor] ||= Visitor.dispatch_cache + @dispatch_cache ||= (Ractor.current[:Psych_Visitors_Visitor] ||= Visitor.dispatch_cache) end else DISPATCH = dispatch_cache |