aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGonçalo Silva <goncalossilva@gmail.com>2010-06-12 11:49:11 +0100
committerwycats <wycats@gmail.com>2010-06-17 19:18:52 -0700
commit4813462eeaf172b6155cb61757da2b073e2ebb74 (patch)
tree8c096b120fe3add50d04e7f2335225e42c12386a
parent36f5d09692bbc7adeef8944530fbf03c8cbe93ea (diff)
downloadrails-4813462eeaf172b6155cb61757da2b073e2ebb74.tar.gz
rails-4813462eeaf172b6155cb61757da2b073e2ebb74.tar.bz2
rails-4813462eeaf172b6155cb61757da2b073e2ebb74.zip
GC at 1.9.X doesn't have malloc_allocated_size, remove support for it
-rw-r--r--activesupport/lib/active_support/testing/performance.rb12
1 files changed, 0 insertions, 12 deletions
diff --git a/activesupport/lib/active_support/testing/performance.rb b/activesupport/lib/active_support/testing/performance.rb
index 2cdac12391..3aa7ae99fe 100644
--- a/activesupport/lib/active_support/testing/performance.rb
+++ b/activesupport/lib/active_support/testing/performance.rb
@@ -339,18 +339,6 @@ begin
def measure
RubyProf.measure_memory / 1024.0
end
-
- # Ruby 1.9 with total_malloc_allocated_size patch
- elsif GC.respond_to?(:malloc_total_allocated_size)
- def measure
- GC.total_malloc_allocated_size / 1024.0
- end
-
- # Ruby 1.9 unpatched
- elsif GC.respond_to?(:malloc_allocated_size)
- def measure
- GC.malloc_allocated_size / 1024.0
- end
end
def format(measurement)