perfmonger 0.10.1 → 0.12.0

data/core/subsystem/usage_test.go

@@ -1,7 +1,6 @@
 package subsystem
 
 import (
-	"bytes"
 	"encoding/json"
 	"math"
 	"regexp"
@@ -9,6 +8,8 @@ import (
 	"strings"
 	"testing"
 	"time"
+
+	projson "github.com/hayamiz/go-projson"
 )
 
 func isValidJson(byt []byte) bool {
@@ -89,7 +90,7 @@ func TestGetCoreUsage(t *testing.T) {
 		usage.Steal == 0 &&
 		usage.Guest == 0 &&
 		usage.GuestNice == 0) {
-		t.Error("usage is not 0%, want 0%")
+		t.Error("usage is not 0 percent, want 0 percent")
 	}
 
 	// should return error if c1.Uptime() is larger than c2.Uptime()
@@ -120,10 +121,14 @@ func TestGetCoreUsage(t *testing.T) {
 		t.Errorf("usage.Sys = %v, want 25.0", usage.User)
 	}
 
-	buf := bytes.NewBuffer([]byte{})
-	usage.WriteJsonTo(buf)
-	if !isValidJson(buf.Bytes()) {
-		t.Errorf("Invalid JSON: %s", buf.String())
+	printer := projson.NewPrinter()
+	usage.WriteJsonTo(printer)
+	if str, err := printer.String(); err != nil {
+		t.Errorf("failed to print JSON")
+	} else {
+		if !isValidJson([]byte(str)) {
+			t.Errorf("Invalid JSON: %s", str)
+		}
 	}
 }
 
@@ -207,15 +212,20 @@ func TestGetCpuUsage(t *testing.T) {
 		t.Errorf("usage.Sys = %v, want 25.0", usage.CoreUsages[1].User)
 	}
 
-	buf := bytes.NewBuffer([]byte{})
-	usage.WriteJsonTo(buf)
-	if !isValidJson(buf.Bytes()) {
-		t.Errorf("Invalid JSON: %s", buf.String())
+	printer := projson.NewPrinter()
+	usage.WriteJsonTo(printer)
+	str, err := printer.String()
+	if err != nil {
+		t.Errorf("failed printing JSON")
+	} else {
+		if !isValidJson([]byte(str)) {
+			t.Errorf("Invalid JSON: %s", str)
+		}
 	}
 
 	assertHasKey := func(key_path string) {
-		if !jsonHasKey(buf.Bytes(), key_path) {
-			t.Errorf("%v is not present in JSON:\n%v", key_path, buf.String())
+		if !jsonHasKey([]byte(str), key_path) {
+			t.Errorf("%v is not present in JSON:\n%v", key_path, str)
 		}
 	}
 	assertHasKey("num_core")
@@ -291,10 +301,15 @@ func TestDiskUsage(t *testing.T) {
 		t.Errorf("sda.RdSectors = %v, want %v", (*usage)["sda"].RdSectors, 350)
 	}
 
-	buf := bytes.NewBuffer([]byte{})
-	usage.WriteJsonTo(buf)
-	if !isValidJson(buf.Bytes()) {
-		t.Errorf("invalid json: %s", buf.String())
+	printer := projson.NewPrinter()
+	usage.WriteJsonTo(printer)
+	str, err := printer.String()
+	if err != nil {
+		t.Errorf("failed printing JSON")
+	} else {
+		if !isValidJson([]byte(str)) {
+			t.Errorf("invalid json: %s", str)
+		}
 	}
 
 	d1.Entries = append(d1.Entries, NewDiskStatEntry())
@@ -347,15 +362,20 @@ func TestDiskUsage(t *testing.T) {
 		t.Errorf("total.RdSectors = %v, want %v", (*usage)["total"].RdSectors, 350)
 	}
 
-	buf = bytes.NewBuffer([]byte{})
-	usage.WriteJsonTo(buf)
-	if !isValidJson(buf.Bytes()) {
-		t.Errorf("invalid json: %s", buf.String())
+	printer = projson.NewPrinter()
+	usage.WriteJsonTo(printer)
+	str, err = printer.String()
+	if err != nil {
+		t.Errorf("failed printing JSON")
+	} else {
+		if !isValidJson([]byte(str)) {
+			t.Errorf("invalid json: %s", str)
+		}
 	}
 
 	assertHasKey := func(key_path string) {
-		if !jsonHasKey(buf.Bytes(), key_path) {
-			t.Errorf("%v is not present in JSON:\n%v", key_path, buf.String())
+		if !jsonHasKey([]byte(str), key_path) {
+			t.Errorf("%v is not present in JSON:\n%v", key_path, str)
 		}
 	}
 	assertHasKey("devices")
@@ -428,10 +448,15 @@ func TestGetNetUsage(t *testing.T) {
 		t.Errorf("lo.RxPacketsPerSec = %v, want %v", (*usage)["lo"].RxPacketsPerSec, 100.0/interval)
 	}
 
-	buf := bytes.NewBuffer([]byte{})
-	usage.WriteJsonTo(buf)
-	if !isValidJson(buf.Bytes()) {
-		t.Errorf("invalid json: %s", buf.String())
+	printer := projson.NewPrinter()
+	usage.WriteJsonTo(printer)
+	str, err := printer.String()
+	if err != nil {
+		t.Errorf("failed printing JSON")
+	} else {
+		if !isValidJson([]byte(str)) {
+			t.Errorf("invalid json: %s", str)
+		}
 	}
 
 	n1.Entries = append(n1.Entries, NewNetStatEntry())
@@ -483,15 +508,20 @@ func TestGetNetUsage(t *testing.T) {
 			(100.0+150.0)/interval)
 	}
 
-	buf = bytes.NewBuffer([]byte{})
-	usage.WriteJsonTo(buf)
-	if !isValidJson(buf.Bytes()) {
-		t.Errorf("invalid json: %s", buf.String())
+	printer = projson.NewPrinter()
+	usage.WriteJsonTo(printer)
+	str, err = printer.String()
+	if err != nil {
+		t.Errorf("failed printing JSON")
+	} else {
+		if !isValidJson([]byte(str)) {
+			t.Errorf("invalid json: %s", str)
+		}
 	}
 
 	assertHasKey := func(key_path string) {
-		if !jsonHasKey(buf.Bytes(), key_path) {
-			t.Errorf("%v is not present in JSON:\n%v", key_path, buf.String())
+		if !jsonHasKey([]byte(str), key_path) {
+			t.Errorf("%v is not present in JSON:\n%v", key_path, str)
 		}
 	}
 	assertHasKey("devices")

data/lib/perfmonger/command/fingerprint.rb

@@ -57,6 +57,10 @@ EOS
         save_proc_info()
       end
 
+      do_with_message("Saving numactl info") do
+        save_numactl_info()
+      end
+
       do_with_message("Saving IRQ info") do
         save_irq_info()
       end
@@ -109,9 +113,14 @@ EOS
         save_nvme_info()
       end
 
-
       ## Collect vendor specific info
 
+      # https://aws.amazon.com/jp/code/ec2-instance-metadata-query-tool/
+      if find_executable("ec2-metadata")
+        do_with_message("Saving EC2 metadata info") do
+          save_ec2metadata_info()
+        end
+      end
 
       # LSI MegaRAID
       megacli_bin = "/opt/MegaRAID/MegaCli/MegaCli64"
@@ -241,6 +250,22 @@ EOS
     end
   end
 
+  def save_numactl_info()
+    numactl_bin = find_executable("numactl")
+
+    File.open("#{@output_dir}/numactl.log", "w") do |f|
+      f.puts(`#{numactl_bin} --hardware`)
+    end
+  end
+
+  def save_ec2metadata_info()
+    ec2metadata_bin = find_executable("ec2-metadata")
+
+    File.open("#{@output_dir}/ec2-metadata.log", "w") do |f|
+      f.puts(`#{ec2metadata_bin} --all`)
+    end
+  end
+
   def save_lsblk_info()
     lsblk_bin = find_executable("lsblk")
 

data/lib/perfmonger/command/live.rb

@@ -7,10 +7,29 @@ module PerfMonger
 module Command
 
 class LiveOption < RecordOption
+  def initialize
+    super
+
+    @color = false
+    @parser.on("-c", "--color", "Use colored JSON output") do
+      @color = true
+    end
+
+    @pretty
+    @parser.on("--pretty",  "Use human readable JSON output") do
+      @pretty = true
+    end
+
+  end
+
   def make_command
     cmd = super()
     @player_bin = ::PerfMonger::Command::CoreFinder.player()
     cmd += ["-player-bin", @player_bin]
+    cmd << "-color" if @color
+    cmd << "-pretty" if @pretty
+
+    cmd
   end
 end
 

data/lib/perfmonger/command/play.rb

@@ -16,6 +16,16 @@ Usage: perfmonger play [options] LOG_FILE
 Options:
 EOS
 
+    @color = false
+    @parser.on("-c", "--color", "Use colored JSON ouptut") do
+      @color = true
+    end
+
+    @pretty = false
+    @parser.on("-p", "--pretty", "Use human readable JSON ouptut") do
+      @pretty = true
+    end
+
   end
 
   def parse_args(argv)
@@ -46,6 +56,12 @@ EOS
     end
 
     cmd = [@player_bin]
+    if @color
+      cmd << "-color"
+    end
+    if @pretty
+      cmd << "-pretty"
+    end
     cmd << @logfile
 
     Process.exec(*cmd)

data/lib/perfmonger/command/plot.rb

@@ -24,11 +24,13 @@ EOS
     @output_type = 'pdf'
     @output_prefix = ''
     @save_gpfiles = false
+    @disk_only = nil
     @disk_only_regex = nil
     @disk_plot_read = true
     @disk_plot_write = true
     @disk_numkey_threshold = 10
     @plot_iops_max = nil
+    @gnuplot_bin = `which gnuplot`
   end
 
   def parse_args(argv)
@@ -46,6 +48,10 @@ EOS
       @output_dir = dir
     end
 
+    @parser.on('--with-gnuplot GNUPLOT_BIN') do |gnuplot_bin|
+      @gnuplot_bin = gnuplot_bin
+    end
+
     @parser.on('-T', '--output-type TYPE', 'Available: pdf, png') do |typ|
       unless ['pdf', 'png'].include?(typ)
         puts("ERROR: non supported image type: #{typ}")
@@ -78,6 +84,7 @@ EOS
     end
 
     @parser.on('--disk-only REGEX', "Select disk devices that matches REGEX") do |regex|
+      @disk_only = regex
       @disk_only_regex = Regexp.compile(regex)
     end
 
@@ -117,13 +124,14 @@ EOS
   end
 
   def run(argv)
-    parse_args(argv)
     unless system('which gnuplot >/dev/null 2>&1')
       puts("ERROR: gnuplot not found")
       puts(@parser.help)
       exit(false)
     end
 
+    parse_args(argv)
+
     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")
@@ -139,7 +147,13 @@ EOS
     @cpu_dat = File.expand_path("cpu.dat", @tmpdir)
 
     meta_json = nil
-    IO.popen([formatter_bin, "-perfmonger", @data_file, "-cpufile", @cpu_dat, "-diskfile", @disk_dat], "r") do |io|
+    cmd = [formatter_bin, "-perfmonger", @data_file, "-cpufile", @cpu_dat,
+      "-diskfile", @disk_dat]
+    if @disk_only_regex
+      cmd << "-disk-only"
+      cmd << @disk_only
+    end
+    IO.popen(cmd, "r") do |io|
       meta_json = io.read
     end
     if $?.exitstatus != 0
@@ -151,6 +165,8 @@ EOS
     plot_disk(meta)
     plot_cpu(meta)
 
+    FileUtils.rm_rf(@tmpdir)
+
     true
   end
 
@@ -389,10 +405,10 @@ EOS
       nr_cols = nr_cpu_factors.select do |x|
         x <= Math.sqrt(nr_cpu)
       end.max
-      nr_cols ||= Math.sqrt(nr_cpu).ceil
+      nr_cols = 1
       nr_rows = nr_cpu / nr_cols
 
-      plot_height = 8
+      plot_height = ([nr_cpu, 8].min) + ([nr_cpu - 8, 0].max) * 0.5
 
       if nr_rows == 1
         plot_height /= 2.0
@@ -422,14 +438,14 @@ EOS
         end
 
         all_gpfile.puts <<EOS
-set title 'cpu #{cpu_idx}' offset 0.0,-0.7 font 'Arial,16'
+set title 'cpu #{cpu_idx}' offset -61,-3 font 'Arial,16'
 unset key
 set origin #{xpos}, #{ypos}
 set size #{1.0/nr_cols}, #{(1.0 - legend_height)/nr_rows}
-set rmargin 0.5
-set lmargin 3.5
-set tmargin 1.3
-set bmargin 1.3
+set rmargin 2
+set lmargin 12
+set tmargin 0.5
+set bmargin 0.5
 set xtics offset 0.0,0.5
 set ytics offset 0.5,0
 set style fill noborder

data/lib/perfmonger/command/record.rb

@@ -19,7 +19,7 @@ class RecordCommand < BaseCommand
   def run(argv)
     @argv, @option = PerfMonger::Command::RecordOption.parse(argv)
 
-    session_file = File.expand_path(sprintf("perfmonger-%s-session.pid", Etc.getlogin),
+    session_file = File.expand_path(sprintf("perfmonger-%s-session.pid", Etc.getpwuid.name),
                                     Dir.tmpdir)
     begin
       session_pid = File.read(session_file).to_i

data/lib/perfmonger/command/record_option.rb

@@ -63,6 +63,12 @@ class RecordOption
     if @no_intr
       cmd << "-no-intr"
     end
+    if @no_net
+      cmd << "-no-net"
+    end
+    if @no_mem
+      cmd << "-no-mem"
+    end
     if @devices.size > 0
       cmd << "-disks"
       cmd << @devices.join(",")
@@ -98,6 +104,8 @@ class RecordOption
     @no_cpu            = false
     @no_disk           = false
     @no_intr           = true
+    @no_net            = true
+    @no_mem            = false
     @devices           = []
     @logfile           = "perfmonger.pgr"
     @logfile_set       = false
@@ -141,6 +149,14 @@ class RecordOption
       @no_cpu = true
     end
 
+    @parser.on('--no-net', 'Suppress recording network usage') do
+      @no_net = false
+    end
+
+    @parser.on('--no-mem', 'Suppress recording memory usage') do
+      @no_mem = true
+    end
+
     @parser.on('-l', '--logfile FILE') do |file|
       @logfile = file
       @logfile_set = true

data/lib/perfmonger/command/server.rb

@@ -114,7 +114,7 @@ EOS
     _, record_option = PerfMonger::Command::RecordOption.parse(@record_cmd_args)
 
     # find perfmonger command
-    perfmonger_bin = File.expand_path('bin/perfmonger', PerfMonger::ROOTDIR)
+    perfmonger_bin = File.expand_path('exe/perfmonger', PerfMonger::ROOTDIR)
     if ! File.executable?(perfmonger_bin)
       puts("ERROR: perfmonger not found!")
       exit(false)

data/lib/perfmonger/version.rb

@@ -1,3 +1,3 @@
 module PerfMonger
-  VERSION = "0.10.1"
+  VERSION = "0.12.0"
 end

data/misc/werker-box/Dockerfile

@@ -0,0 +1,34 @@
+FROM golang:1.14
+
+WORKDIR /app
+
+## install packages
+RUN apt-get update
+RUN apt-get install -y build-essential libncurses-dev libreadline-dev libssl-dev gnuplot git gnupg2
+RUN apt-get install -y autoconf bison build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm-dev gawk libsqlite3-dev libtool sqlite3 libgmp-dev # ruby build dep
+
+## get source code
+RUN git clone https://github.com/hayamiz/perfmonger .
+
+## install RVM
+RUN gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB
+RUN curl -O https://raw.githubusercontent.com/rvm/rvm/master/binscripts/rvm-installer
+RUN curl -O https://raw.githubusercontent.com/rvm/rvm/master/binscripts/rvm-installer.asc
+RUN gpg --verify rvm-installer.asc
+RUN bash rvm-installer stable
+RUN ln -sf /bin/bash /bin/sh
+
+## install ruby
+RUN bash -l -c "rvm install 2.4.9"
+RUN bash -l -c "rvm use 2.4.9 && gem install bundler && bundle"
+
+RUN bash -l -c "rvm install 2.5.7"
+RUN bash -l -c "rvm use 2.5.7 && gem install bundler && bundle"
+
+RUN bash -l -c "rvm install 2.6.5"
+RUN bash -l -c "rvm use 2.6.5 && gem install bundler && bundle"
+
+RUN bash -l -c "rvm install 2.7.0"
+RUN bash -l -c "rvm use 2.7.0 && gem install bundler && bundle"
+
+CMD true