perfmonger 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb47ad299c6b0e503298b6fd345357760f6db238
-  data.tar.gz: bc212e88228a080c65dfedbb8c96437130d03838
+  metadata.gz: 0b02aaea69043dcf1560fd042e2af5f571c88e06
+  data.tar.gz: 07081ebc86aa30f921b360cc0c2d82fd958d3c7f
 SHA512:
-  metadata.gz: 9a4f21ab77b86679b78a9ca8628bc6bfbecec598ab2001397a6bb22aaa78cb4aa2cb7aa8de787e858da05666232161c59e53d980a6952355f083bd337350d84f
-  data.tar.gz: d5ac7fadddd9ae96b9da5d4036081fff64f7737db49259ac7ec406cc11491211662b001479c01039c674b0423ce3f6346cf8234e268860362baa4789bed61521
+  metadata.gz: 3d4c1d36d69a8d010574985ef3ca8e1760c715b9eb079d87cc4eab5de9adf6a05373a01d351e5286e8000f7fe90148e2af7ac3036abc9eab3bc9a0c329bd18d0
+  data.tar.gz: 98347d85d24cdbd38ee6cf39cf1a6961a957a56da0d4c17700a2a8dfeb93c2e9438c9953f9bcd5233644249c2f659f1f6c4e4ec9c785bc3cb3835051efa04f98

data/NEWS

@@ -1,3 +1,14 @@
+## XXXX-XX-XX: PerfMonger 0.9.0
+  * ...
+
+## 2016-11-22: PerfMonger 0.8.0
+  * New features
+    * [record] subcommand:
+      * Implemented "session" for preventing double start
+      * Add --background and --kill option for running perfmonger in background (useful for scripting)
+    * [summary] subcommand:
+      * Add --disk-only option to filter results of not interesting disks
+
 ## 2016-10-02: PerfMonger 0.7.1 released
 
   * Bug fix

data/Rakefile

@@ -14,6 +14,7 @@ task :cross_build_core do
   puts "Buildling binaries for each platform"
   Dir.chdir("./core") do
     sh "./build.sh"
+    sh "make"
   end
 end
 

data/core/Makefile

@@ -1,23 +1,51 @@
+# DO NOT EDIT MANUALLY
+# generated by build.sh
 
-GOSRC :=                                        \
-        subsystem/perfmonger.go                 \
-        subsystem/perfmonger_linux.go           \
-        subsystem/stat.go                       \
-        subsystem/usage.go
+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
 
-.PHONY: all clean
+.PHONY: all build clean
 
-all: perfmonger-recorder perfmonger-player perfmonger-summarizer
+all: build
 
-clean:
-	rm -f perfmonger-recorder perfmonger-player perfmonger-summarizer
 
-perfmonger-recorder: perfmonger-recorder.go $(GOSRC)
-	go build $<
+../lib/exec/perfmonger-recorder_linux_386: perfmonger-recorder.go $(GOSRC)
+	go build -o $@ perfmonger-recorder.go
+
+
+../lib/exec/perfmonger-player_linux_386: perfmonger-player.go $(GOSRC)
+	go build -o $@ perfmonger-player.go
+
+
+../lib/exec/perfmonger-summarizer_linux_386: perfmonger-summarizer.go $(GOSRC)
+	go build -o $@ perfmonger-summarizer.go
+
+
+../lib/exec/perfmonger-recorder_linux_amd64: perfmonger-recorder.go $(GOSRC)
+	go build -o $@ perfmonger-recorder.go
+
+
+../lib/exec/perfmonger-player_linux_amd64: perfmonger-player.go $(GOSRC)
+	go build -o $@ perfmonger-player.go
+
 
-perfmonger-player: perfmonger-player.go $(GOSRC)
-	go build $<
+../lib/exec/perfmonger-summarizer_linux_amd64: perfmonger-summarizer.go $(GOSRC)
+	go build -o $@ perfmonger-summarizer.go
 
