github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

removed support for 1.8's GC alternative hacks (railsbench and lloyd patches). RubyProf can handle it

Browse Source
This commit is contained in:
Gonçalo Silva
2010-06-12 11:45:31 +01:00
committed by wycats
parent cb74cfc9c1
commit 36f5d09692
1 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
activesupport/lib/active_support/testing/performance.rb
View File

@@ -270,13 +270,6 @@ begin
GC::Profiler.disable
GC.enable
end
elsif GC.respond_to?(:enable_stats)
def with_gc_stats
GC.enable_stats
yield
ensure
GC.disable_stats
end
else
def with_gc_stats
yield
@@ -347,18 +340,6 @@ begin
RubyProf.measure_memory / 1024.0
end
# Ruby 1.8 + railsbench patch
elsif GC.respond_to?(:allocated_size)
def measure
GC.allocated_size / 1024.0
end
# Ruby 1.8 + lloyd patch
elsif GC.respond_to?(:heap_info)
def measure
GC.heap_info['heap_current_memory'] / 1024.0
end
# Ruby 1.9 with total_malloc_allocated_size patch
elsif GC.respond_to?(:malloc_total_allocated_size)
def measure
@@ -395,12 +376,6 @@ begin
def measure
RubyProf.measure_allocations
end
# Ruby 1.8 + railsbench patch
elsif ObjectSpace.respond_to?(:allocated_objects)
def measure
ObjectSpace.allocated_objects
end
end
def format(measurement)