perfmonger 0.6.1 → 0.7.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZjYxZGNiY2FkYjQ5NGQ4ZjMxNmI4YmM4NDU4NTNhMTA4NzU1NmU4Zg==
-  data.tar.gz: !binary |-
-    ZGJlMDQyNzEyZWEzNWNiNGRjNGVmZjAzNzdlOGRkYTcwZjBlODllZg==
+SHA1:
+  metadata.gz: 10a0e056a4c32cbdcd8fda187002844cd405f5cb
+  data.tar.gz: 6e06674d6d084318310627d557d7ae44255ef75e
 SHA512:
-  metadata.gz: !binary |-
-    YjhlNDk4OTc0NjkwOGEzODU2MDU5MTQ4ZDE3OTkzYjY4OTZjZjAyNmU1YTk3
-    MzI4Zjk1NjY1ZDcxMjQ0NTUxMTVmMDg5NjcwNmY4ODM5ZWJkZGIxZjhiNTg2
-    ZDk4YTFhNzlkNTk2NGJkNjU4ZWUzNDU2MDY4M2NkOTAxMWYzY2Y=
-  data.tar.gz: !binary |-
-    NGU2YTBmNTY2NTdjODQ2ZjkxMWExYTJkNDBjYjhhNGQxYWNjYzMzODQ4M2M3
-    YWZhYmY4NmI3YTUzMGY4N2NkMDM4YWMyM2VkYzg3ZTBkYWI2YmU2MWJhYzMw
-    NjA5MDBiMjE2NzJlODMwYTU2ZDM5MWEyZDhmYTMxMTI3YTZlM2U=
+  metadata.gz: 096dc5864583310417f8c2906305f2806bf1a104b4ea7b5c942b61c271c9c0b997338eb8fc2bbd2de8458fe027cb6856a8034d7f5c030c9a97892db3b5741143
+  data.tar.gz: 6e01993d4c7bab480c0161f23d415dc608d5ce0409a5670193e8fa11b39b9c13359805ed7eac72410a37b2966125599a990865bcd4be24e16835548e64b86d3b

data/.gitignore

@@ -2,3 +2,9 @@
 /perfmonger-*.gem
 /pkg
 /tmp
+/Gemfile.lock
+/core/perfmonger-player
+/core/perfmonger-recorder
+/lib/exec/
+/ext/perfmonger/Makefile
+/core/perfmonger-summarizer

data/.tachikoma.yml

@@ -0,0 +1 @@
+strategy: 'bundler'

data/.travis.yml

@@ -1,12 +1,24 @@
 
 language: ruby
 install:
-  - sudo apt-get install libglib2.0-dev autotools-dev
+  - sudo apt-get update
+  - sudo apt-get install gnuplot
+  - gnuplot -e "set terminal" < /dev/null 2>&1
   - bundle install
-before_script:
-  - ./autogen.sh
-  - ./configure
-  - make
+  - go_version="1.4.2"
+  - wget http://golang.org/dl/go${go_version}.linux-amd64.tar.gz
+  - sudo tar -C /usr/local -xzf go${go_version}.linux-amd64.tar.gz
+  - export PATH=$PATH:/usr/local/go/bin
+  - export GOPATH="$HOME/go"
+  - export PATH="$PATH:$GOPATH/bin"
+  - mkdir -p "$HOME/go/{src,pkg,bin}"
+  - go get -u golang.org/x/crypto/ssh/terminal
+  - go get -u github.com/hayamiz/perfmonger/core/subsystem
 rvm:
-  - 1.8.7
   - 1.9.3
+  - 2.0.0
+  - 2.1.5
+  - 2.2.0
+script:
+  - rake spec
+  - rake test_core

data/Gemfile

@@ -1,5 +1,3 @@
 source 'http://rubygems.org'
 
-gem 'rake'
-gem 'rspec'
-gem 'rake-compiler'
+gemspec

data/Guardfile

@@ -0,0 +1,26 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+## Uncomment and set this to only include directories you want to watch
+# directories %w(app lib config test spec features)
+
+## Uncomment to clear the screen before every task
+# clearing :on
+
+guard :rspec, cmd: "bundle exec rspec" do
+  require "guard/rspec/dsl"
+  dsl = Guard::RSpec::Dsl.new(self)
+
+  # Feel free to open issues for suggestions and improvements
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  ruby = dsl.ruby
+  dsl.watch_spec_files_for(ruby.lib_files)
+  watch(%r{^lib/(.+)\.rb$}) { "spec" }
+end

