perfmonger 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b02aaea69043dcf1560fd042e2af5f571c88e06
-  data.tar.gz: 07081ebc86aa30f921b360cc0c2d82fd958d3c7f
+  metadata.gz: 2473ae93c9047e6068b972263656d9565cdc0d01
+  data.tar.gz: 834719a3b8b0b1a063b8e278b9743337de831ca0
 SHA512:
-  metadata.gz: 3d4c1d36d69a8d010574985ef3ca8e1760c715b9eb079d87cc4eab5de9adf6a05373a01d351e5286e8000f7fe90148e2af7ac3036abc9eab3bc9a0c329bd18d0
-  data.tar.gz: 98347d85d24cdbd38ee6cf39cf1a6961a957a56da0d4c17700a2a8dfeb93c2e9438c9953f9bcd5233644249c2f659f1f6c4e4ec9c785bc3cb3835051efa04f98
+  metadata.gz: c164cd5d9d02768c1d64272340994977d44992d60dcf6e00c080b2dac5f638f2a1ce11d7bc4e00d745c1018e4312e23812c4b2b352cea9c6a87d77d0928c6faf
+  data.tar.gz: 3d44cf43be8f8e963f4531e992ff1abd996235c0c0fc9cfe46ae1d3127aa55fed869efcfaf6c8c12fb27ee2877961044d5c3b422f54ab154163e3efaae55307e

data/NEWS

@@ -1,6 +1,15 @@
 ## XXXX-XX-XX: PerfMonger 0.9.0
   * ...
 
+## 2016-11-22: PerfMonger 0.8.1
+  * New features
+    * [record] subcommand:
+      * Add --status to check currently running session
+  * Bug fixes
+    * [record] subcommand:
+      * Open correct lock file for session management
+      * Error handling in --kill processing (no session, already dead session PID)
+
 ## 2016-11-22: PerfMonger 0.8.0
   * New features
     * [record] subcommand:

data/bin/perfmonger

@@ -3,4 +3,4 @@
 
 require 'perfmonger'
 
-PerfMonger::CLI::Runner.new.run(ARGV)
+exit(PerfMonger::CLI::Runner.new.run(ARGV))

data/core/perfmonger-recorder.go

@@ -132,8 +132,7 @@ func main() {
 	if _, err := os.Stat(lockfile); err != nil {
 		ioutil.WriteFile(lockfile, []byte(""), 0644)
 	}
-	fd, _ := syscall.Open("lock", syscall.O_RDONLY, 0000)
-	defer syscall.Close(fd)
+	fd, _ := syscall.Open(lockfile, syscall.O_RDONLY, 0000)
 	syscall.Flock(fd, syscall.LOCK_EX)
 
 	if _, err := os.Stat(session_file); err == nil {
@@ -143,6 +142,7 @@ func main() {
 			goto MakeNewSession
 		}
 
+		// check if PID in session file is valid
 		proc, err := os.FindProcess(pid)
 		err = proc.Signal(syscall.Signal(0))
 
@@ -156,9 +156,11 @@ MakeNewSession:
 	if err != nil {
 		panic(err)
 	}
+	defer os.Remove(session_file)
 
 Unlock:
 	syscall.Flock(fd, syscall.LOCK_UN)
+	syscall.Close(fd)
 
 	if session_exists {
 		fmt.Fprintf(os.Stderr, "[ERROR] another perfmonger is already running.\n")

data/lib/perfmonger/command/record.rb

@@ -8,6 +8,8 @@ module PerfMonger
 module Command
 
 class RecordCommand < BaseCommand
+  LOCKFILE = File.expand_path(".perfmonger.lock", Dir.tmpdir())
+
   register_command 'record', 'Record system performance information'
 
   def initialize
@@ -17,13 +19,78 @@ class RecordCommand < BaseCommand
   def run(argv)
     @argv, @option = PerfMonger::Command::RecordOption.parse(argv)
 
+    session_file = File.expand_path(sprintf("perfmonger-%s-session.pid", Etc.getlogin),
+                                    Dir.tmpdir)
+    begin
+      session_pid = File.read(session_file).to_i
+    rescue Errno::ENOENT
+      # No session file
+      session_pid = nil
+    end
+
     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()
+      unless session_pid
+        # There is nothing to be killed
+        return true
+      end
+
+      begin
+        Process.kill(:INT, session_pid)
+      rescue Errno::ESRCH
+        # Session file has invalid (already dead) PID
+        File.open(LOCKFILE, "w") do |f|
+          f.flock(File::LOCK_EX)
+          FileUtils.rm(session_file)
+          f.flock(File::LOCK_UN)
+        end
+      end
+      return true
     end
+
+    if @option.status
+      unless session_pid
+        puts "[ERROR] No perfmonger-recorder is running."
+        return false
+      end
+
+      begin
+        # check if session_pid is valid
+        gid = Process.getpgid(session_pid)
+
+        cmdline = File.read("/proc/#{session_pid}/cmdline").split("\0")
+        exe = cmdline.shift
+        args = cmdline
+        start_time = File::Stat.new("/proc/#{session_pid}").mtime
+        elapsed_time = Time.now - start_time
+
+        puts <<EOS
+==== perfmonger record is running (PID: #{session_pid}) ====
+
+* Running executable: #{exe}
+* Arguments: #{args.join(" ")}
+* Started at #{start_time} (running #{elapsed_time.to_i} sec)
+
+EOS
+      rescue Errno::ESRCH
+        puts "[ERROR] No perfmonger-recorder is running."
+      end
+
+      return true
+    end
+
+    # run perfmonger-recorder (normal path)
+    begin
+      if session_pid && Process.getpgid(session_pid)
+        $stderr.puts("[ERROR] another perfmonger is already running.")
+        return false
+      end
+    rescue Errno::ESRCH
+      # Actually there is no perfmonger running. go through.
+    end
+
+    exec_record_cmd()
+
+    true
   end
 
 private

data/lib/perfmonger/command/record_option.rb

@@ -11,6 +11,7 @@ class RecordOption
   attr_reader :logfile
   attr_reader :background
   attr_reader :kill
+  attr_reader :status
 
   attr_reader :parser
   attr_accessor :record_bin
@@ -132,6 +133,10 @@ class RecordOption
       @kill = true
     end
 
+    @parser.on('--status', 'Show currently running perfmonger-record status') do
+      @status = true
+    end
+
     @parser.on('-v', '--verbose') do
       @verbose = true
     end

data/lib/perfmonger/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: perfmonger
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Yuto HAYAMIZU