aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/digestor.rb
diff options
context:
space:
mode:
authorthedarkone <thedarkone2@gmail.com>2012-12-13 14:47:33 +0100
committerthedarkone <thedarkone2@gmail.com>2012-12-14 12:18:47 +0100
commit45448a578877f6a753492113d72cc3512a6f1720 (patch)
tree9c44e7fd9395bff738deeb4ab76db68c0efa3734 /actionpack/lib/action_view/digestor.rb
parentd668544785550712677ae999dfb0644e640ec729 (diff)
downloadrails-45448a578877f6a753492113d72cc3512a6f1720.tar.gz
rails-45448a578877f6a753492113d72cc3512a6f1720.tar.bz2
rails-45448a578877f6a753492113d72cc3512a6f1720.zip
Replace some global Hash usages with the new thread safe cache.
Summary of the changes: * Add thread_safe gem. * Use thread safe cache for digestor caching. * Replace manual synchronization with ThreadSafe::Cache in Relation::Delegation. * Replace @attribute_method_matchers_cache Hash with ThreadSafe::Cache. * Use TS::Cache to avoid the synchronisation overhead on listener retrieval. * Replace synchronisation with TS::Cache usage. * Use a preallocated array for performance/memory reasons. * Update the controllers cache to the new AS::Dependencies::ClassCache API. The original @controllers cache no longer makes much sense after @tenderlove's changes in 7b6bfe84f3 and f345e2380c. * Use TS::Cache in the connection pool to avoid locking overhead. * Use TS::Cache in ConnectionHandler.
Diffstat (limited to 'actionpack/lib/action_view/digestor.rb')
-rw-r--r--actionpack/lib/action_view/digestor.rb21
1 files changed, 5 insertions, 16 deletions
diff --git a/actionpack/lib/action_view/digestor.rb b/actionpack/lib/action_view/digestor.rb
index 1c6eaf36f7..8bc69b9246 100644
--- a/actionpack/lib/action_view/digestor.rb
+++ b/actionpack/lib/action_view/digestor.rb
@@ -1,4 +1,4 @@
-require 'mutex_m'
+require 'thread_safe'
module ActionView
class Digestor
@@ -21,23 +21,12 @@ module ActionView
/x
cattr_reader(:cache)
- @@cache = Hash.new.extend Mutex_m
+ @@cache = ThreadSafe::Cache.new
def self.digest(name, format, finder, options = {})
- cache.synchronize do
- unsafe_digest name, format, finder, options
- end
- end
-
- ###
- # This method is NOT thread safe. DO NOT CALL IT DIRECTLY, instead call
- # Digestor.digest
- def self.unsafe_digest(name, format, finder, options = {}) # :nodoc:
- key = "#{name}.#{format}"
-
- cache.fetch(key) do
+ @@cache["#{name}.#{format}"] ||= begin
klass = options[:partial] || name.include?("/_") ? PartialDigestor : Digestor
- cache[key] = klass.new(name, format, finder).digest
+ klass.new(name, format, finder).digest
end
end
@@ -93,7 +82,7 @@ module ActionView
def dependency_digest
dependencies.collect do |template_name|
- Digestor.unsafe_digest(template_name, format, finder, partial: true)
+ Digestor.digest(template_name, format, finder, partial: true)
end.join("-")
end