data/NEWS

@@ -1,3 +1,24 @@
+## 2015-03-08: PerfMonger 0.7.0 released
+
+  * New features
+    * Bash completion support
+    * Zsh completion support
+    * [live] subcommand:
+      * Record and play perfmonger log in JSON
+    * [record] subcommand:
+      * Add Network device usage
+    * [play] subcommand:
+      * Play a perfmonger log and print in JSON
+  * Changes
+    * [record] subcommand:
+      * Its core was completely rewritten in Go and records data in encoding/gob format
+      * Carve out JSON output function to [play] subcommand
+  * Bug fixes
+    * [plot] subcommand:
+      * Correctly find supported terminal
+    * [server] subcommand:
+      * Disambiguate command line options
+
 ## 2015-01-18: PerfMonger 0.6.0 released
 
   * New features

data/README.md

@@ -1,6 +1,10 @@
  PerfMonger
 ============
 
+[![Build Status](https://travis-ci.org/hayamiz/perfmonger.svg?branch=master)](https://travis-ci.org/hayamiz/perfmonger)
+
+[![wercker status](https://app.wercker.com/status/44c3ade6a2406d337df6d93097a52fdf/m "wercker status")](https://app.wercker.com/project/bykey/44c3ade6a2406d337df6d93097a52fdf)
+
 PerfMonger is an yet anothor performance measurement/monitoring tool
 speaking JSON.
 
@@ -12,23 +16,18 @@ speaking JSON.
 
 ## Prerequisites
 
-  * Ruby 1.8.7 or later
-    * Ruby 1.9.3 or later is recommended
-  * gnuplot (optional)
+  * Ruby 1.9.3 or later
+  * gnuplot 4.6.0 or later (optional)
 
 Note: You need Cutter unit testing framework for building/running tests.
 
 ## How to install
 
-### RHEL or CentOS
-
-    rpm -Uvh http://package.hayamiz.com/hayamiz-repos-1.0.0-0.noarch.rpm
-    yum install perfmonger
+    gem install perfmonger
 
 ### Build from source
 
-    ./configure
-    sudo make install
+    rake build
 
 ## How to use: case study
 

data/Rakefile

@@ -2,7 +2,39 @@ require 'rubygems'
 require 'rspec/core/rake_task'
 require "bundler/gem_tasks"
 
-task :default => [:spec]
+task :default => [:spec, :test_core]
 
 desc "Run all specs in spec directory"
 RSpec::Core::RakeTask.new(:spec)
+
+task :spec => [:self_build_core]
+
+desc "Cross build core recorder/player"
+task :cross_build_core do
+  puts "Buildling binaries for each platform"
+  Dir.chdir("./core") do
+    sh "./build.sh"
+  end
+end
+
+desc "Self build core recorder/player"
+task :self_build_core do
+  Dir.chdir("./core") do
+    sh "./build.sh -"
+  end
+end
+
+task :build => :cross_build_core
+
+desc "Run tests of core recorder/player"
+task :test_core do
+  Dir.chdir("./core/subsystem") do
+    sh "go test -v -cover"
+  end
+end
+
+desc "Removed generated files"
+task :clean do
+  sh "make -C core clean"
+end
+

data/core/Makefile

@@ -0,0 +1,23 @@
+
+GOSRC :=                                        \
+        subsystem/perfmonger.go                 \
+        subsystem/perfmonger_linux.go           \
+        subsystem/stat.go                       \
+        subsystem/usage.go
+
+.PHONY: all clean
+
+all: perfmonger-recorder perfmonger-player perfmonger-summarizer
+
+clean:
+	rm -f perfmonger-recorder perfmonger-player perfmonger-summarizer
+
+perfmonger-recorder: perfmonger-recorder.go $(GOSRC)
+	go build $<
+
+perfmonger-player: perfmonger-player.go $(GOSRC)
+	go build $<
+
+perfmonger-summarizer: perfmonger-summarizer.go $(GOSRC)
+	go build $<
+

data/core/build.sh

@@ -0,0 +1,48 @@
+#!/bin/bash
+
+READLINK=$(type -p greadlink readlink | head -1)
+cd $(dirname $($READLINK -f $0))
+
+if [ $1 = "-" ]; then
+    # do self build
+    case `uname -s` in
+        (Linux)
+            os="linux"
+            ;;
+        (Darwin)
+            os="darwin"
+            ;;
+        (*)
+            os=""
+            ;;
+    esac
+    case `uname -m` in
+        (x86_64|amd64)
+            arch="amd64"
+            ;;
+        (*)
+            arch=""
+            ;;
+    esac
+
+    TARGET=("${os} ${arch}")
+else
+    # cross build
+    TARGET=("linux 386" "linux amd64"  "darwin amd64")
+fi
+
+set -xe
+
+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
+done
+

data/core/perfmonger-player.go

@@ -0,0 +1,165 @@
+//usr/bin/env go run $0 $@ ; exit
+
+package main
+
+import (
+	"bufio"
+	"bytes"
+	"encoding/gob"
+	"fmt"
+	"io"
+	"os"
+
+	ss "github.com/hayamiz/perfmonger/core/subsystem"
+)
+
+func showCpuStat(buffer *bytes.Buffer, prev_rec *ss.StatRecord, cur_rec *ss.StatRecord) error {
+	cusage, err := ss.GetCpuUsage(prev_rec.Cpu, cur_rec.Cpu)
+	if err != nil {
+		return err
+	}
+	buffer.WriteString(`,"cpu":`)
+	cusage.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,
+		cur_rec.Time, cur_rec.Disk,
+	)
+	if err != nil {
+		return err
+	}
+
+	buffer.WriteString(`,"disk":`)
+	dusage.WriteJsonTo(buffer)
+
+	return nil
+}
+
+func showNetStat(buffer *bytes.Buffer, prev_rec *ss.StatRecord, cur_rec *ss.StatRecord) error {
+	dusage, err := ss.GetNetUsage(
+		prev_rec.Time, prev_rec.Net,
+		cur_rec.Time, cur_rec.Net,
+	)
+	if err != nil {
+		return err
+	}
+
+	buffer.WriteString(`,"net":`)
+	dusage.WriteJsonTo(buffer)
+
+	return nil
+}
+
+func showStat(buffer *bytes.Buffer, prev_rec *ss.StatRecord, cur_rec *ss.StatRecord) error {
+	buffer.WriteString(fmt.Sprintf(`{"time":%.3f`, float64(cur_rec.Time.UnixNano())/1e9))
+	if cur_rec.Cpu != nil {
+		err := showCpuStat(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 {
+			return err
+		}
+	}
+	if cur_rec.Net != nil {
+		err := showNetStat(buffer, prev_rec, cur_rec)
+		if err != nil {
+			return err
+		}
+	}
+	buffer.WriteString("}\n")
+
+	return nil
+}
+
+func main() {
+	args := os.Args
+	var in *os.File
+	var out *bufio.Writer
+
+	if len(args) < 2 {
+		in = os.Stdin
+	} else {
+		f, err := os.Open(args[1])
+		if err != nil {
+			panic(err)
+		}
+		in = f
+		defer f.Close()
+	}
+
+	out = bufio.NewWriter(os.Stdout)
+
+	dec := gob.NewDecoder(in)
+
+	var cheader ss.CommonHeader
+	var pheader ss.PlatformHeader
+	var records = make([]ss.StatRecord, 2)
+	curr := 0
+
+	var err error
+
+	err = dec.Decode(&cheader)
+	if err == io.EOF {
+		return
+	}
+	if err != nil {
+		panic(err)
+	}
+	err = dec.Decode(&pheader)
+	if err == io.EOF {
+		return
+	}
+	if err != nil {
+		panic(err)
+	}
+
+	// read first record
+	err = dec.Decode(&records[curr])
+	if err == io.EOF {
+		return
+	} else if err != nil {
+		panic(err)
+	}
+	curr ^= 1
+
+	buffer := bytes.NewBuffer([]byte{})
+	for {
+		prev_rec := &records[curr^1]
+		cur_rec := &records[curr]
+
+		err = dec.Decode(cur_rec)
+		if err == io.EOF {
+			break
+		} else if err != nil {
+			panic(err)
+		}
+
+		err = showStat(buffer, prev_rec, cur_rec)
+		if err != nil {
+			buffer.Reset()
+			fmt.Fprintln(os.Stderr, "skip by err")
+			continue
+		}
+
+		_, err = out.WriteString(buffer.String())
+		err = out.Flush()
+		if err != nil {
+			// stdout is closed
+			break
+		}
+
+		buffer.Reset()
+
+		curr ^= 1
+	}
+
+	return
+}