perfmonger 0.6.1 → 0.7.0

data/lib/perfmonger/command/play.rb

@@ -0,0 +1,56 @@
+
+require 'optparse'
+require 'json'
+
+module PerfMonger
+module Command
+
+class PlayCommand < BaseCommand
+  register_command 'play', "Play a perfmonger log file in JSON"
+
+  def initialize
+    @parser = OptionParser.new
+    @parser.banner = <<EOS
+Usage: perfmonger play [options] LOG_FILE
+
+Options:
+EOS
+
+  end
+
+  def parse_args(argv)
+    @parser.parse!(argv)
+
+    if argv.size == 0
+      puts("ERROR: PerfMonger log file is required")
+      puts(@parser.help)
+      exit(false)
+    end
+
+    @logfile = argv.shift
+    if ! File.exists?(@logfile)
+      puts("ERROR: No such file: #{@logfile}")
+      puts(@parser.help)
+      exit(false)
+    end
+  end
+
+  def run(argv)
+    parse_args(argv)
+
+    @player_bin = ::PerfMonger::Command::CoreFinder.player()
+
+    if ! @player_bin
+      puts("[ERROR] no executable binary found.")
+      exit(false)
+    end
+
+    cmd = [@player_bin]
+    cmd << @logfile
+
+    Process.exec(*cmd)
+  end
+end
+
+end # module Command
+end # module PerfMonger

data/lib/perfmonger/command/plot.rb

@@ -93,19 +93,27 @@ EOS
       exit(false)
     end
 
-    unless system('gnuplot -e "set terminal"|grep pdfcairo >/dev/null 2>&1')
+    unless system('gnuplot -e "set terminal" < /dev/null 2>&1 | grep pdfcairo >/dev/null 2>&1')
       puts("ERROR: pdfcairo is not supported by installed gnuplot")
       puts("ERROR: PerfMonger requires pdfcairo-supported gnuplot")
       puts(@parser.help)
       exit(false)
     end
 
-    plot_ioinfo()
-    plot_cpuinfo()
+    player_bin = ::PerfMonger::Command::CoreFinder.player()
+
+    tmpfile = Tempfile.new("jsondata")
+    IO.popen([player_bin, @data_file], "r").each_line do |line|
+      tmpfile.print(line)
+    end
+    tmpfile.flush()
+
+    plot_ioinfo(tmpfile.path)
+    plot_cpuinfo(tmpfile.path)
   end
 
   private
-  def plot_ioinfo()
+  def plot_ioinfo(json_file)
     iops_pdf_filename = @output_prefix + 'iops.pdf'
     transfer_pdf_filename = @output_prefix + 'transfer.pdf'
     gp_filename  = @output_prefix + 'io.gp'
@@ -126,20 +134,20 @@ EOS
         start_time = nil
         devices = nil
 
-        File.open(@data_file).each_line do |line|
+        File.open(json_file).each_line do |line|
           record = JSON.parse(line)
           time = record["time"]
-          ioinfo = record["ioinfo"]
-          return unless ioinfo
+          diskinfo = record["disk"]
+          return unless diskinfo
 
           start_time ||= time
