aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/testing
diff options
context:
space:
mode:
authorGonçalo Silva <goncalossilva@gmail.com>2010-06-12 12:01:29 +0100
committerwycats <wycats@gmail.com>2010-06-17 19:18:53 -0700
commitb169d8378725fc96eb904e5711e68307b0841e12 (patch)
treeabe27b09240fa458333ca6e89d9ec1924d86e168 /activesupport/lib/active_support/testing
parent5e5d1babb0ab381ad471228904262312aa1fc297 (diff)
downloadrails-b169d8378725fc96eb904e5711e68307b0841e12.tar.gz
rails-b169d8378725fc96eb904e5711e68307b0841e12.tar.bz2
rails-b169d8378725fc96eb904e5711e68307b0841e12.zip
heap_live_objects+heap_free_objects is broken, use heap_total_objects instead
Diffstat (limited to 'activesupport/lib/active_support/testing')
-rw-r--r--activesupport/lib/active_support/testing/performance.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/testing/performance.rb b/activesupport/lib/active_support/testing/performance.rb
index 6b7954c5b9..9be156c45d 100644
--- a/activesupport/lib/active_support/testing/performance.rb
+++ b/activesupport/lib/active_support/testing/performance.rb
@@ -354,8 +354,7 @@ begin
def measure
GC.enable
GC.start
- last = GC::Profiler.data.last
- count = last[:HEAP_LIVE_OBJECTS] + last[:HEAP_FREE_OBJECTS]
+ count = GC::Profiler.data.last[:HEAP_TOTAL_OBJECTS]
GC.disable
count
end