mirror of
https://github.com/discourse/discourse.git
synced 2025-03-23 21:45:57 +08:00
FEATURE: improve memory reporting of /admin/memory_stats
This commit is contained in:
parent
e14f38f19e
commit
3aea00473b
@ -3,20 +3,7 @@ class Admin::DiagnosticsController < Admin::AdminController
|
|||||||
skip_before_filter :check_xhr
|
skip_before_filter :check_xhr
|
||||||
|
|
||||||
def memory_stats
|
def memory_stats
|
||||||
|
render text: memory_report, content_type: Mime::TEXT
|
||||||
begin
|
|
||||||
# ruby 2.1
|
|
||||||
GC.start(full_mark: true)
|
|
||||||
rescue
|
|
||||||
GC.start
|
|
||||||
end
|
|
||||||
|
|
||||||
stats = GC.stat.map{|k,v| "#{k}: #{v}"}
|
|
||||||
counts = ObjectSpace.count_objects.map{|k,v| "#{k}: #{v}"}
|
|
||||||
|
|
||||||
render text: "GC STATS:\n#{stats.join("\n")} \n\nObjects:\n#{counts.join("\n")}",
|
|
||||||
content_type: Mime::TEXT
|
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def dump_heap
|
def dump_heap
|
||||||
@ -34,4 +21,51 @@ class Admin::DiagnosticsController < Admin::AdminController
|
|||||||
render text: "HEAP DUMP:\nnot supported", content_type: Mime::TEXT
|
render text: "HEAP DUMP:\nnot supported", content_type: Mime::TEXT
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
protected
|
||||||
|
|
||||||
|
def memory_report
|
||||||
|
begin
|
||||||
|
# ruby 2.1
|
||||||
|
GC.start(full_mark: true)
|
||||||
|
rescue
|
||||||
|
GC.start
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
|
classes = {}
|
||||||
|
|
||||||
|
ObjectSpace.each_object do |o|
|
||||||
|
begin
|
||||||
|
next if o == classes
|
||||||
|
|
||||||
|
classes[o.class] ||= 0
|
||||||
|
classes[o.class] += 1
|
||||||
|
rescue
|
||||||
|
# all sorts of stuff can happen here BasicObject etc.
|
||||||
|
classes[:unknown] ||= 0
|
||||||
|
classes[:unknown] += 1
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
stats = GC.stat.map{|k,v| "#{k}: #{v}"}
|
||||||
|
counts = ObjectSpace.count_objects.sort{|a,b| b[1] <=> a[1] }.map{|k,v| "#{k}: #{v}"}
|
||||||
|
|
||||||
|
classes = classes.sort{|a,b| b[1] <=> a[1]}[0..40].map{|klass, count| "#{klass}: #{count}"}
|
||||||
|
|
||||||
|
|
||||||
|
<<TEXT
|
||||||
|
#{`hostname`.strip} pid:#{Process.pid} #{`cat /proc/#{Process.pid}/cmdline`.strip.gsub(/[^a-z1-9\/]/i, ' ')}
|
||||||
|
|
||||||
|
GC STATS:
|
||||||
|
#{stats.join("\n")}
|
||||||
|
|
||||||
|
Objects:
|
||||||
|
#{counts.join("\n")}
|
||||||
|
|
||||||
|
Classes:
|
||||||
|
#{classes.join("\n")}
|
||||||
|
|
||||||
|
TEXT
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user