perfmonger 0.9.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6c4a036c08d2f75fc25b25da1b773e025461880
-  data.tar.gz: 87182b819268cdcd289ea1cfb89f8672cc307947
+  metadata.gz: 72618bf530f76c6135a455979b3a1c19ae3cda6d
+  data.tar.gz: af7dc56800edacccc3ee3821c011694a1f801bb3
 SHA512:
-  metadata.gz: dcb1dd5f6086bff622f66dc7eb15a835604d0ce63fb2ea7b3d6ab022d3b5724384ca54ec38525c31984bc06dc08c87ca89cb21da7a62696bfaf665df6474d8a8
-  data.tar.gz: cb33cd2fe403d279687a6ad680fbda8af96c778b65b485f6f4b6024eac8e80c8fc6efd79e4e225f1a02fcbfa2f79cfe5061857716ff62fc3b7c4a1a828ca2568
+  metadata.gz: 0beb12d9c14f4749076dcc27378bd9835f5447687e22ba7e0905dea390fc48b2177a7470204ebbbbf1284adf7a0207b02dd04573897687faa2f0ba52b0f923cb
+  data.tar.gz: 1a3d334f6c02ee779bd498004f09f4f92ff217f7231adea71aee3c42c01e667939547e74c0c0acd33b29c9b5ddf60d0f9fa6f9857032465c6e71c337df15833d

data/NEWS

@@ -1,3 +1,29 @@
+## 2017-09-08: PerfMonger 0.10.1
+  * Yanked wrongly shipped v0.10.0 and pushed up-to-date code
+
+## 2017-06-19: PerfMonger 0.10.0
+  * New features
+    * [record] subcommand:
+      * Record /proc/interrupts information (experimental)
+      * Support gzipped output format
+        * Enabled by default
+        * Disabled with --no-gzip option
+    * [play] subcommand:
+      * Play /proc/interrupts information by cpu cores (experimental)
+      * Support gzipped input
+    * [summary] subcommand:
+      * Summarize /proc/interrupts information (experimental, currently outputs only in JSON mode)
+      * Support gzipped input
+    * [fingerprint] subcommand:
+      * Additionally log biosdecode and nvme info
+    * Improved shell completion
+  * Bug fixes
+    * [record] subcommand:
+      * Get CPU count by nproc(1) in linux subsystem
+      * Create a session only in background mode, and an existing session do not prevent launching perfmonger-record in foreground mode
+    * [fingerprint] subcommand:
+      * Surpress accessing non-readable sysfs files
+
 ## 2016-12-12: PerfMonger 0.9.0
   * New features
     * [init-shell] subcommand: Added for loading shell completion function from rcfile
@@ -7,7 +33,8 @@
       * log LVM, fdisk, and lsblk info
     * [plot]
       * Fast plot data formatting with new core implementation
-    * Improved shell completion
+      * Add --disk-only, --disk-read-only, --disk-write-only to filter disks for plot
+      * Add --plot-iops-max to limit Y-axis range
 
 ## 2016-11-22: PerfMonger 0.8.2
   * Bug fixes
@@ -172,4 +199,4 @@ PerfMonger is available on yum repository from this release.
 ## 2011-12-09: PerfMonger 0.1.0 released
 
   * New features
-    * I/O performance monitoring
+    * I/O performance monitoring

data/core/Makefile

@@ -1,59 +1,60 @@
 # DO NOT EDIT MANUALLY
 # generated by build.sh
 
