perfmonger 0.12.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d54380ef057091f9d6829d3a792c0c4a91789b56077ff7a59b4a1bf063ec883e
-  data.tar.gz: c01127d30de0978a88bf1481357d3e20cde8193dd16e6bde9e0f2030d6423710
+  metadata.gz: 42856e6da789b3ad1a522b95bc642bdf7abe1e2fb7679e4839b7da7e3157b6a9
+  data.tar.gz: 937b2f2557ad06fe36e230c623ab07773d17bc1dd278e80b87bb8fb881a9427c
 SHA512:
-  metadata.gz: 8ae9ded1f5d4c5157902ccfa23a12910866834480f7b82e1464f4c2d5e767cbf2d5752118f1aa666f445d2f61a0e5cfbc7198c3ad9cf098539c0cd96a25b12f3
-  data.tar.gz: 3c507d05cec5b3b28e49367379846009b1848ac75d23227d22a019203190b9adeaf201a25805b3746d518d221a46399580d49899f6205f236980c70b3b73a7e5
+  metadata.gz: 4f06a76145f4f4aafd9f4fa8e2de7ef855190729d25b98a6ab36a8bcbcb1ee41242736e96b3c15693ffeb341ee229f3852f00f36b27785b84124e587fdcfad41
+  data.tar.gz: 86b957bb0edbf89f0cb7904b0059d75db11366eb26ca1b1112cd4c7566aa896240dc430d4d56a177c00c4862ebbf677f73f3447bda9e798226d7fcbf60836408

data/NEWS

@@ -1,4 +1,28 @@
-## 20XX-XX-XX: PerfMonger 0.13.0
+## 2021-XX-XX: PerfMonger 0.15.0
+
+## 2021-12-01: PerfMonger 0.14.1
+  * Changes
+    * [plot] subcommand:
+      * Skip plotting memory usage if it is not recorded
+
+## 2021-07-27: PerfMonger 0.14.0
+  * New features
+    * [plot] subcommand:
+      * Added memory usage plot
+  * Changes
+    * [record] subcommand:
+      * Additionaly record 'Hugepagesize' in memory usage
+
+## 2021-07-26: PerfMonger 0.13.1
+  * New features
+    * [play] subcommand:
+      * Added --disk-only option to filter results of not interesting disks
+  * Note: v0.13.0 is yanked from rubygems.org
+
+## 2021-07-08: PerfMonger 0.12.1
+  * Bug fixes
+    * [record] subcommand:
+      * --kill waits until a recorder process surely exits
 
 ## 2021-05-10: PerfMonger 0.12.0
   * New features

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rspec/core/rake_task'
 require "bundler/gem_tasks"
 
-task :default => [:spec, :test_core]
+task :default => [:spec, :test_core, :analyze_core]
 
 desc "Run all specs in spec directory"
 RSpec::Core::RakeTask.new(:spec)
@@ -30,19 +30,30 @@ task :go_get do
   sh "go get -u github.com/jroimartin/gocui"
 end
 
-desc "Run tests of core recorder/player"
+desc "Run tests of golang core library"
 task :test_core => [:cross_build_core] do
   Dir.chdir("./core/subsystem") do
+    # check coverage
     sh "go test -v -cover"
-
-    # running static analysis
-    sh "go vet *.go"
   end
+end
 
-  Dir.chdir("./core") do
-    sh "go vet *.go"
+desc "Run static-analysis of golang core library"
+task :analyze_core => [:cross_build_core] do
+  # running static analysis
+  Dir.chdir("./core/subsystem") do
+    ["linux", "darwin"].each do |platform|
+      puts "* ./core/subsystem"
+      sh "go vet perfmonger_#{platform}.go $(ls *.go | grep -v perfmonger_)"
+    end
   end
 
+  Dir["./core", "./core/cmd/*"].each do |dir|
+    Dir.chdir(dir) do
+      puts "* #{dir}"
+      sh "go vet *.go"
+    end
+  end
 end
 
 desc "Removed generated files"

data/core/Makefile

@@ -2,51 +2,50 @@
 # generated by build.sh
 
 GO_DEPS := subsystem/perfmonger_darwin.go subsystem/perfmonger.go subsystem/perfmonger_linux.go subsystem/perfmonger_linux_test.go subsystem/stat.go subsystem/stat_test.go subsystem/usage.go subsystem/usage_test.go utils.go
-GO_SRC := utils.go
 
 .PHONY: all build clean
 
 all: build
 
 
