From ed67d90a9874df2e42d6045d47e805b3e594d718 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Mon, 16 Jun 2008 00:10:30 -0700
Subject: Metrics::Memory measures in fractional KB also
---
activesupport/lib/active_support/testing/performance.rb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'activesupport')
diff --git a/activesupport/lib/active_support/testing/performance.rb b/activesupport/lib/active_support/testing/performance.rb
index 377150a0a6..7da2f6791a 100644
--- a/activesupport/lib/active_support/testing/performance.rb
+++ b/activesupport/lib/active_support/testing/performance.rb
@@ -285,15 +285,15 @@ module ActiveSupport
if RubyProf.respond_to?(:measure_memory)
def measure
- RubyProf.measure_memory
+ RubyProf.measure_memory / 1024.0
end
elsif GC.respond_to?(:allocated_size)
def measure
- GC.allocated_size
+ GC.allocated_size / 1024.0
end
elsif GC.respond_to?(:malloc_allocated_size)
def measure
- GC.malloc_allocated_size
+ GC.malloc_allocated_size / 1024.0
end
end
--
cgit v1.2.3