-GOSRC := 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
+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_386: perfmonger-recorder.go $(GOSRC)
-	go build -o $@ perfmonger-recorder.go
+../lib/exec/perfmonger-recorder_linux_386: perfmonger-recorder.go $(GO_DEPS)
+	go build -o $@ perfmonger-recorder.go $(GO_SRC)
 
 
-../lib/exec/perfmonger-player_linux_386: perfmonger-player.go $(GOSRC)
-	go build -o $@ perfmonger-player.go
+../lib/exec/perfmonger-player_linux_386: perfmonger-player.go $(GO_DEPS)
+	go build -o $@ perfmonger-player.go $(GO_SRC)
 
 
-../lib/exec/perfmonger-summarizer_linux_386: perfmonger-summarizer.go $(GOSRC)
-	go build -o $@ perfmonger-summarizer.go
+../lib/exec/perfmonger-summarizer_linux_386: perfmonger-summarizer.go $(GO_DEPS)
+	go build -o $@ perfmonger-summarizer.go $(GO_SRC)
 
 
-../lib/exec/perfmonger-plot-formatter_linux_386: perfmonger-plot-formatter.go $(GOSRC)
-	go build -o $@ perfmonger-plot-formatter.go
+../lib/exec/perfmonger-plot-formatter_linux_386: perfmonger-plot-formatter.go $(GO_DEPS)
+	go build -o $@ perfmonger-plot-formatter.go $(GO_SRC)
 
 
-../lib/exec/perfmonger-recorder_linux_amd64: perfmonger-recorder.go $(GOSRC)
-	go build -o $@ perfmonger-recorder.go
+../lib/exec/perfmonger-recorder_linux_amd64: perfmonger-recorder.go $(GO_DEPS)
+	go build -o $@ perfmonger-recorder.go $(GO_SRC)
 
 
-../lib/exec/perfmonger-player_linux_amd64: perfmonger-player.go $(GOSRC)
-	go build -o $@ perfmonger-player.go
+../lib/exec/perfmonger-player_linux_amd64: perfmonger-player.go $(GO_DEPS)
+	go build -o $@ perfmonger-player.go $(GO_SRC)
 
 
-../lib/exec/perfmonger-summarizer_linux_amd64: perfmonger-summarizer.go $(GOSRC)
-	go build -o $@ perfmonger-summarizer.go
+../lib/exec/perfmonger-summarizer_linux_amd64: perfmonger-summarizer.go $(GO_DEPS)
+	go build -o $@ perfmonger-summarizer.go $(GO_SRC)
 
 
-../lib/exec/perfmonger-plot-formatter_linux_amd64: perfmonger-plot-formatter.go $(GOSRC)
-	go build -o $@ perfmonger-plot-formatter.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-recorder_darwin_amd64: perfmonger-recorder.go $(GOSRC)
-	go build -o $@ perfmonger-recorder.go
+../lib/exec/perfmonger-recorder_darwin_amd64: perfmonger-recorder.go $(GO_DEPS)
+	go build -o $@ perfmonger-recorder.go $(GO_SRC)
 
 
-../lib/exec/perfmonger-player_darwin_amd64: perfmonger-player.go $(GOSRC)
-	go build -o $@ perfmonger-player.go
+../lib/exec/perfmonger-player_darwin_amd64: perfmonger-player.go $(GO_DEPS)
+	go build -o $@ perfmonger-player.go $(GO_SRC)
 
 
-../lib/exec/perfmonger-summarizer_darwin_amd64: perfmonger-summarizer.go $(GOSRC)
-	go build -o $@ perfmonger-summarizer.go
+../lib/exec/perfmonger-summarizer_darwin_amd64: perfmonger-summarizer.go $(GO_DEPS)
+	go build -o $@ perfmonger-summarizer.go $(GO_SRC)
 
 
-../lib/exec/perfmonger-plot-formatter_darwin_amd64: perfmonger-plot-formatter.go $(GOSRC)
-	go build -o $@ perfmonger-plot-formatter.go
+../lib/exec/perfmonger-plot-formatter_darwin_amd64: perfmonger-plot-formatter.go $(GO_DEPS)
+	go build -o $@ perfmonger-plot-formatter.go $(GO_SRC)
 
 
 build: ../lib/exec/perfmonger-recorder_linux_386 ../lib/exec/perfmonger-player_linux_386 ../lib/exec/perfmonger-summarizer_linux_386 ../lib/exec/perfmonger-plot-formatter_linux_386 ../lib/exec/perfmonger-recorder_linux_amd64 ../lib/exec/perfmonger-player_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-summarizer_darwin_amd64 ../lib/exec/perfmonger-plot-formatter_darwin_amd64

