Decouple GC::Profiler from Metrics a bit.

Ultimately, the very simplistic utility of GC::Profiler isn't useful and Rubinius::Metrics should be used directly instead. We may remove support for GC::Profiler in the future. For now, using it requires enabling Rubinius Metrics.
rubinius · Apr 1, 2016 · 0deebd9 · 0deebd9
1 parent 731e807
commit 0deebd9
Showing 2 changed files with 25 additions and 7 deletions.
diff --git a/core/gc.rb b/core/gc.rb
@@ -43,19 +43,27 @@ def garbage_collect
   end
 
   def self.count
-    data = stat
-    data[:"gc.young.count"] + data[:"gc.immix.count"]
+    if data = stat
+      data[:"gc.young.count"] + data[:"gc.immix.count"]
+    else
+      0
+    end
   end
 
   def self.time
-    data = stat
-    data[:"gc.young.ms"] +
-      data[:"gc.immix.stop.ms"] +
-      data[:"gc.large.sweep.us"] * 1_000
+    if data = stat
+      data[:"gc.young.ms"] +
+        data[:"gc.immix.stop.ms"] +
+        data[:"gc.large.sweep.us"] * 1_000
+    else
+      0
+    end
   end
 
   def self.stat
-    Rubinius::Metrics.data.to_hash
+    if Rubinius::Metrics.enabled?
+      return Rubinius::Metrics.data.to_hash
+    end
   end
 
   module Profiler
@@ -90,6 +98,10 @@ def self.report(out = $stdout)
     end
 
     def self.result
+      unless Rubinius::Metrics.enabled?
+        return "Rubinius::Metrics is disabled. GC::Profiler results are unavailable"
+      end
+
       stats = GC.stat
 
       out = <<-OUT

diff --git a/core/metrics.rb b/core/metrics.rb
@@ -1,5 +1,11 @@
 module Rubinius
   module Metrics
+    @enabled = false
+
+    def self.enabled?
+      !!@enabled
+    end
+
     def self.data
       @data ||= Data.new
     end