From c37d47e30897762145835e66ae752cce924af01d Mon Sep 17 00:00:00 2001 From: Matthew Draper Date: Tue, 30 Sep 2014 01:32:42 +0930 Subject: Soften the lock requirements when eager_load is disabled We don't need to fully disable concurrent requests: just ensure that loads are performed in isolation. --- .../lib/active_support/dependencies/interlock.rb | 35 ++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 activesupport/lib/active_support/dependencies/interlock.rb (limited to 'activesupport/lib/active_support/dependencies/interlock.rb') diff --git a/activesupport/lib/active_support/dependencies/interlock.rb b/activesupport/lib/active_support/dependencies/interlock.rb new file mode 100644 index 0000000000..c3601bac13 --- /dev/null +++ b/activesupport/lib/active_support/dependencies/interlock.rb @@ -0,0 +1,35 @@ +require 'active_support/concurrency/share_lock' + +module ActiveSupport + module Dependencies #:nodoc: + class Interlock + def initialize + @lock = ActiveSupport::Concurrency::ShareLock.new(true) + end + + def loading + @lock.exclusive do + yield + end + end + + def start_running + @lock.start_sharing + end + + def done_running + @lock.stop_sharing + end + + def running + @lock.sharing do + yield + end + end + + # Match the Mutex API, so we can be used by Rack::Lock + alias :lock :start_running + alias :unlock :done_running + end + end +end -- cgit v1.2.3