straces 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45aab18b826338ce96ffcdaee841f0711cbdca95e240d4a723d42d7eaec004fc
-  data.tar.gz: afc9fad238fbc4d25bb8c2a1caabb464d19b94178b8a145596d72923d4b3a5b3
+  metadata.gz: 51245154ff7877023486583fd33719bbfd50a9ef490bea0a132ced5a162a5b61
+  data.tar.gz: 65bc6d33500b88d51a93b96a0d5011e8b8e5accd7004863e2b1251d32d6fa129
 SHA512:
-  metadata.gz: 0ba4d24baf6521ee3f9bc0800b438afb78f15cdcc935a33e56db61ff65e2b588e85eba8ca8ccd538d18d2d55639b8bebe6d99e479619c06d3525fea7fc0d602f
-  data.tar.gz: dfec0976a12e9a6434046b5492894135dd5be51b34d038df6bce469a81e62fd2b63cabc56e2c7b27f67ef8fe459995f8daa822d1b8e568828a0be8e677e9cbf1
+  metadata.gz: acf8587a2631bdd8eff809a1ed4b655718a403b722ec40d08d97f8b7e6e989a39b74154a217bcead9b51c1deac91aaf7df1b2fc8809cf2ad8518543c039d6165
+  data.tar.gz: b119b17004b3019bd434f6abd3900790ac66bf92f00336003d6d2f5627aa20ee76fe5283c510e5c8c87bfb1ddae45b0b0dd0e1bf3df9fff33526f8fe598521c5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    straces (0.0.2)
+    straces (0.1.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/straces.rb

@@ -38,7 +38,22 @@ end
 
 
 def strace_parse(line)
-  matcher = line.match /^(?<pid>\d*)\s?(?<time>\d\d:\d\d:\d\d\.?\d*)?\s?(?<call>[^\(]+)(?<middle>.*)\<(?<timing>\d+\.\d+)\>$/
+  return nil if line.end_with? "<unfinished ...>"
+  return nil if line.end_with? "resumed>)      = ?"
+  return nil if line.end_with? "+++ exited with 0 +++"
+  # accept4(3,
+  return nil if line.end_with? ", "
+  matcher = line.match /^(?<pid>\d*)\s?(?<time>\d\d:\d\d:\d\d\.?\d*)?\s?(?<interrupted>\<\.\.\.)?(?<call>[^\(]+)(?<middle>.*)?\<(?<timing>\d+\.\d+)\>$/
+
+  #63796 11:18:12 clock_gettime(CLOCK_MONOTONIC, {tv_sec=27510, tv_nsec=693534954}) = 0 <0.000108>
+  #63796 11:18:12 <... clock_gettime resumed> {tv_sec=27510, tv_nsec=648632454}) = 0 <0.000356>
+
+  call, middle = if matcher[:interrupted]
+    syscall, rest = matcher[:call].split(" ")
+    [syscall, rest]
+  else
+    [matcher[:call], matcher[:middle]]
+  end
 
   # <detached ..>
   timing = Float matcher[:timing] rescue 0.0
@@ -46,8 +61,8 @@ def strace_parse(line)
   if matcher
     {
       pid: matcher[:pid],
-      call: matcher[:call],
-      middle: matcher[:middle],
+      call: call,
+      middle: middle,
       timing: timing
     }
   else
@@ -105,10 +120,10 @@ objs.each_with_index do |obj, i|
       obj[:time].round(4).to_s.ljust(6, "0"),
       obj[:timing].round(6).to_s.ljust(8, "0"),
       obj[:call].ljust(16),
-      "#"*(obj[:normalized] == 0 ? 1 : obj[:normalized])
+      "#".green*(obj[:normalized] == 0 ? 1 : obj[:normalized])
     ].join " "
   else
-    matches = filter.match /^(?<comparator>gt|lt|ge|le|eq)=(?<value>\d+\.?\d*)$/
+    matches = filter.match /^(?<comparator>at|gt|lt|ge|le|eq)=(?<value>\d+\.?\d*)$/
     comparator = matches && matches[:comparator]
     value = Float matches[:value] rescue nil
     if comparator.nil? || value.nil?
@@ -125,16 +140,22 @@ objs.each_with_index do |obj, i|
       :<
     when "lte"
       :<=
-    when "eq"
+    when "eq","at"
       :==
     end
 
-    if obj[:timing].send(ruby_comparator, value)
+    target = if comparator == "at"
+      obj[:time].round(4)
+    else
+      obj[:timing]
+    end
+
+    if target.send(ruby_comparator, value)
       terminal_width=Integer `tput cols`
       puts "-"*terminal_width
-      puts objs[i-lines_before..i-1].map {|o| format(o)}
-      puts format(objs[i]).red
-      puts objs[i+1..i+lines_after].map {|o| format(o)}
+      puts objs[i-lines_before..i-1].map {|o| format(o) + "\n" + "#".green*(o[:normalized] == 0 ? 1 : o[:normalized])}
+      puts format(objs[i]).red + "\n" + "#".green*(objs[i][:normalized] == 0 ? 1 : objs[i][:normalized])
+      puts objs[i+1..i+lines_after].map {|o| format(o) + "\n" + "#".green*(o[:normalized] == 0 ? 1 : o[:normalized])}
 
       puts ""
     end

data/straces.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "straces"
-  spec.version       = "0.0.2"
+  spec.version       = "0.1.0"
   spec.authors       = ["Matti Paksula"]
   spec.email         = ["matti.paksula@iki.fi"]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: straces
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Matti Paksula