-          devices ||= ioinfo["devices"]
+          devices ||= diskinfo["devices"]
 
           datafile.puts([time - start_time,
                          devices.map{|device|
-                           [ioinfo[device]["riops"], ioinfo[device]["wiops"],
-                            ioinfo[device]["rsecps"] * 512 / 1024 / 1024, # in MB/s
-                            ioinfo[device]["wsecps"] * 512 / 1024 / 1024, # in MB/s
+                           [diskinfo[device]["riops"], diskinfo[device]["wiops"],
+                            diskinfo[device]["rkbyteps"] * 512 / 1024 / 1024, # in MB/s
+                            diskinfo[device]["wkbyteps"] * 512 / 1024 / 1024, # in MB/s
                            ]
                          }].flatten.map(&:to_s).join("\t"))
         end
@@ -214,7 +222,7 @@ EOS
     end # mktempdir
   end # def
 
-  def plot_cpuinfo()
+  def plot_cpuinfo(json_file)
     pdf_filename = @output_prefix + 'cpu.pdf'
     gp_filename  = @output_prefix + 'cpu.gp'
     dat_filename = @output_prefix + 'cpu.dat'
@@ -243,21 +251,21 @@ EOS
         devices = nil
         nr_cpu = nil
 
-        File.open(@data_file).each_line do |line|
+        File.open(json_file).each_line do |line|
           record = JSON.parse(line)
 
           time = record["time"]
-          cpuinfo = record["cpuinfo"]
+          cpuinfo = record["cpu"]
           return unless cpuinfo
-          nr_cpu = cpuinfo['nr_cpu']
+          nr_cpu = cpuinfo['num_core']
 
-          cores = cpuinfo['cpus']
+          cores = cpuinfo['cores']
 
           start_time ||= time
           end_time = [end_time, time].max
 
           datafile.puts([time - start_time,
-                         %w|usr nice sys iowait irq soft steal guest idle|.map do |key|
+                         %w|usr nice sys iowait hardirq softirq steal guest idle|.map do |key|
                            cores.map{|core| core[key]}.inject(&:+)
                          end].flatten.map(&:to_s).join("\t"))
         end
@@ -266,7 +274,7 @@ EOS
         col_idx = 2
         columns = []
         plot_stmt_list = []
-        %w|%usr %nice %sys %iowait %irq %soft %steal %guest|.each do |key|
+        %w|%usr %nice %sys %iowait %hardirq %softirq %steal %guest|.each do |key|
           columns << col_idx
           plot_stmt = "\"#{datafile.path}\" usi 1:(#{columns.map{|i| "$#{i}"}.join("+")}) with filledcurve x1 lw 0 lc #{col_idx - 1} title \"#{key}\""
           plot_stmt_list << plot_stmt
@@ -321,15 +329,15 @@ EOS
         legend_height = 0.04
         nr_cpu.times do |cpu_idx|
           all_datafile.puts("# cpu #{cpu_idx}")
-          File.open(@data_file).each_line do |line|
+          File.open(json_file).each_line do |line|
             record = JSON.parse(line)
             time = record["time"]
-            cpurec = record["cpuinfo"]["cpus"][cpu_idx]
+            cpurec = record["cpu"]["cores"][cpu_idx]
             all_datafile.puts([time - start_time,
                                cpurec["usr"] + cpurec["nice"],
                                cpurec["sys"],
-                               cpurec["irq"],
-                               cpurec["soft"],
+                               cpurec["hardirq"],
+                               cpurec["softirq"],
                                cpurec["steal"] + cpurec["guest"],
                                cpurec["iowait"]].map(&:to_s).join("\t"))
           end

data/lib/perfmonger/command/record.rb

@@ -1,8 +1,7 @@
-
 require 'optparse'
-require 'json'
 require 'tempfile'
 require 'tmpdir'
+require 'json'
 
 module PerfMonger
 module Command
@@ -24,6 +23,8 @@ private
   def exec_record_cmd()
     cmd = @option.make_command
 
+    $stdout.puts("[recording to #{@option.logfile}]")
+
     Process.exec(*cmd)
   end
 end

data/lib/perfmonger/command/record_option.rb

@@ -7,11 +7,11 @@ class RecordOption
   attr_reader :interval
   attr_reader :verbose
   attr_reader :report_cpu
-  attr_reader :report_io
-  attr_reader :report_ctx_switch
+  attr_reader :no_disk
   attr_reader :logfile
 
   attr_reader :parser
+  attr_accessor :record_bin
 
   def self.parse(argv)
     option = self.new
@@ -23,88 +23,73 @@ class RecordOption
   def parse(argv)
     argv = @parser.parse(argv)
 
-    if ! @report_io && ! @report_ctx_switch && ! @report_cpu
-      @report_cpu = true
-      @report_io = true
-      @all_devices = true
-    end
+    @no_cpu = false
+    @no_disk = false
+    @all_devices = true
 
     argv
   end
 
   def make_command
-    # try to search perfmonger-record in build environment
-    # then search installed directory
-    record_bin = [File.expand_path("../../perfmonger_record", __FILE__),
-                  File.expand_path("lib/perfmonger/perfmonger_record", PerfMonger::ROOTDIR),
-                  File.expand_path("ext/perfmonger/perfmonger_record", PerfMonger::ROOTDIR)].find do |bin|
-      File.executable?(bin)
-    end
+    @recorder_bin = ::PerfMonger::Command::CoreFinder.recorder()
 
-    if record_bin == nil || ! File.executable?(record_bin)
-      puts("ERROR: perfmonger-record(1) not found!")
+    if ! @recorder_bin
+      puts("ERROR: no executable binaries")
       exit(false)
     end
 
-    cmd = [record_bin]
-    cmd << '-i'
-    cmd << @interval.to_s
-    if @interval_backoff
-      cmd << '-b'
+    cmd = [@recorder_bin]
+    cmd << sprintf("-interval=%.1fms", @interval * 1000)
+    if ! @interval_backoff
+      cmd << "-no-interval-backoff"
     end
     if @start_delay > 0
-      cmd << '-s'
-      cmd << @start_delay.to_s
+      cmd << "-start-delay"
+      cmd << "#{@start_delay*1000}ms"
     end
     if @timeout
-      cmd << '-t'
-      cmd << @timeout.to_s
+      cmd << "-timeout"
+      cmd << "#{@timeout*1000}ms"
+    end
+    if @no_cpu
+      cmd << "-no-cpu"
+    end
+    if @no_disk
+      cmd << "-no-disk"
     end
-    cmd << '-C' if @report_cpu
-    cmd << '-S' if @report_ctx_switch
-    cmd << '-l' if @logfile != STDOUT
-    cmd << @logfile if @logfile != STDOUT
-    if @report_io
-      if @all_devices
-        cmd << '-D'
-      else
-        @devices.each do |device|
-          cmd << '-d'
-          cmd << device
-        end
-      end
+    if @devices.size > 0
+      cmd << "-disks"
+      cmd << @devices.join(",")
     end
-    cmd << '-v' if @verbose
+
+    # TODO: implement device filter
+
+    cmd << "-output"
+    cmd << @logfile
+
+    raise NotImplementedError if @verbose
 
     cmd
   end
 
   private
   def initialize
-    @devices           = []
-    @all_devices       = false
     @interval          = 1.0 # in second
     @interval_backoff  = true
     @start_delay       = 0.0 # in second
     @timeout           = nil # in second, or nil (= no timeout)
     @verbose           = false
-    @report_cpu        = false
-    @report_io         = false
-    @report_ctx_switch = false
-    @logfile           = STDOUT
+    @no_cpu            = false
+    @no_disk           = false
+    @devices           = []
+    @logfile           = "perfmonger.pgr"
 
     @parser = OptionParser.new
 
-    @parser.on('-d', '--device DEVICE',
+    @parser.on('-d', '--disk DEVICE',
                'Device name to be monitored (e.g. sda, sdb, md0, dm-1).') do |device|
       @devices.push(device)
-      @report_io = true
-    end
-
-    @parser.on('-D', '--all-devices',
-               'Monitor all block devices.') do
-      @all_devices = true
-      @report_io = true
+      @no_disk = false
     end
 
     @parser.on('-i', '--interval SEC',
@@ -127,12 +112,8 @@ class RecordOption
       @timeout = Float(timeout)
     end
 
-    @parser.on('-C', '--cpu', 'Report CPU usage.') do
-      @report_cpu = true
-    end
-
-    @parser.on('-S', '--context-switch', 'Report context switches per sec.') do
-      @report_ctx_switch = true
+    @parser.on('--no-cpu', 'Suppress recording CPU usage.') do
+      @no_cpu = true
     end
 
     @parser.on('-l', '--logfile FILE') do |file|

data/lib/perfmonger/command/server.rb

@@ -70,12 +70,12 @@ EOS
       @hostname = hostname
     end
 
-    @parser.on('--http-hostname NAME',
+    @parser.on('--http-host NAME',
                "Host name for HTTP server URL. If not specified, value of '--hostname' option is used.") do |hostname|
       @http_hostname = hostname
     end
 
-    @parser.on('--http-port PORT', 'HTTP server port to listen.') do |port|
+    @parser.on('--port PORT', 'HTTP server port to listen.') do |port|
       if ! port =~ /\A\d+\Z/
         puts("ERROR: invalid port number value: #{port}")
         puts(@parser.help)
@@ -84,6 +84,11 @@ EOS
       @http_port = port.to_i
     end
 
+    @parser.on('-h', '--help', 'Show this help.') do
+      puts @parser.help
+      exit(false)
+    end
+
     # @parser.on('--tcp-port PORT', 'TCP data server port to listen.') do |port|
     #   if ! port =~ /\A\d+\Z/
     #     puts("ERROR: invalid port number value: #{port}")

data/lib/perfmonger/command/stat.rb

@@ -43,15 +43,15 @@ class StatCommand < BaseCommand
           system(*@argv)
         end
       end
+
       Process.wait(command_pid)
+
     ensure
       @end_time = Time.now
       Process.kill(:INT, record_pid)
       Process.wait(record_pid)
     end
 
-    puts("")
-    printf("Execution time: %.4f\n", @end_time - @start_time)
     summary_command = SummaryCommand.new.run([@option.logfile], @argv.join(" "))
   end
 end

data/lib/perfmonger/command/stat_option.rb

@@ -16,7 +16,7 @@ Run a command and gather performance information during its execution.
 Options:
 EOS
 
-    @logfile = './perfmonger.log'
+    @logfile = './perfmonger.pgr'
     @json = false
 
     @parser.on('--json', "Output summary in JSON") do