Synchronize calls to Autoload#resolve

When multiple threads attempt to resolve an autoload definition there's nothing guarding the checks/sets for the "@loaded" and "@thread" instance variables. By using Rubinius.synchronize we can ensure that only 1 thread at a time can autoload a constant without having to worry about recursive locking.
rubinius · Apr 24, 2015 · b57399f · b57399f
1 parent 29316ad
commit b57399f
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/kernel/common/autoload.rb b/kernel/common/autoload.rb
@@ -49,10 +49,12 @@ def call(under, honor_require=false)
   end
 
   def resolve
-    unless @loaded && @thread == Thread.current
-      @loaded = true
-      @thread = Thread.current
-      Rubinius::CodeLoader.require @path
+    Rubinius.synchronize(self) do
+      unless @loaded && @thread == Thread.current
+        @loaded = true
+        @thread = Thread.current
+        Rubinius::CodeLoader.require @path
+      end
     end
   end