-../lib/exec/perfmonger-recorder_linux_amd64: perfmonger-recorder.go $(GO_DEPS)
-	go build -o $@ perfmonger-recorder.go $(GO_SRC)
+../lib/exec/perfmonger-recorder_linux_amd64: cmd/perfmonger-recorder/perfmonger-recorder.go $(GO_DEPS)
+	cd cmd/perfmonger-recorder && go build -o ../../$@ perfmonger-recorder.go
 
 
-../lib/exec/perfmonger-player_linux_amd64: perfmonger-player.go $(GO_DEPS)
-	go build -o $@ perfmonger-player.go $(GO_SRC)
+../lib/exec/perfmonger-player_linux_amd64: cmd/perfmonger-player/perfmonger-player.go $(GO_DEPS)
+	cd cmd/perfmonger-player && go build -o ../../$@ perfmonger-player.go
 
 
-../lib/exec/perfmonger-viewer_linux_amd64: perfmonger-viewer.go $(GO_DEPS)
-	go build -o $@ perfmonger-viewer.go $(GO_SRC)
+../lib/exec/perfmonger-viewer_linux_amd64: cmd/perfmonger-viewer/perfmonger-viewer.go $(GO_DEPS)
+	cd cmd/perfmonger-viewer && go build -o ../../$@ perfmonger-viewer.go
 
 
-../lib/exec/perfmonger-summarizer_linux_amd64: perfmonger-summarizer.go $(GO_DEPS)
-	go build -o $@ perfmonger-summarizer.go $(GO_SRC)
+../lib/exec/perfmonger-summarizer_linux_amd64: cmd/perfmonger-summarizer/perfmonger-summarizer.go $(GO_DEPS)
+	cd cmd/perfmonger-summarizer && go build -o ../../$@ perfmonger-summarizer.go
 
 
-../lib/exec/perfmonger-plot-formatter_linux_amd64: perfmonger-plot-formatter.go $(GO_DEPS)
-	go build -o $@ perfmonger-plot-formatter.go $(GO_SRC)
+../lib/exec/perfmonger-plot-formatter_linux_amd64: cmd/perfmonger-plot-formatter/perfmonger-plot-formatter.go $(GO_DEPS)
+	cd cmd/perfmonger-plot-formatter && go build -o ../../$@ perfmonger-plot-formatter.go
 
 
-../lib/exec/perfmonger-recorder_darwin_amd64: perfmonger-recorder.go $(GO_DEPS)
-	go build -o $@ perfmonger-recorder.go $(GO_SRC)
+../lib/exec/perfmonger-recorder_darwin_amd64: cmd/perfmonger-recorder/perfmonger-recorder.go $(GO_DEPS)
+	cd cmd/perfmonger-recorder && go build -o ../../$@ perfmonger-recorder.go
 
 
-../lib/exec/perfmonger-player_darwin_amd64: perfmonger-player.go $(GO_DEPS)
-	go build -o $@ perfmonger-player.go $(GO_SRC)
+../lib/exec/perfmonger-player_darwin_amd64: cmd/perfmonger-player/perfmonger-player.go $(GO_DEPS)
+	cd cmd/perfmonger-player && go build -o ../../$@ perfmonger-player.go
 
 
-../lib/exec/perfmonger-viewer_darwin_amd64: perfmonger-viewer.go $(GO_DEPS)
-	go build -o $@ perfmonger-viewer.go $(GO_SRC)
+../lib/exec/perfmonger-viewer_darwin_amd64: cmd/perfmonger-viewer/perfmonger-viewer.go $(GO_DEPS)
+	cd cmd/perfmonger-viewer && go build -o ../../$@ perfmonger-viewer.go
 
 
-../lib/exec/perfmonger-summarizer_darwin_amd64: perfmonger-summarizer.go $(GO_DEPS)
-	go build -o $@ perfmonger-summarizer.go $(GO_SRC)
+../lib/exec/perfmonger-summarizer_darwin_amd64: cmd/perfmonger-summarizer/perfmonger-summarizer.go $(GO_DEPS)
+	cd cmd/perfmonger-summarizer && go build -o ../../$@ perfmonger-summarizer.go
 
 
-../lib/exec/perfmonger-plot-formatter_darwin_amd64: perfmonger-plot-formatter.go $(GO_DEPS)
-	go build -o $@ perfmonger-plot-formatter.go $(GO_SRC)
+../lib/exec/perfmonger-plot-formatter_darwin_amd64: cmd/perfmonger-plot-formatter/perfmonger-plot-formatter.go $(GO_DEPS)
+	cd cmd/perfmonger-plot-formatter && go build -o ../../$@ perfmonger-plot-formatter.go
 
 
 build: ../lib/exec/perfmonger-recorder_linux_amd64 ../lib/exec/perfmonger-player_linux_amd64 ../lib/exec/perfmonger-viewer_linux_amd64 ../lib/exec/perfmonger-summarizer_linux_amd64 ../lib/exec/perfmonger-plot-formatter_linux_amd64 ../lib/exec/perfmonger-recorder_darwin_amd64 ../lib/exec/perfmonger-player_darwin_amd64 ../lib/exec/perfmonger-viewer_darwin_amd64 ../lib/exec/perfmonger-summarizer_darwin_amd64 ../lib/exec/perfmonger-plot-formatter_darwin_amd64

