@@ -8,6 +8,11 @@ module Fiveruns RULES = [] class << self + + def host + ::Fiveruns::Dash.host + end + def replacements @replacements ||= begin paths = { @@ -24,11 +29,11 @@ module Fiveruns end def system_gempaths - `gem environment gempath` + host.result :gem, 'environment gempath', :bat end - + def system_paths - `ruby -e 'puts $:.reject{|p|p=="."}.join(":")'` + host.result :ruby, %(-e 'puts $:.reject { |p| p == "." }.join(":")'), :exe end def regexp_for_path(path) @@ -46,6 +51,7 @@ module Fiveruns def add_ignore_rule(&rule) RULES << rule end + end def initialize(session) lib/fiveruns/dash/exception_recorder.rb @@ -65,6 +65,15 @@ module Fiveruns::Dash def execute_on_windows(&block) block.call if RUBY_PLATFORM =~ /win32|i386-mingw32/ end + + def result(command, args, windows_ext=nil) + name = if windows_ext && os_name_match?(:windows) + "#{command}.#{windows_ext}" + else + command.to_s + end + `#{name} #{args}` + end def hostname @hostname lib/fiveruns/dash/host.rb @@ -1,34 +1,41 @@ Fiveruns::Dash.register_recipe :ruby, :url => 'http://dash.fiveruns.com' do |metrics| - metrics.absolute :vsz, - "Virtual Memory Usage", "The amount of virtual memory used by this process", - :unit => 'kbytes', :scope => :host do - Integer(`ps -o vsz -p #{Process.pid}`[/(\d+)/, 1]) - end - metrics.absolute :rss, "Resident Memory Usage", - "The amount of physical memory used by this process", - :unit => 'kbytes', + + # TODO: Support Windows + Fiveruns::Dash.host.execute_on_unix do + + metrics.absolute :vsz, + "Virtual Memory Usage", "The amount of virtual memory used by this process", + :unit => 'kbytes', :scope => :host do + Integer(`ps -o vsz -p #{Process.pid}`[/(\d+)/, 1]) + end + metrics.absolute :rss, "Resident Memory Usage", + "The amount of physical memory used by this process", + :unit => 'kbytes', + :scope => :host do + Integer(`ps -o rss -p #{Process.pid}`[/(\d+)/, 1]) + end + metrics.percentage :pmem, + "Resident Memory Usage", + "Percentage of Resident Memory Usage", :scope => :host do - Integer(`ps -o rss -p #{Process.pid}`[/(\d+)/, 1]) - end - metrics.percentage :pmem, - "Resident Memory Usage", - "Percentage of Resident Memory Usage", - :scope => :host do - Float(`ps -o pmem -p #{Process.pid}`[/(\d+\.\d+)/, 1]) - end + Float(`ps -o pmem -p #{Process.pid}`[/(\d+\.\d+)/, 1]) + end - if RUBY_PLATFORM == 'java' - Fiveruns::Dash.logger.warn "Cannot collect CPU usage data on JRuby" - else - metrics.percentage :cpu, - 'CPU Usage', - 'Percentage CPU Usage', - :scope => :host do - before = Thread.current[:dash_utime] ||= Process.times.utime - after = Process.times.utime - this_minute = after - before - Thread.current[:dash_utime] = after - (this_minute / 60) * 100.00 + if RUBY_PLATFORM == 'java' + Fiveruns::Dash.logger.warn "Cannot collect CPU usage data on JRuby" + else + metrics.percentage :cpu, + 'CPU Usage', + 'Percentage CPU Usage', + :scope => :host do + before = Thread.current[:dash_utime] ||= Process.times.utime + after = Process.times.utime + this_minute = after - before + Thread.current[:dash_utime] = after + (this_minute / 60) * 100.00 + end end + end + end recipes/ruby.rb 53e514ee9951b17384f4bddbb19e71e18a21e62d Bruce Williams bruce@codefluency.com http://github.com/fiveruns/dash-ruby/commit/f7b8f0a9b420c3f3b65f916b741e0cce8808dbd1 f7b8f0a9b420c3f3b65f916b741e0cce8808dbd1 2009-03-18T13:01:07-07:00 2009-03-18T13:01:07-07:00 Basic Windows compatibility pass b4ea80c65792d4b2d63c7adbec9c2a54c13ef8b7 Bruce Williams bruce@codefluency.com