-perfmonger-summarizer: perfmonger-summarizer.go $(GOSRC)
-	go build $<
+
+../lib/exec/perfmonger-recorder_darwin_amd64: perfmonger-recorder.go $(GOSRC)
+	go build -o $@ perfmonger-recorder.go
+
+
+../lib/exec/perfmonger-player_darwin_amd64: perfmonger-player.go $(GOSRC)
+	go build -o $@ perfmonger-player.go
+
+
+../lib/exec/perfmonger-summarizer_darwin_amd64: perfmonger-summarizer.go $(GOSRC)
+	go build -o $@ perfmonger-summarizer.go
+
+
+build: ../lib/exec/perfmonger-recorder_linux_386 ../lib/exec/perfmonger-player_linux_386 ../lib/exec/perfmonger-summarizer_linux_386 ../lib/exec/perfmonger-recorder_linux_amd64 ../lib/exec/perfmonger-player_linux_amd64 ../lib/exec/perfmonger-summarizer_linux_amd64 ../lib/exec/perfmonger-recorder_darwin_amd64 ../lib/exec/perfmonger-player_darwin_amd64 ../lib/exec/perfmonger-summarizer_darwin_amd64
+
+clean:
+	rm -f ../lib/exec/perfmonger-recorder_linux_386 ../lib/exec/perfmonger-player_linux_386 ../lib/exec/perfmonger-summarizer_linux_386 ../lib/exec/perfmonger-recorder_linux_amd64 ../lib/exec/perfmonger-player_linux_amd64 ../lib/exec/perfmonger-summarizer_linux_amd64 ../lib/exec/perfmonger-recorder_darwin_amd64 ../lib/exec/perfmonger-player_darwin_amd64 ../lib/exec/perfmonger-summarizer_darwin_amd64
 

data/core/build.sh

@@ -31,18 +31,54 @@ else
     TARGET=("linux 386" "linux amd64"  "darwin amd64")
 fi
 
