perfmonger 0.11.1 → 0.13.1

data/core/subsystem/stat_test.go

@@ -262,6 +262,14 @@ func TestNewNetStat(t *testing.T) {
 	}
 }
 
+func TestNewMemStat(t *testing.T) {
+	memstat := NewMemStat()
+
+	if memstat == nil {
+		t.Error("failed to create MemStat")
+	}
+}
+
 func TestNewStatRecord(t *testing.T) {
 	stat_record := NewStatRecord()
 
@@ -278,4 +286,5 @@ func TestNewStatRecord(t *testing.T) {
 	checkFieldIsNil("Disk")
 	checkFieldIsNil("Softirq")
 	checkFieldIsNil("Net")
+	checkFieldIsNil("Mem")
 }

data/core/subsystem/usage.go

@@ -85,6 +85,10 @@ type NetUsageEntry struct {
 
 type NetUsage map[string]*NetUsageEntry
 
+type MemUsage struct {
+	mem *MemStat
+}
+
 var UseColor = false
 
 func SetUseColor(use_color bool) {
@@ -562,6 +566,82 @@ func (nusage *NetUsage) WriteJsonTo(printer *projson.JsonPrinter) {
 	printer.FinishObject()
 }
 
+func GetMemUsage(mem *MemStat) (*MemUsage, error) {
+	if mem == nil {
+		return nil, errors.New("invalid memstat")
+	}
+
+	musage := new(MemUsage)
+	musage.mem = mem
+
+	return musage, nil
+}
+
+func (musage *MemUsage) WriteJsonTo(printer *projson.JsonPrinter) {
+	printer.BeginObject()
+
+	printer.PutKey("mem_total")
+	printer.PutInt64(musage.mem.MemTotal)
+	printer.PutKey("mem_used")
+	printer.PutInt64(musage.mem.MemTotal - musage.mem.MemFree - musage.mem.Buffers - musage.mem.Cached - musage.mem.SReclaimable)
+	printer.PutKey("mem_free")
+	printer.PutInt64(musage.mem.MemFree)
+	printer.PutKey("buffers")
+	printer.PutInt64(musage.mem.Buffers)
+	printer.PutKey("cached")
+	printer.PutInt64(musage.mem.Cached)
+	printer.PutKey("swap_cached")
+	printer.PutInt64(musage.mem.SwapCached)
+	printer.PutKey("active")
+	printer.PutInt64(musage.mem.Active)
+	printer.PutKey("inactive")
+	printer.PutInt64(musage.mem.Inactive)
+	printer.PutKey("swap_total")
+	printer.PutInt64(musage.mem.SwapTotal)
+	printer.PutKey("swap_free")
+	printer.PutInt64(musage.mem.SwapFree)
+	printer.PutKey("dirty")
+	printer.PutInt64(musage.mem.Dirty)
+	printer.PutKey("writeback")
+	printer.PutInt64(musage.mem.Writeback)
+	printer.PutKey("anon_pages")
+	printer.PutInt64(musage.mem.AnonPages)
+	printer.PutKey("mapped")
+	printer.PutInt64(musage.mem.Mapped)
+	printer.PutKey("shmem")
+	printer.PutInt64(musage.mem.Shmem)
+	printer.PutKey("slab")
+	printer.PutInt64(musage.mem.Slab)
+	printer.PutKey("s_reclaimable")
+	printer.PutInt64(musage.mem.SReclaimable)
+	printer.PutKey("s_unreclaim")
+	printer.PutInt64(musage.mem.SUnreclaim)
+	printer.PutKey("kernel_stack")
+	printer.PutInt64(musage.mem.KernelStack)
+	printer.PutKey("page_tables")
+	printer.PutInt64(musage.mem.PageTables)
+	printer.PutKey("nfs_unstable")
+	printer.PutInt64(musage.mem.NFS_Unstable)
+	printer.PutKey("bounce")
+	printer.PutInt64(musage.mem.Bounce)
+	printer.PutKey("commit_limit")
+	printer.PutInt64(musage.mem.CommitLimit)
+	printer.PutKey("committed_as")
+	printer.PutInt64(musage.mem.Committed_AS)
+	printer.PutKey("anon_huge_pages")
+	printer.PutInt64(musage.mem.AnonHugePages)
+	printer.PutKey("huge_pages_total")
+	printer.PutInt64(musage.mem.HugePages_Total)
+	printer.PutKey("huge_pages_free")
+	printer.PutInt64(musage.mem.HugePages_Free)
+	printer.PutKey("huge_pages_rsvd")
+	printer.PutInt64(musage.mem.HugePages_Rsvd)
+	printer.PutKey("huge_pages_surp")
+	printer.PutInt64(musage.mem.HugePages_Surp)
+
+	printer.FinishObject()
+}
+
 func (entry *NetUsageEntry) WriteJsonTo(printer *projson.JsonPrinter) {
 	printer.BeginObject()
 

data/core/utils.go

@@ -1,4 +1,4 @@
-package main
+package core
 
 import (
 	"bufio"
@@ -6,7 +6,7 @@ import (
 	"io"
 )
 
-func newPerfmongerLogReader(source io.Reader) io.Reader {
+func NewPerfmongerLogReader(source io.Reader) io.Reader {
 	var ret io.Reader
 	reader := bufio.NewReader(source)
 

data/lib/perfmonger/command/play.rb

@@ -26,6 +26,10 @@ EOS
       @pretty = true
     end
 
+    @disk_only_regex = nil
+    @parser.on('--disk-only REGEX', "Select disk devices that matches REGEX (Ex. 'sd[b-d]')") do |regex|
+      @disk_only_regex = regex
+    end
   end
 
   def parse_args(argv)
@@ -62,6 +66,12 @@ EOS
     if @pretty
       cmd << "-pretty"
     end
+
+    if @disk_only_regex
+      cmd << "-disk-only"
+      cmd << @disk_only_regex
+    end
+
     cmd << @logfile
 
     Process.exec(*cmd)

data/lib/perfmonger/command/plot.rb

@@ -30,6 +30,7 @@ EOS
     @disk_plot_write = true
     @disk_numkey_threshold = 10
     @plot_iops_max = nil
+    @gnuplot_bin = `which gnuplot`
   end
 
   def parse_args(argv)
@@ -47,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}")
@@ -119,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")
@@ -159,6 +165,8 @@ EOS
     plot_disk(meta)
     plot_cpu(meta)
 
+    FileUtils.rm_rf(@tmpdir)
+
     true
   end
 

data/lib/perfmonger/command/record.rb

@@ -31,7 +31,8 @@ class RecordCommand < BaseCommand
     if @option.kill
       unless session_pid
         # There is nothing to be killed
-        return true
+        $stderr.puts("[ERROR] No perfmonger record session is running.")
+        return false
       end
 
       begin
@@ -44,12 +45,32 @@ class RecordCommand < BaseCommand
           f.flock(File::LOCK_UN)
         end
       end
+
+      # wait until the process surely exits
+      sleeptime = 0.05
+      try = 0
+      while true
+        begin
+          Process.kill(:INT, session_pid)
+        rescue Errno::ESRCH
+          # no such process
+          break
+        end
+        sleep(sleeptime)
+        sleeptime *= 2
+        try += 1
+        if try >= 5
+          $stderr.puts("[ERROR] Cannot stop perfmonger record session correctly. PID=#{session_pid}")
+          return false
+        end
+      end
+
       return true
     end
 
     if @option.status
       unless session_pid
-        puts "[ERROR] No perfmonger-recorder is running."
+        puts "[ERROR] No perfmonger record session is running."
         return false
       end
 

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/version.rb

@@ -1,3 +1,3 @@
 module PerfMonger
-  VERSION = "0.11.1"
+  VERSION = "0.13.1"
 end

data/misc/werker-box/Dockerfile

@@ -1,35 +1,34 @@
-FROM golang:1.8
+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
+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 curl -sSL https://get.rvm.io | bash -s stable
+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 1.9.3"
-RUN bash -l -c "rvm use 1.9.3 && gem install bundler && bundle"
+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.0.0"
-RUN bash -l -c "rvm use 2.0.0 && 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.1.10"
-RUN bash -l -c "rvm use 2.1.10 && 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.2.5"
-RUN bash -l -c "rvm use 2.2.5 && gem install bundler && bundle"
-
-RUN bash -l -c "rvm install 2.3.1"
-RUN bash -l -c "rvm use 2.3.1 && gem install bundler && bundle"
-
-RUN bash -l -c "rvm install 2.4.0"
-RUN bash -l -c "rvm use 2.4.0 && 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

data/misc/werker-box/build-push.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 docker build -t go-rvm .
-docker tag go-rvm hayamiz/go-rvm:wercker-env
-docker push hayamiz/go-rvm:wercker-env
+docker tag go-rvm hayamiz/go-rvm:wercker-env-0.11.2
+docker push hayamiz/go-rvm:wercker-env-0.11.2

data/wercker.yml

@@ -1,4 +1,4 @@
-box: hayamiz/go-rvm:wercker-env
+box: hayamiz/go-rvm:wercker-env-0.11.2
 # Build definition
 build:
     # The steps that will be executed on build
@@ -6,35 +6,17 @@ build:
     # http://devcenter.wercker.com/articles/languages/ruby.html
     steps:
         - script:
-            name: switch ruby to 1.9.3
+            name: prepare perfmonger go subsystem
             code: |
               source /etc/profile.d/rvm.sh
-              rvm use 1.9.3
-        - bundle-install
-        - script:
-            name: run rspec
-            code: |
-              bundle exec rake clean
-              bundle exec rake go_get
-              bundle exec rake spec
+              rvm use 2.4.9
+              rake go_get
 
         - script:
-            name: switch ruby to 2.0.0
-            code: |
-              source /etc/profile.d/rvm.sh
-              rvm use 2.0.0
-        - bundle-install
-        - script:
-            name: run rspec
-            code: |
-              bundle exec rake clean
-              bundle exec rake spec
-        - script:
-            name: switch ruby to 2.1.10
+            name: switch ruby to 2.4.9
             code: |
-
               source /etc/profile.d/rvm.sh
-              rvm use 2.1.10
+              rvm use 2.4.9
         - bundle-install
         - script:
             name: run rspec
@@ -43,10 +25,10 @@ build:
               bundle exec rake spec
 
         - script:
-            name: switch ruby to 2.2.5
+            name: switch ruby to 2.5.7
             code: |
               source /etc/profile.d/rvm.sh
-              rvm use 2.2.5
+              rvm use 2.5.7
         - bundle-install
         - script:
             name: run rspec
@@ -55,10 +37,10 @@ build:
               bundle exec rake spec
 
         - script:
-            name: switch ruby to 2.3.1
+            name: switch ruby to 2.6.5
             code: |
               source /etc/profile.d/rvm.sh
-              rvm use 2.3.1
+              rvm use 2.6.5
         - bundle-install
         - script:
             name: run rspec
@@ -67,10 +49,10 @@ build:
               bundle exec rake spec
 
         - script:
-            name: switch ruby to 2.4.0
+            name: switch ruby to 2.7.0
             code: |
               source /etc/profile.d/rvm.sh
-              rvm use 2.4.0
+              rvm use 2.7.0
         - bundle-install
         - script:
             name: run rspec