data/core/build.sh

@@ -33,13 +33,16 @@ fi
 
 set -e
 
-GO_FILES=$(ls subsystem/*.go)
+GO_DEPS=$(ls subsystem/*.go; ls utils.go)
 
-cat <<EOF > Makefile
+makefile=`mktemp`
+
+cat <<EOF > $makefile
 # DO NOT EDIT MANUALLY
 # generated by build.sh
 
-GOSRC := $(echo ${GO_FILES})
+GO_DEPS := $(echo ${GO_DEPS})
+GO_SRC := utils.go
 
 .PHONY: all build clean
 
@@ -51,30 +54,30 @@ TARGETS=()
 
 for idx in $(seq 0 $((${#TARGET[@]}-1))); do
     set -- ${TARGET[$idx]}
-    export GOOS=$1
-    export GOARCH=$2
+    export var_GOOS=$1
+    export var_GOARCH=$2
 
     for subcmd in recorder player summarizer plot-formatter; do
-        TARGETS+=(../lib/exec/perfmonger-${subcmd}_${GOOS}_${GOARCH})
+        TARGETS+=(../lib/exec/perfmonger-${subcmd}_${var_GOOS}_${var_GOARCH})
 
-        cat <<EOF >> Makefile
+        cat <<EOF >> $makefile
 
-../lib/exec/perfmonger-${subcmd}_${GOOS}_${GOARCH}: perfmonger-${subcmd}.go \$(GOSRC)
-	go build -o \$@ perfmonger-$subcmd.go
+../lib/exec/perfmonger-${subcmd}_${var_GOOS}_${var_GOARCH}: perfmonger-${subcmd}.go \$(GO_DEPS)
+	go build -o \$@ perfmonger-$subcmd.go \$(GO_SRC)
 
 EOF
     done
 
-    # go build -o ../lib/exec/perfmonger-recorder_${GOOS}_${GOARCH} \
+    # go build -o ../lib/exec/perfmonger-recorder_${var_GOOS}_${var_GOARCH} \
     #     perfmonger-recorder.go &
-    # go build -o ../lib/exec/perfmonger-player_${GOOS}_${GOARCH} \
+    # go build -o ../lib/exec/perfmonger-player_${var_GOOS}_${var_GOARCH} \
     #     perfmonger-player.go &
-    # go build -o ../lib/exec/perfmonger-summarizer_${GOOS}_${GOARCH} \
+    # go build -o ../lib/exec/perfmonger-summarizer_${var_GOOS}_${var_GOARCH} \
     #    perfmonger-summarizer.go &
 
 done
 
-cat <<EOF >> Makefile
+cat <<EOF >> $makefile
 
 build: ${TARGETS[*]}
 
@@ -82,3 +85,7 @@ clean:
 	rm -f ${TARGETS[*]}
 
 EOF
+
+mv $makefile ./Makefile
+
+make

data/core/perfmonger-player.go

@@ -24,6 +24,32 @@ func showCpuStat(buffer *bytes.Buffer, prev_rec *ss.StatRecord, cur_rec *ss.Stat
 	return nil
 }
 
+func showInterruptStat(buffer *bytes.Buffer, prev_rec *ss.StatRecord, cur_rec *ss.StatRecord) error {
+	// intr_usage, err := ss.GetInterruptUsage(
+	// 	prev_rec.Time, prev_rec.Interrupt,
+	// 	cur_rec.Time, cur_rec.Interrupt)
+	// if err != nil {
+	// 	return err
+	// }
+	//
+	// buffer.WriteString(`,"intr":`)
+	// intr_usage.WriteJsonTo(buffer)
+	//
+	// return nil
+
+	intr_usage, err := ss.GetInterruptUsage(
+		prev_rec.Time, prev_rec.Interrupt,
+		cur_rec.Time, cur_rec.Interrupt)
+	if err != nil {
+		return err
+	}
+
+	buffer.WriteString(`,"intr":`)
+	intr_usage.WriteJsonTo(buffer)
+
+	return nil
+}
+
 func showDiskStat(buffer *bytes.Buffer, prev_rec *ss.StatRecord, cur_rec *ss.StatRecord) error {
 	dusage, err := ss.GetDiskUsage(
 		prev_rec.Time, prev_rec.Disk,
@@ -61,6 +87,12 @@ func showStat(buffer *bytes.Buffer, prev_rec *ss.StatRecord, cur_rec *ss.StatRec
 			return err
 		}
 	}
+	if cur_rec.Interrupt != nil {
+		err := showInterruptStat(buffer, prev_rec, cur_rec)
+		if err != nil {
+			return err
+		}
+	}
 	if cur_rec.Disk != nil {
 		err := showDiskStat(buffer, prev_rec, cur_rec)
 		if err != nil {
@@ -93,11 +125,11 @@ func main() {
 		in = f
 		defer f.Close()
 	}
+	input_reader := newPerfmongerLogReader(in)
+	dec := gob.NewDecoder(input_reader)
 
 	out = bufio.NewWriter(os.Stdout)
 
-	dec := gob.NewDecoder(in)
-
 	var cheader ss.CommonHeader
 	var pheader ss.PlatformHeader
 	var records = make([]ss.StatRecord, 2)

data/core/perfmonger-plot-formatter.go

@@ -123,16 +123,14 @@ func printCoreUsage(writer *bufio.Writer, elapsed_time float64, coreusage *ss.Cp
 func main() {
 	opt := parseArgs()
 
-	var in *os.File
-
 	f, err := os.Open(opt.PerfmongerFile)
 	if err != nil {
 		panic(err)
 	}
-	in = f
 	defer f.Close()
 
-	dec := gob.NewDecoder(bufio.NewReader(in))
+	input_reader := newPerfmongerLogReader(f)
+	dec := gob.NewDecoder(input_reader)
 
 	var cheader ss.CommonHeader
 	var pheader ss.PlatformHeader

data/core/perfmonger-recorder.go

@@ -4,6 +4,7 @@ package main
 
 import (
 	"bufio"
+	"compress/gzip"
 	"encoding/gob"
 	"flag"
 	"fmt"
@@ -32,6 +33,7 @@ type RecorderOption struct {
 	devsParts           []string
 	output              string
 	no_cpu              bool
+	no_intr             bool
 	no_disk             bool
 	no_net              bool
 	debug               bool
@@ -39,6 +41,8 @@ type RecorderOption struct {
 	player_bin          string
 	disks               string
 	targetDisks         *map[string]bool
+	background          bool
+	gzip                bool
 }
 
 var option RecorderOption
@@ -64,6 +68,8 @@ func parseArgs() {
 		"-", "Output file name")
 	flag.BoolVar(&option.no_cpu, "no-cpu",
 		false, "Do not record CPU usage")
+	flag.BoolVar(&option.no_intr, "no-intr",
+		false, "Do not record interrupts count")
 	flag.BoolVar(&option.no_disk, "no-disk",
 		false, "Do not record disk usage")
 	flag.BoolVar(&option.no_net, "no-net",
@@ -72,10 +78,14 @@ func parseArgs() {
 		false, "Enable debug mode")
 	flag.BoolVar(&option.listDevices, "list-devices",
 		false, "List devices and exits")
+	flag.BoolVar(&option.background, "background",
+		false, "Run in background mode")
 	flag.StringVar(&option.disks, "disks",
 		"", "Disk devices to be monitored")
 	flag.StringVar(&option.player_bin, "player-bin",
 		"", "Run perfmonger-player to show JSON output")
+	flag.BoolVar(&option.gzip, "gzip",
+		false, "Save a logfile in gzipped format")
 
 	flag.Parse()
 
@@ -116,55 +126,65 @@ func main() {
 	var out *bufio.Writer
 	var err error
 
-	// Find existing session, or create new one
-	user, err := user.Current()
-	if err != nil {
-		panic(err)
+	// Need to check '-background' before parsing args
+	is_background := false
+	for _, arg := range os.Args {
+		if arg == "-background" {
+			is_background = true
+		}
 	}
-	session_file := path.Join(os.TempDir(),
-		fmt.Sprintf("perfmonger-%s-session.pid", user.Username))
 
-	lockfile := path.Join(os.TempDir(), ".perfmonger.lock")
+	if is_background {
+		// Find existing session, or create new one
+		user, err := user.Current()
+		if err != nil {
+			panic(err)
+		}
+		session_file := path.Join(os.TempDir(),
+			fmt.Sprintf("perfmonger-%s-session.pid", user.Username))
 
-	// make lock file if not exists
-	session_exists := false
+		lockfile := path.Join(os.TempDir(), ".perfmonger.lock")
 
-	if _, err := os.Stat(lockfile); err != nil {
-		ioutil.WriteFile(lockfile, []byte(""), 0644)
-	}
-	fd, _ := syscall.Open(lockfile, syscall.O_RDONLY, 0000)
-	syscall.Flock(fd, syscall.LOCK_EX)
+		// make lock file if not exists
+		session_exists := false
 
-	if _, err := os.Stat(session_file); err == nil {
-		pidstr, err := ioutil.ReadFile(session_file)
-		pid, err := strconv.Atoi(string(pidstr))
-		if err != nil {
-			goto MakeNewSession
+		if _, err := os.Stat(lockfile); err != nil {
+			ioutil.WriteFile(lockfile, []byte(""), 0644)
 		}
+		fd, _ := syscall.Open(lockfile, syscall.O_RDONLY, 0000)
+		syscall.Flock(fd, syscall.LOCK_EX)
+
+		if _, err := os.Stat(session_file); err == nil {
+			pidstr, err := ioutil.ReadFile(session_file)
+			pid, err := strconv.Atoi(string(pidstr))
+			if err != nil {
+				goto MakeNewSession
+			}
 
-		// check if PID in session file is valid
-		proc, err := os.FindProcess(pid)
-		err = proc.Signal(syscall.Signal(0))
+			// check if PID in session file is valid
+			proc, err := os.FindProcess(pid)
+			err = proc.Signal(syscall.Signal(0))
 
-		if err == nil {
-			session_exists = true
-			goto Unlock
+			if err == nil {
+				session_exists = true
+				goto Unlock
+			}
 		}
-	}
-MakeNewSession:
-	err = ioutil.WriteFile(session_file, []byte(strconv.Itoa(os.Getpid())), 0644)
-	if err != nil {
-		panic(err)
-	}
-	defer os.Remove(session_file)
+	MakeNewSession:
+		err = ioutil.WriteFile(session_file, []byte(strconv.Itoa(os.Getpid())), 0644)
+		if err != nil {
+			panic(err)
+		}
+		defer os.Remove(session_file)
 
-Unlock:
-	syscall.Flock(fd, syscall.LOCK_UN)
-	syscall.Close(fd)
+	Unlock:
+		syscall.Flock(fd, syscall.LOCK_UN)
+		syscall.Close(fd)
 
-	if session_exists {
-		fmt.Fprintf(os.Stderr, "[ERROR] another perfmonger is already running.\n")
-		return
+		if session_exists {
+			fmt.Fprintf(os.Stderr, "[ERROR] another perfmonger is already running in background mode\n")
+			return
+		}
 	}
 
 	parseArgs()
@@ -243,7 +263,14 @@ Unlock:
 		if player_stdin != nil {
 			out = bufio.NewWriter(io.MultiWriter(file, player_stdin))
 		} else {
-			out = bufio.NewWriter(file)
+			if option.gzip {
+				gzwriter := gzip.NewWriter(file)
+				defer gzwriter.Close()
+
+				out = bufio.NewWriter(gzwriter)
+			} else {
+				out = bufio.NewWriter(file)
+			}
 		}
 	}
 
@@ -290,6 +317,9 @@ Unlock:
 		if !option.no_cpu {
 			ss.ReadCpuStat(record)
 		}
+		if !option.no_intr {
+			ss.ReadInterruptStat(record)
+		}
 		if !option.no_disk {
 			ss.ReadDiskStats(record, option.targetDisks)
 		}