aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/testing/performance/jruby.rb
diff options
context:
space:
mode:
Diffstat (limited to 'activesupport/lib/active_support/testing/performance/jruby.rb')
-rw-r--r--activesupport/lib/active_support/testing/performance/jruby.rb4
1 files changed, 1 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/testing/performance/jruby.rb b/activesupport/lib/active_support/testing/performance/jruby.rb
index e489c1f0dd..b76c11f12b 100644
--- a/activesupport/lib/active_support/testing/performance/jruby.rb
+++ b/activesupport/lib/active_support/testing/performance/jruby.rb
@@ -73,8 +73,6 @@ module ActiveSupport
yield
end
end
-
- class Time < Base; end
class WallTime < Time
def measure
@@ -94,7 +92,7 @@ module ActiveSupport
end
end
- class Memory < Base
+ class Memory < DigitalInformationUnit
def measure
ManagementFactory.memory_mx_bean.non_heap_memory_usage.used + ManagementFactory.memory_mx_bean.heap_memory_usage.used
end