-set -xe
+set -e
+
+GO_FILES=$(ls subsystem/*.go)
+
+cat <<EOF > Makefile
+# DO NOT EDIT MANUALLY
+# generated by build.sh
+
+GOSRC := $(echo ${GO_FILES})
+
+.PHONY: all build clean
+
+all: build
+
+EOF
+
+TARGETS=()
 
 for idx in $(seq 0 $((${#TARGET[@]}-1))); do
     set -- ${TARGET[$idx]}
     export GOOS=$1
     export GOARCH=$2
 
-    go build -o ../lib/exec/perfmonger-recorder_${GOOS}_${GOARCH} \
-        perfmonger-recorder.go
-    go build -o ../lib/exec/perfmonger-player_${GOOS}_${GOARCH} \
-        perfmonger-player.go
-    go build -o ../lib/exec/perfmonger-summarizer_${GOOS}_${GOARCH} \
-        perfmonger-summarizer.go
+    for subcmd in recorder player summarizer; do
+        TARGETS+=(../lib/exec/perfmonger-${subcmd}_${GOOS}_${GOARCH})
+
+        cat <<EOF >> Makefile
+
+../lib/exec/perfmonger-${subcmd}_${GOOS}_${GOARCH}: perfmonger-${subcmd}.go \$(GOSRC)
+	go build -o \$@ perfmonger-$subcmd.go
+
+EOF
+    done
+
+    # go build -o ../lib/exec/perfmonger-recorder_${GOOS}_${GOARCH} \
+    #     perfmonger-recorder.go &
+    # go build -o ../lib/exec/perfmonger-player_${GOOS}_${GOARCH} \
+    #     perfmonger-player.go &
+    # go build -o ../lib/exec/perfmonger-summarizer_${GOOS}_${GOARCH} \
+    #    perfmonger-summarizer.go &
+
 done
 
+cat <<EOF >> Makefile
+
+build: ${TARGETS[*]}
+
+clean:
+	rm -f ${TARGETS[*]}
+
+EOF

data/core/perfmonger-player.go

@@ -27,8 +27,7 @@ func showCpuStat(buffer *bytes.Buffer, prev_rec *ss.StatRecord, cur_rec *ss.Stat
 func showDiskStat(buffer *bytes.Buffer, prev_rec *ss.StatRecord, cur_rec *ss.StatRecord) error {
 	dusage, err := ss.GetDiskUsage(
 		prev_rec.Time, prev_rec.Disk,
-		cur_rec.Time, cur_rec.Disk,
-	)
+		cur_rec.Time, cur_rec.Disk)
 	if err != nil {
 		return err
 	}

data/core/perfmonger-recorder.go

@@ -8,10 +8,15 @@ import (
 	"flag"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"os"
 	"os/exec"
 	"os/signal"
+	"os/user"
+	"path"
+	"strconv"
 	"strings"
+	"syscall"
 	"time"
 
 	"golang.org/x/crypto/ssh/terminal"
@@ -111,6 +116,55 @@ 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)
+	}
+	session_file := path.Join(os.TempDir(),
+		fmt.Sprintf("perfmonger-%s-session.pid", user.Username))
+
+	lockfile := path.Join(os.TempDir(), ".perfmonger.lock")
+
+	// make lock file if not exists
+	session_exists := false
+
+	if _, err := os.Stat(lockfile); err != nil {
+		ioutil.WriteFile(lockfile, []byte(""), 0644)
+	}
+	fd, _ := syscall.Open("lock", syscall.O_RDONLY, 0000)
+	defer syscall.Close(fd)
+	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
+		}
+
+		proc, err := os.FindProcess(pid)
+		err = proc.Signal(syscall.Signal(0))
+
+		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)
+	}
+
+Unlock:
+	syscall.Flock(fd, syscall.LOCK_UN)
+
+	if session_exists {
+		fmt.Fprintf(os.Stderr, "[ERROR] another perfmonger is already running.\n")
+		return
+	}
+
 	parseArgs()
 
 	hostname, _ := os.Hostname()

data/core/perfmonger-summarizer.go

@@ -9,24 +9,31 @@ import (
 	"fmt"
 	"io"
 	"os"
+	"regexp"
 	"sort"
 
 	ss "github.com/hayamiz/perfmonger/core/subsystem"
 )
 
 type SummaryOption struct {
-	logfile string
-	title   string
-	json    bool
+	logfile         string
+	title           string
+	json            bool
+	disk_only       string
+	disk_only_regex *regexp.Regexp
 }
 
 var option SummaryOption
 
 func parseArgs() {
+	var err error
+
 	flag.BoolVar(&option.json, "json",
 		false, "Show summary in JSON")
 	flag.StringVar(&option.title, "title",
 		"", "Title of summary")
+	flag.StringVar(&option.disk_only, "disk-only",
+		"", "Select disk devices by regex")
 
 	flag.Parse()
 
@@ -34,6 +41,11 @@ func parseArgs() {
 		os.Exit(1)
 	}
 
+	option.disk_only_regex, err = regexp.Compile(option.disk_only)
+	if err != nil {
+		panic(err)
+	}
+
 	option.logfile = flag.Args()[0]
 }
 
@@ -99,9 +111,10 @@ func main() {
 	}
 
 	if fst_record.Disk != nil && lst_record.Disk != nil {
-		disk_usage, err = ss.GetDiskUsage(
+		disk_usage, err = ss.GetDiskUsage1(
 			fst_record.Time, fst_record.Disk,
-			lst_record.Time, lst_record.Disk)
+			lst_record.Time, lst_record.Disk,
+			option.disk_only_regex)
 	}
 
 	if fst_record.Disk != nil && lst_record.Disk != nil {

data/core/subsystem/usage.go

@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"regexp"
 	"sort"
 	"time"
 )
@@ -199,6 +200,11 @@ func avgDelta(v int64, w int64, interval float64) float64 {
 }
 
 func GetDiskUsage(t1 time.Time, d1 *DiskStat, t2 time.Time, d2 *DiskStat) (*DiskUsage, error) {
+	return GetDiskUsage1(t1, d1, t2, d2, nil)
+}
+
+func GetDiskUsage1(t1 time.Time, d1 *DiskStat, t2 time.Time, d2 *DiskStat,
+	filter *regexp.Regexp) (*DiskUsage, error) {
 	interval := t2.Sub(t1)
 	itv := interval.Seconds()
 
@@ -219,6 +225,11 @@ func GetDiskUsage(t1 time.Time, d1 *DiskStat, t2 time.Time, d2 *DiskStat) (*Disk
 
 	for _, entry1 := range d1.Entries {
 		name := entry1.Name
+		if filter != nil {
+			if !filter.MatchString(name) {
+				continue
+			}
+		}
 		var entry2 *DiskStatEntry = nil
 		for _, e := range d2.Entries {
 			if e.Name == entry1.Name {

data/lib/perfmonger/command/plot.rb

@@ -24,6 +24,7 @@ EOS
     @output_type = 'pdf'
     @output_prefix = ''
     @save_gpfiles = false
+    @disk_only_regex = nil
   end
 
   def parse_args(argv)
@@ -72,6 +73,9 @@ EOS
       @save_gpfiles = true
     end
 
+    @parser.on('--disk-only REGEX', "Select disk devices that matches REGEX") do |regex|
+      @disk_only_regex = Regexp.compile(regex)
+    end
 
     @parser.parse!(argv)
 
@@ -143,6 +147,12 @@ EOS
           start_time ||= time
           devices ||= diskinfo["devices"]
 
+          if @disk_only_regex
+            devices = devices.select do |devname|
+              devname =~ @disk_only_regex
+            end
+          end
+
           datafile.puts([time - start_time,
                          devices.map{|device|
                            [diskinfo[device]["riops"], diskinfo[device]["wiops"],

data/lib/perfmonger/command/record.rb

@@ -2,6 +2,7 @@ require 'optparse'
 require 'tempfile'
 require 'tmpdir'
 require 'json'
+require 'etc'
 
 module PerfMonger
 module Command
@@ -16,15 +17,24 @@ class RecordCommand < BaseCommand
   def run(argv)
     @argv, @option = PerfMonger::Command::RecordOption.parse(argv)
 
-    exec_record_cmd()
+    if @option.kill
+      session_file = File.expand_path(sprintf("perfmonger-%s-session.pid", Etc.getlogin),
+                                      Dir.tmpdir)
+      Process.kill(:INT, File.read(session_file).to_i)
+    else
+      exec_record_cmd()
+    end
   end
 
 private
   def exec_record_cmd()
     cmd = @option.make_command
 
-    $stdout.puts("[recording to #{@option.logfile}]")
-
+    if @option.background
+      Process.daemon(true)
+    else
+      $stdout.puts("[recording to #{@option.logfile}]")
+    end
     Process.exec(*cmd)
   end
 end

data/lib/perfmonger/command/record_option.rb

@@ -9,6 +9,8 @@ class RecordOption
   attr_reader :report_cpu
   attr_reader :no_disk
   attr_reader :logfile
+  attr_reader :background
+  attr_reader :kill
 
   attr_reader :parser
   attr_accessor :record_bin
@@ -83,6 +85,8 @@ class RecordOption
     @no_disk           = false
     @devices           = []
     @logfile           = "perfmonger.pgr"
+    @background            = false
+    @kill              = false
 
     @parser = OptionParser.new
 
@@ -120,6 +124,14 @@ class RecordOption
       @logfile = file
     end
 
+    @parser.on('--background', 'Run in background') do
+      @background = true
+    end
+
+    @parser.on('--kill', 'Stop currently running perfmonger-reocrd') do
+      @kill = true
+    end
+
     @parser.on('-v', '--verbose') do
       @verbose = true
     end

data/lib/perfmonger/command/summary.rb

@@ -18,6 +18,7 @@ EOS
 
     @json = false
     @pager = nil
+    @disk_only_regex = nil
 
     @parser.on('--json', "Output summary in JSON") do
       @json = true
@@ -37,6 +38,10 @@ EOS
         @pager = pager
       end
     end
+
+    @parser.on('--disk-only REGEX', "Select disk devices that matches REGEX") do |regex|
+      @disk_only_regex = regex
+    end
   end
 
   def parse_args(argv)
@@ -74,6 +79,11 @@ EOS
       cmd << "-json"
     end
 
+    if @disk_only_regex
+      cmd << "-disk-only"
+      cmd << @disk_only_regex
+    end
+
     cmd << "-title"
     cmd << summary_title
 

data/lib/perfmonger/version.rb

@@ -1,3 +1,3 @@
 module PerfMonger
-  VERSION = "0.7.1"
+  VERSION = "0.8.0"
 end

data/perfmonger.gemspec

@@ -22,7 +22,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency "guard-rspec"
   s.add_development_dependency "aruba"
 
-  s.files       = `git ls-files`.split("\n")
+  s.files       = `git ls-files`.split("\n").select do |file|
+    ! (file =~ /^dbg\//)
+  end
   s.files      += Dir.glob("lib/exec/*")
   s.test_files  = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}
@@ -34,7 +36,7 @@ Gem::Specification.new do |s|
 Thank you for installing perfmonger.
 Try to start performance monitoring with:
 
-    perfmonger record
+    perfmonger live
 
 Enjoy.
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perfmonger
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Yuto HAYAMIZU
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-02 00:00:00.000000000 Z
+date: 2016-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -195,7 +195,7 @@ post_install_message: |2+
   Thank you for installing perfmonger.
   Try to start performance monitoring with:
 
-      perfmonger record
+      perfmonger live
 
   Enjoy.
 
@@ -216,19 +216,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: yet anothor performance measurement/monitoring tool
-test_files:
-- spec/data/busy100.pgr
-- spec/fingerprint_spec.rb
-- spec/live_spec.rb
-- spec/perfmonger_spec.rb
-- spec/play_spec.rb
-- spec/plot_spec.rb
-- spec/record_spec.rb
-- spec/spec_helper.rb
-- spec/stat_spec.rb
-- spec/summary_spec.rb
-- spec/support/aruba.rb
+test_files: []