perfmonger 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10a0e056a4c32cbdcd8fda187002844cd405f5cb
-  data.tar.gz: 6e06674d6d084318310627d557d7ae44255ef75e
+  metadata.gz: bb47ad299c6b0e503298b6fd345357760f6db238
+  data.tar.gz: bc212e88228a080c65dfedbb8c96437130d03838
 SHA512:
-  metadata.gz: 096dc5864583310417f8c2906305f2806bf1a104b4ea7b5c942b61c271c9c0b997338eb8fc2bbd2de8458fe027cb6856a8034d7f5c030c9a97892db3b5741143
-  data.tar.gz: 6e01993d4c7bab480c0161f23d415dc608d5ce0409a5670193e8fa11b39b9c13359805ed7eac72410a37b2966125599a990865bcd4be24e16835548e64b86d3b
+  metadata.gz: 9a4f21ab77b86679b78a9ca8628bc6bfbecec598ab2001397a6bb22aaa78cb4aa2cb7aa8de787e858da05666232161c59e53d980a6952355f083bd337350d84f
+  data.tar.gz: d5ac7fadddd9ae96b9da5d4036081fff64f7737db49259ac7ec406cc11491211662b001479c01039c674b0423ce3f6346cf8234e268860362baa4789bed61521

data/NEWS

@@ -1,3 +1,9 @@
+## 2016-10-02: PerfMonger 0.7.1 released
+
+  * Bug fix
+    * [record] subcommand:
+      * Parse /proc/stat with 10 columns (9 values) correctly
+
 ## 2015-03-08: PerfMonger 0.7.0 released
 
   * New features

data/core/build.sh

@@ -3,7 +3,7 @@
 READLINK=$(type -p greadlink readlink | head -1)
 cd $(dirname $($READLINK -f $0))
 
-if [ $1 = "-" ]; then
+if [[ $1 = "-" ]]; then
     # do self build
     case `uname -s` in
         (Linux)

data/core/subsystem/perfmonger_linux.go

@@ -109,6 +109,7 @@ func ReadCpuStat(record *StatRecord) error {
 		var cpu string
 		line := scan.Text()
 		if line[0:4] == "cpu " {
+			// Linux 2.6.33 or later
 			_, err = fmt.Sscanf(line,
 				"%s %d %d %d %d %d %d %d %d %d %d",
 				&cpu,
@@ -122,8 +123,24 @@ func ReadCpuStat(record *StatRecord) error {
 				&record.Cpu.All.Steal,
 				&record.Cpu.All.Guest,
 				&record.Cpu.All.GuestNice)
+			if err == io.EOF {
+				// Linux 2.6.24 or later
+				_, err = fmt.Sscanf(line,
+					"%s %d %d %d %d %d %d %d %d %d",
+					&cpu,
+					&record.Cpu.All.User,
+					&record.Cpu.All.Nice,
+					&record.Cpu.All.Sys,
+					&record.Cpu.All.Idle,
+					&record.Cpu.All.Iowait,
+					&record.Cpu.All.Hardirq,
+					&record.Cpu.All.Softirq,
+					&record.Cpu.All.Steal,
+					&record.Cpu.All.Guest)
+				record.Cpu.All.GuestNice = 0
+			}
 			if err != nil {
-				return err
+				panic(err)
 			}
 		} else if line[0:3] == "cpu" {
 			var n_core int
@@ -131,10 +148,11 @@ func ReadCpuStat(record *StatRecord) error {
 			// assume n_core < 10000
 			_, err = fmt.Sscanf(line[3:7], "%d", &n_core)
 			if err != nil {
-				return err
+				panic(err)
 			}
 
 			core_stat = &record.Cpu.CoreStats[n_core]
+			// Linux 2.6.33 or later
 			_, err = fmt.Sscanf(line,
 				"%s %d %d %d %d %d %d %d %d %d %d",
 				&cpu,
@@ -148,18 +166,33 @@ func ReadCpuStat(record *StatRecord) error {
 				&core_stat.Steal,
 				&core_stat.Guest,
 				&core_stat.GuestNice)
+			if err == io.EOF {
+				// Linux 2.6.24 or later
+				_, err = fmt.Sscanf(line,
+					"%s %d %d %d %d %d %d %d %d %d",
+					&cpu,
+					&core_stat.User,
+					&core_stat.Nice,
+					&core_stat.Sys,
+					&core_stat.Idle,
+					&core_stat.Iowait,
+					&core_stat.Hardirq,
+					&core_stat.Softirq,
+					&core_stat.Steal,
+					&core_stat.Guest)
+			}
 			if err != nil {
-				return err
+				panic(err)
 			}
 		} else if line[0:5] == "ctxt " {
 			_, err = fmt.Sscanf(line[4:], "%d", &record.Proc.ContextSwitch)
 			if err != nil {
-				return err
+				panic(err)
 			}
 		} else if line[0:10] == "processes " {
 			_, err = fmt.Sscanf(line[10:], "%d", &record.Proc.Fork)
 			if err != nil {
-				return err
+				panic(err)
 			}
 		}
 	}

data/lib/perfmonger/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perfmonger
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Yuto HAYAMIZU
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-07 00:00:00.000000000 Z
+date: 2016-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -141,7 +141,6 @@ files:
 - data/assets/js/canvasjs.js
 - data/assets/js/canvasjs.min.js
 - data/sysstat.ioconf
-- lib/exec/operationBinding.rb.svn-base
 - lib/exec/perfmonger-player_darwin_amd64
 - lib/exec/perfmonger-player_linux_386
 - lib/exec/perfmonger-player_linux_amd64
@@ -151,8 +150,6 @@ files:
 - lib/exec/perfmonger-summarizer_darwin_amd64
 - lib/exec/perfmonger-summarizer_linux_386
 - lib/exec/perfmonger-summarizer_linux_amd64
-- lib/exec/perfmonger-summary_linux_386
-- lib/exec/perfmonger-summary_linux_amd64
 - lib/perfmonger.rb
 - lib/perfmonger/cli.rb
 - lib/perfmonger/command/base_command.rb
@@ -219,8 +216,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: yet anothor performance measurement/monitoring tool
-test_files: []
+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

data/lib/exec/operationBinding.rb.svn-base

@@ -1,59 +0,0 @@
-package subsystem
-
-import (
-    "time"
-)
-
-/*
-
-PerfMonger binary format:
-
-1. Common header
-  * platform type tag
-  * host info
-  * timestamp
-  * ...
-2. Platform-dependent header
-  * List of devices
-  * List of NICs
-  * List of IRQs
-  * CPU topology
-  * ...
-3. Record section
-  * Platform-dependent record data stream
-
-*/
-
-
-
-//
-// Common header
-//
-
-const (
-    Linux = 1
-    Darwin = 2
-)
-
-type PlatformType int
-
-type CommonHeader struct {
-    Platform	PlatformType
-    Hostname	string
-    StartTime	time.Time
-}
-
-
-//
-// Platform-dependent header
-//
-
-type LinuxDevice struct {
-    Name	string
-    Parts	[]string
-}
-
-type LinuxHeader struct {
-    Devices	map[string]LinuxDevice
-    DevsParts	[]string
-}