data/core/build.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 
-READLINK=$(type -p greadlink readlink | head -1)
-cd $(dirname $($READLINK -f $0))
+cd $(cd $(dirname $0); pwd)
 
 if [[ $1 = "-" ]]; then
     # do self build
@@ -33,7 +32,7 @@ fi
 
 set -e
 
-GO_DEPS=$(ls subsystem/*.go; ls utils.go)
+GO_DEPS=$(ls subsystem/*.go utils.go)
 
 makefile=`mktemp`
 
@@ -42,7 +41,6 @@ cat <<EOF > $makefile
 # generated by build.sh
 
 GO_DEPS := $(echo ${GO_DEPS})
-GO_SRC := utils.go
 
 .PHONY: all build clean
 
@@ -62,8 +60,8 @@ for idx in $(seq 0 $((${#TARGET[@]}-1))); do
 
         cat <<EOF >> $makefile
 
-../lib/exec/perfmonger-${subcmd}_${var_GOOS}_${var_GOARCH}: perfmonger-${subcmd}.go \$(GO_DEPS)
-	go build -o \$@ perfmonger-$subcmd.go \$(GO_SRC)
+../lib/exec/perfmonger-${subcmd}_${var_GOOS}_${var_GOARCH}: cmd/perfmonger-${subcmd}/perfmonger-${subcmd}.go \$(GO_DEPS)
+	cd cmd/perfmonger-${subcmd} && go build -o ../../\$@ perfmonger-$subcmd.go
 
 EOF
     done

data/core/{perfmonger-player.go → cmd/perfmonger-player/perfmonger-player.go}

@@ -9,15 +9,19 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"regexp"
 
 	projson "github.com/hayamiz/go-projson"
+	core "github.com/hayamiz/perfmonger/core"
 	ss "github.com/hayamiz/perfmonger/core/subsystem"
 )
 
 type PlayerOption struct {
-	logfile string
-	color   bool
-	pretty  bool
+	logfile         string
+	color           bool
+	pretty          bool
+	disk_only       string
+	disk_only_regex *regexp.Regexp
 }
 
 var option PlayerOption
@@ -49,10 +53,11 @@ func showInterruptStat(printer *projson.JsonPrinter, prev_rec *ss.StatRecord, cu
 	return nil
 }
 
-func showDiskStat(printer *projson.JsonPrinter, prev_rec *ss.StatRecord, cur_rec *ss.StatRecord) error {
-	dusage, err := ss.GetDiskUsage(
+func showDiskStat(printer *projson.JsonPrinter, prev_rec *ss.StatRecord, cur_rec *ss.StatRecord, disk_only_regex *regexp.Regexp) error {
+	dusage, err := ss.GetDiskUsage1(
 		prev_rec.Time, prev_rec.Disk,
-		cur_rec.Time, cur_rec.Disk)
+		cur_rec.Time, cur_rec.Disk,
+		option.disk_only_regex)
 	if err != nil {
 		return err
 	}
@@ -93,7 +98,9 @@ func showMemStat(printer *projson.JsonPrinter, cur_rec *ss.StatRecord) error {
 	return nil
 }
 
-func showStat(printer *projson.JsonPrinter, prev_rec *ss.StatRecord, cur_rec *ss.StatRecord) error {
+func showStat(printer *projson.JsonPrinter, prev_rec *ss.StatRecord, cur_rec *ss.StatRecord,
+	disk_only_regex *regexp.Regexp) error {
+
 	printer.Reset()
 	if option.pretty {
 		printer.SetStyle(projson.SmartStyle)
@@ -101,6 +108,7 @@ func showStat(printer *projson.JsonPrinter, prev_rec *ss.StatRecord, cur_rec *ss
 	if option.color {
 		printer.SetColor(true)
 	}
+
 	printer.BeginObject()
 	printer.PutKey("time")
 	printer.PutFloatFmt(float64(cur_rec.Time.UnixNano())/1e9, "%.3f")
@@ -121,7 +129,7 @@ func showStat(printer *projson.JsonPrinter, prev_rec *ss.StatRecord, cur_rec *ss
 		}
 	}
 	if cur_rec.Disk != nil {
-		err := showDiskStat(printer, prev_rec, cur_rec)
+		err := showDiskStat(printer, prev_rec, cur_rec, disk_only_regex)
 		if err != nil {
 			return err
 		}
@@ -147,9 +155,25 @@ func showStat(printer *projson.JsonPrinter, prev_rec *ss.StatRecord, cur_rec *ss
 func parseArgs() {
 	flag.BoolVar(&option.color, "color", false, "Use colored JSON output")
 	flag.BoolVar(&option.pretty, "pretty", false, "Use human readable JSON output")
+	flag.StringVar(&option.disk_only, "disk-only", "", "Select disk devices by regex")
 
 	flag.Parse()
 
+	if len(flag.Args()) < 1 {
+		fmt.Fprintln(os.Stderr, "Insufficient argument")
+		os.Exit(1)
+	}
+
+	option.disk_only_regex = nil
+
+	if option.disk_only != "" {
+		var err error
+		option.disk_only_regex, err = regexp.Compile(option.disk_only)
+		if err != nil {
+			panic(err)
+		}
+	}
+
 	option.logfile = flag.Arg(0)
 }
 
@@ -169,7 +193,7 @@ func main() {
 		in = f
 		defer f.Close()
 	}
-	input_reader := newPerfmongerLogReader(in)
+	input_reader := core.NewPerfmongerLogReader(in)
 	dec := gob.NewDecoder(input_reader)
 
 	out = bufio.NewWriter(os.Stdout)
@@ -218,7 +242,7 @@ func main() {
 			panic(err)
 		}
 
-		err = showStat(printer, prev_rec, cur_rec)
+		err = showStat(printer, prev_rec, cur_rec, option.disk_only_regex)
 		if err != nil {
 			printer.Reset()
 			fmt.Fprintln(os.Stderr, "skip by err")

data/core/cmd/perfmonger-plot-formatter/README.md

@@ -0,0 +1,24 @@
+# perfmonger-plot-formatter
+
+`perfmonger-plot-formatter` is a command to generate data files for plotting
+various metrices recorded by `perfmonger-recorder`.
+
+## Notes on memory usage records
+
+### `free(1)` compatible summarization
+
+- total: `MemStat.MemTotal`
+- used: `if (memUsed < 0) { MemStat.MemTotal - MemStat.MemFree } else { memUsed }`
+  - memUsed := `MemStat.MemTotal - MemStat.MemFree - mainCached - MemStat.Buffers`
+  - mainCached := `MemStat.Cached + MemStat.SReclaimable`
+- free: `MemStat.MemFree`
+- shared: `MemStat.Shmem`
+- buffers: `MemStat.Buffers`
+- cache: `mainCached`
+  - mainCached := `MemStat.Cached + MemStat.SReclaimable`
+- available: `MemStat.MemAvailable`
+
+### Additional info
+
+- hugeTotal: `MemStat.HugePages_Total`
+- hugeUsed: `MemStat.HugePages_Total - MemStat.HugePages_Free`

data/core/{perfmonger-plot-formatter.go → cmd/perfmonger-plot-formatter/perfmonger-plot-formatter.go}

@@ -13,13 +13,16 @@ import (
 	"os"
 	"regexp"
 	"sort"
+	"strings"
 
+	"github.com/hayamiz/perfmonger/core"
 	ss "github.com/hayamiz/perfmonger/core/subsystem"
 )
 
 type CmdOption struct {
 	DiskFile        string
 	CpuFile         string
+	MemFile         string
 	PerfmongerFile  string
 	disk_only       string
 	disk_only_regex *regexp.Regexp
@@ -30,8 +33,9 @@ func parseArgs() *CmdOption {
 
 	opt := new(CmdOption)
 
-	flag.StringVar(&opt.DiskFile, "diskfile", "./disk.dat", "Disk performance data file")
-	flag.StringVar(&opt.CpuFile, "cpufile", "./cpu.dat", "CPU performance data file")
+	flag.StringVar(&opt.DiskFile, "diskfile", "./disk.dat", "Disk usage data file for gnuplot")
+	flag.StringVar(&opt.CpuFile, "cpufile", "./cpu.dat", "CPU usage data file for gnuplot")
+	flag.StringVar(&opt.MemFile, "memfile", "./mem.dat", "Memory usage data file for gnuplot")
 	flag.StringVar(&opt.PerfmongerFile, "perfmonger", "", "Perfmonger log file")
 	flag.StringVar(&opt.disk_only, "disk-only",
 		"", "Select disk devices by regex")
@@ -79,6 +83,13 @@ type DiskDatTmpFile struct {
 	Idx    int
 }
 
+type MemDatTmpFile struct {
+	Name   string
+	Path   string
+	File   *os.File
+	Writer *bufio.Writer
+}
+
 type CpuDatTmpFile struct {
 	CoreId int
 	Path   string
@@ -117,6 +128,20 @@ func makeCpuDatTmpFile(coreid int) *CpuDatTmpFile {
 	return ret
 }
 
+func makeMemDatTmpFile() *MemDatTmpFile {
+	ret := new(MemDatTmpFile)
+
+	f, err := ioutil.TempFile("", "perfmonger-mem")
+	if err != nil {
+		panic(err)
+	}
+	ret.File = f
+	ret.Path = f.Name()
+	ret.Writer = bufio.NewWriter(f)
+
+	return ret
+}
+
 func printCoreUsage(writer *bufio.Writer, elapsed_time float64, coreusage *ss.CpuCoreUsage) {
 	writer.WriteString(
 		fmt.Sprintf("%f\t%f\t%f\t%f\t%f\t%f\t%f\t%f\t%f\t%f\n",
@@ -132,6 +157,80 @@ func printCoreUsage(writer *bufio.Writer, elapsed_time float64, coreusage *ss.Cp
 			coreusage.Idle))
 }
 
+func printMemUsage(writer *bufio.Writer, elapsed_time float64, mem *ss.MemStat) {
+	if mem == nil {
+		writer.WriteString("#")
+		writer.WriteString(
+			strings.Join([]string{
+				"elapsed_time",     // 1
+				"mem_total",        // 2
+				"mem_used",         // 3
+				"mem_free",         // 4
+				"buffers",          // 5
+				"cached",           // 6
+				"swap_cached",      // 7
+				"active",           // 8
+				"inactive",         // 9
+				"swap_total",       // 10
+				"swap_free",        // 11
+				"dirty",            // 12
+				"writeback",        // 13
+				"anon_pages",       // 14
+				"mapped",           // 15
+				"shmem",            // 16
+				"slab",             // 17
+				"s_reclaimable",    // 18
+				"s_unreclaim",      // 19
+				"kernel_stack",     // 20
+				"page_tables",      // 21
+				"nfs_unstable",     // 22
+				"bounce",           // 23
+				"commit_limit",     // 24
+				"committed_as",     // 25
+				"anon_huge_pages",  // 26
+				"huge_pages_total", // 27
+				"huge_pages_free",  // 28
+				"huge_pages_rsvd",  // 29
+				"huge_pages_surp",  // 30
+				"hugepagesize"},    // 31
+				"\t"))
+		writer.WriteString("\n")
+	} else {
+		writer.WriteString(fmt.Sprintf("%f\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\n",
+			elapsed_time,
+			mem.MemTotal,
+			mem.MemTotal-mem.MemFree-mem.Buffers-mem.Cached-mem.SReclaimable,
+			mem.MemFree,
+			mem.Buffers,
+			mem.Cached,
+			mem.SwapCached,
+			mem.Active,
+			mem.Inactive,
+			mem.SwapTotal,
+			mem.SwapFree,
+			mem.Dirty,
+			mem.Writeback,
+			mem.AnonPages,
+			mem.Mapped,
+			mem.Shmem,
+			mem.Slab,
+			mem.SReclaimable,
+			mem.SUnreclaim,
+			mem.KernelStack,
+			mem.PageTables,
+			mem.NFS_Unstable,
+			mem.Bounce,
+			mem.CommitLimit,
+			mem.Committed_AS,
+			mem.AnonHugePages,
+			mem.HugePages_Total,
+			mem.HugePages_Free,
+			mem.HugePages_Rsvd,
+			mem.HugePages_Surp,
+			mem.Hugepagesize))
+	}
+}
+
 func main() {
 	opt := parseArgs()
 
@@ -141,7 +240,7 @@ func main() {
 	}
 	defer f.Close()
 
-	input_reader := newPerfmongerLogReader(f)
+	input_reader := core.NewPerfmongerLogReader(f)
 	dec := gob.NewDecoder(input_reader)
 
 	var cheader ss.CommonHeader
@@ -192,6 +291,13 @@ func main() {
 	cpu_writer.WriteString("# All cpu usage\n")
 	cpu_writer.WriteString("# elapsed_time	%usr	%nice	%sys	%iowait	%hardirq	%softirq	%steal	%guest	%idle\n")
 
+	f, err = os.Create(opt.MemFile)
+	if err != nil {
+		panic(err)
+	}
+	defer f.Close()
+	mem_writer := bufio.NewWriter(f)
+
 	for {
 		prev_rec := &records[curr^1]
 		cur_rec := &records[curr]
@@ -283,6 +389,12 @@ func main() {
 		}
 		printCoreUsage(cpu_writer, prev_rec.Time.Sub(t0).Seconds(), cusage.All)
 
+		if !meta_set {
+			// print column labels
+			printMemUsage(mem_writer, prev_rec.Time.Sub(t0).Seconds(), nil)
+		}
+		printMemUsage(mem_writer, prev_rec.Time.Sub(t0).Seconds(), cur_rec.Mem)
+
 		curr ^= 1
 		meta_set = true
 	}
@@ -331,6 +443,7 @@ func main() {
 		os.Remove(cpu_dat.Path)
 	}
 	cpu_writer.Flush()
+	mem_writer.Flush()
 
 	json_enc := json.NewEncoder(os.Stdout)
 	json_enc.Encode(meta)

data/core/{perfmonger-summarizer.go → cmd/perfmonger-summarizer/perfmonger-summarizer.go}

@@ -12,6 +12,7 @@ import (
 	"sort"
 
 	projson "github.com/hayamiz/go-projson"
+	"github.com/hayamiz/perfmonger/core"
 	ss "github.com/hayamiz/perfmonger/core/subsystem"
 )
 
@@ -38,6 +39,7 @@ func parseArgs() {
 	flag.Parse()
 
 	if len(flag.Args()) < 1 {
+		fmt.Fprintln(os.Stderr, "Insufficient argument")
 		os.Exit(1)
 	}
 
@@ -61,7 +63,7 @@ func main() {
 	}
 	defer f.Close()
 
-	input_reader := newPerfmongerLogReader(f)
+	input_reader := core.NewPerfmongerLogReader(f)
 	dec := gob.NewDecoder(input_reader)
 
 	err = dec.Decode(&cheader)

data/core/go.mod

@@ -0,0 +1,10 @@
+module github.com/hayamiz/perfmonger/core
+
+go 1.15
+
+require (
+	github.com/hayamiz/go-projson v0.0.0-20210510072849-3503bd24ae61
+	github.com/jroimartin/gocui v0.4.0
+	github.com/nsf/termbox-go v1.1.1
+	golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a
+)

data/core/go.sum

@@ -0,0 +1,17 @@
+github.com/hayamiz/go-projson v0.0.0-20210510072849-3503bd24ae61 h1:elFR/pEri9bFREP6YvJQDcFjncPBDhG+SwWJjYSvY8s=
+github.com/hayamiz/go-projson v0.0.0-20210510072849-3503bd24ae61/go.mod h1:Zkuug8uJZoQ8V34UfDAFVmKLVHPhe+TJUAazUzh6s1k=
+github.com/jroimartin/gocui v0.4.0 h1:52jnalstgmc25FmtGcWqa0tcbMEWS6RpFLsOIO+I+E8=
+github.com/jroimartin/gocui v0.4.0/go.mod h1:7i7bbj99OgFHzo7kB2zPb8pXLqMBSQegY7azfqXMkyY=
+github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
+github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/nsf/termbox-go v1.1.1 h1:nksUPLCb73Q++DwbYUBEglYBRPZyoXJdrj5L+TkjyZY=
+github.com/nsf/termbox-go v1.1.1/go.mod h1:T0cTdVuOwf7pHQNtfhnEbzHbcNyCEcVU4YPpouCbVxo=
+golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a h1:kr2P4QFmQr29mSLA43kwrOcgcReGTfbE9N577tCTuBc=
+golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=

data/core/subsystem/perfmonger_linux.go

@@ -469,6 +469,8 @@ func ReadMemStat(record *StatRecord) error {
 			mem_stat.HugePages_Free = val
 		case "HugePages_Total:":
 			mem_stat.HugePages_Total = val
+		case "Hugepagesize:":
+			mem_stat.Hugepagesize = val
 		case "AnonHugePages:":
 			mem_stat.AnonHugePages = val
 		case "Committed_AS:":

data/core/subsystem/stat.go

@@ -132,6 +132,7 @@ type MemStat struct {
 	HugePages_Free  int64
 	HugePages_Rsvd  int64
 	HugePages_Surp  int64
+	Hugepagesize    int64
 }
 
 type StatRecord struct {
@@ -286,6 +287,7 @@ func (entry *MemStat) Clear() {
 	entry.HugePages_Free = 0
 	entry.HugePages_Rsvd = 0
 	entry.HugePages_Surp = 0
+	entry.Hugepagesize = 0
 }
 
 func NewStatRecord() *StatRecord {

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

@@ -145,10 +145,13 @@ EOS
 
     @disk_dat = File.expand_path("disk.dat", @tmpdir)
     @cpu_dat = File.expand_path("cpu.dat", @tmpdir)
+    @mem_dat = File.expand_path("mem.dat", @tmpdir)
 
     meta_json = nil
-    cmd = [formatter_bin, "-perfmonger", @data_file, "-cpufile", @cpu_dat,
-      "-diskfile", @disk_dat]
+    cmd = [formatter_bin, "-perfmonger", @data_file,
+           "-cpufile", @cpu_dat,
+           "-diskfile", @disk_dat,
+           "-memfile", @mem_dat]
     if @disk_only_regex
       cmd << "-disk-only"
       cmd << @disk_only
@@ -164,6 +167,7 @@ EOS
 
     plot_disk(meta)
     plot_cpu(meta)
+    plot_mem(meta)
 
     FileUtils.rm_rf(@tmpdir)
 
@@ -508,6 +512,144 @@ EOS
     end
   end # def
 
+  def plot_mem(meta)
+    pdf_filename = @output_prefix + 'mem.pdf'
+    gp_filename  = @output_prefix + 'mem.gp'
+    dat_filename = @output_prefix + 'mem.dat'
+
+    unless File.exists?(dat_filename)
+      $stderr.puts("WARN: memory usage info is not available.")
+      return
+    end
+
+    if @output_type != 'pdf'
+      img_filename = @output_prefix + 'cpu.' + @output_type
+    else
+      img_filename = nil
+    end
+
+    start_time = meta["start_time"]
+    end_time = meta["end_time"]
+
+    mem_scaling = 2.0**20 # KB -> GB
+
+# "elapsed_time",     // 1
+# "mem_total",        // 2
+# "mem_used",         // 3
+# "mem_free",         // 4
+# "buffers",          // 5
+# "cached",           // 6
+# "swap_cached",      // 7
+# "active",           // 8
+# "inactive",         // 9
+# "swap_total",       // 10
+# "swap_free",        // 11
+# "dirty",            // 12
+# "writeback",        // 13
+# "anon_pages",       // 14
+# "mapped",           // 15
+# "shmem",            // 16
+# "slab",             // 17
+# "s_reclaimable",    // 18
+# "s_unreclaim",      // 19
+# "kernel_stack",     // 20
+# "page_tables",      // 21
+# "nfs_unstable",     // 22
+# "bounce",           // 23
+# "commit_limit",     // 24
+# "committed_as",     // 25
+# "anon_huge_pages",  // 26
+# "huge_pages_total", // 27
+# "huge_pages_free",  // 28
+# "huge_pages_rsvd",  // 29
+# "huge_pages_surp"}, // 30
+# "hugepagesize"},    // 31
+
+    Dir.chdir(@tmpdir) do
+      total = `tail -n+2 #{dat_filename}|head -n1`.split[1].to_f
+      if total == 0.0
+        raise RuntimeError.new("Failed to get MemTotal value from mem.dat file: #{dat_filename}")
+      end
+
+      gpfile = File.open(gp_filename, 'w')
+
+      pdf_file = File.join(@output_dir, "mem.pdf")
+      gpfile.puts <<EOS
+set term pdfcairo enhanced color size 6in,2.5in
+set title "Memory usage"
+set output "#{pdf_filename}"
+set key outside center bottom horizontal
+set size 1.0, 1.0
+
+set xlabel "elapsed time [sec]"
+set ylabel "memory usage [GB]"
+
+# scaling
+s = #{mem_scaling}
+
+set grid
+set xrange [#{@offset_time}:#{end_time - start_time}]
+set yrange [0:#{total * 1.2}/s]
+
+# line styles
+set style line 1 lt 1 lc rgb '#66C2A5' # teal
+set style line 2 lt 1 lc rgb '#FC8D62' # orange
+set style line 3 lt 1 lc rgb '#8DA0CB' # lilac
+set style line 4 lt 1 lc rgb '#E78AC3' # magentat
+set style line 5 lt 1 lc rgb '#A6D854' # lime green
+set style line 6 lt 1 lc rgb '#FFD92F' # banana
+set style line 7 lt 1 lc rgb '#E5C494' # tan
+set style line 8 lt 1 lc rgb '#B3B3B3' # grey
+
+# palette
+set palette maxcolors 8
+set palette defined ( 0 '#66C2A5',\
+    	    	      1 '#FC8D62',\
+		      2 '#8DA0CB',\
+		      3 '#E78AC3',\
+		      4 '#A6D854',\
+		      5 '#FFD92F',\
+		      6 '#E5C494',\
+		      7 '#B3B3B3' )
+
+used(total, free, cached, buffers, srecl) = \\
+  ( (total - free - cache(cached, srecl) - buffers < 0) ? \\
+    (total - free) : \\
+    (total - free - cache(cached, srecl) - buffers) )
+
+cache(cached, srecl) = cached + srecl
+
+plot "#{dat_filename}" usi 1:($4/s+$5/s+cache($6, $18)/s+$16/s+used($2, $4, $6, $5, $18)/s) wi filledcurves x1 ls 8 ti "free", \\
+     "#{dat_filename}" usi 1:($5/s+cache($6, $18)/s+$16/s+used($2, $4, $6, $5, $18)/s) wi filledcurves x1 ls 3 ti "buffers", \\
+     "#{dat_filename}" usi 1:(cache($6, $18)/s+$16/s+used($2, $4, $6, $5, $18)/s) wi filledcurves x1 ls 5 ti "cached", \\
+     "#{dat_filename}" usi 1:($16/s+used($2, $4, $6, $5, $18)/s) wi filledcurves x1 ls 6 ti "shared", \\
+     "#{dat_filename}" usi 1:(used($2, $4, $6, $5, $18)/s) wi filledcurves x1 ls 2 ti "used", \\
+     "#{dat_filename}" usi 1:(($27-$28)*$31/s) wi lines dt (4,4) lc rgb 'black' lw 2.5 ti 'used (hugepage)'
+
+EOS
+
+      gpfile.close
+      system("gnuplot #{gpfile.path}")
+
+      if @output_type != 'pdf'
+        system("convert -density 150 -background white #{pdf_filename} #{img_filename}")
+      end
+    end # chdir
+
+    copy_targets = []
+    copy_targets << pdf_filename
+    copy_targets << img_filename if img_filename
+
+    if @save_gpfiles
+      copy_targets << gp_filename
+      copy_targets << dat_filename
+    end
+
+    copy_targets.each do |target|
+      FileUtils.copy(File.join(@tmpdir, target), @output_dir)
+    end
+  end # def
+
   private
   def factors(n)
     (2..([n, n / 2].max).to_i).select do |x|

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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perfmonger
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Yuto HAYAMIZU
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-10 00:00:00.000000000 Z
+date: 2021-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,11 +101,14 @@ files:
 - Rakefile
 - core/Makefile
 - core/build.sh
-- core/perfmonger-player.go
-- core/perfmonger-plot-formatter.go
-- core/perfmonger-recorder.go
-- core/perfmonger-summarizer.go
-- core/perfmonger-viewer.go
+- core/cmd/perfmonger-player/perfmonger-player.go
+- core/cmd/perfmonger-plot-formatter/README.md
+- core/cmd/perfmonger-plot-formatter/perfmonger-plot-formatter.go
+- core/cmd/perfmonger-recorder/perfmonger-recorder.go
+- core/cmd/perfmonger-summarizer/perfmonger-summarizer.go
+- core/cmd/perfmonger-viewer/perfmonger-viewer.go
+- core/go.mod
+- core/go.sum
 - core/subsystem/Makefile
 - core/subsystem/perfmonger.go
 - core/subsystem/perfmonger_darwin.go