Make active record instrumentation more thread safe, Issue #10

noahd1 · Jul 20, 2011 · 5f340e7 · 5f340e7
1 parent 0198645
commit 5f340e7
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/lib/oink/instrumentation/active_record.rb b/lib/oink/instrumentation/active_record.rb
@@ -20,25 +20,27 @@ module ActiveRecord
       def self.included(klass)
         klass.class_eval do
 
-          @@instantiated = {}
-          @@total = nil
-
           def self.reset_instance_type_count
-            @@instantiated = {}
-            @@total = nil
+            self.instantiated_hash = {}
+            Thread.current['oink.activerecord.instantiations_count'] = nil
           end
 
           def self.increment_instance_type_count
-            @@instantiated[base_class.name] ||= 0
-            @@instantiated[base_class.name] += 1
+            self.instantiated_hash ||= {}
+            self.instantiated_hash[base_class.name] ||= 0
+            self.instantiated_hash[base_class.name] += 1
           end
 
           def self.instantiated_hash
-            @@instantiated
+            Thread.current['oink.activerecord.instantiations']
+          end
+
+          def self.instantiated_hash=(hsh)
+            Thread.current['oink.activerecord.instantiations'] = hsh
           end
 
           def self.total_objects_instantiated
-            @@total ||= @@instantiated.values.sum
+            Thread.current['oink.activerecord.instantiations_count'] ||= self.instantiated_hash.values.sum
           end
 
           unless Oink.extended_active_record?