@@ -3,7 +3,9 @@ require 'httperf4r' include HTTPerf4r filename=ARGV[0] header,graph_data=HTTPerf.parse_tsv(filename) +require 'pp' +pp header HTTPerf.generate_gruff('test gruff',header,graph_data) -HTTPerf.generate_scruffy('test scruffy',header,graph_data) +#HTTPerf.generate_scruffy('test scruffy',header,graph_data) lib/benchreport @@ -107,7 +107,6 @@ class HTTPerf header.each{|h| graph.add :line,h,graph_data[h]} graph.point_markers=graph_data['req_rate'] graph.render :to =>'bench.svg' - graph.render :to=>'bench.png',:as=>'png' end def self.generate_gruff(title,header,graph_data) require 'rubygems' @@ -128,11 +127,19 @@ class HTTPerf CSV.open(filename, 'r',?\t) do |row| if header.nil? header=row - header.collect!{|h| h.to_s } + header.collect!{|h| + hs=h.to_s + if hs.rindex("_").nil? + hs + else + hs[0,hs.rindex("_")] + end + } + header.reject!{|h| h.empty? or h.nil?} header.each{|h| graph_data[h]=[]} next end - row.each_index{|i| graph_data[header[i]]<<row[i].to_f} + row.each_index{|i| graph_data[header[i]]<<row[i].to_f unless (row[i].nil?)} end return header,graph_data end @@ -166,8 +173,8 @@ class HTTPerf out<<format_results(results) curr_rate+=@options.step_rate end - #generate_scruffy(@options.server,@header,graph_data) - generate_gruff(@options.server,@header,graph_data) + HTTPerf.generate_scruffy(@options.server,@header,graph_data) + HTTPerf.generate_gruff(@options.server,@header,graph_data) end end end lib/httperf4r.rb @@ -71,7 +71,7 @@ task :report do "report[uploaded_data]" => UploadIO.new(tsv, "text/tab-separated-values",'bench.tsv'), "report[system_info]" => collect_info res = Net::HTTP.start(url.host, url.port) do |http| - puts http.request(req) +# puts http.request(req) end end lib/tasks/bench.rake e3621eea0dbd486165954388799c50b6211ed3cd Sergey Vidyuk svidyuk@gmail.com http://github.com/sv/rorbench/commit/c7be102be0c588c3036a4518fa6f417b9d793c1b c7be102be0c588c3036a4518fa6f417b9d793c1b 2008-08-19T15:36:59-07:00 2008-08-19T15:36:59-07:00 fix docs typos. several cleanups de2de433243c1c804a0bb2a186c6bfa5292330e4 Sergey Vidyuk svidyuk@gmail.com