rbtrace 0.3.18 → 0.3.19

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ae8cd64167eb2f3275caf66175c00370018c43fe
+  data.tar.gz: 8d389f4891f37cbbb9e93c4e623542ba213bd88c
+SHA512:
+  metadata.gz: 54aef3a098fb9be86926238e33fe47fea73d64f89aa3762a282ebf71d6bdb7010eb40b51afe3738b79852eacd1fa2387e4e8795d503ffd878e1be44eeeeb1470
+  data.tar.gz: 115be7ca55f189ad6a1a5dfcc0f84346752141ab6a9b8dab3b42ed545af78d72261d92411778599143aa2b6d5a833ca90756572133cc7e26bc3de7f9ce5ec56c

data/Gemfile

@@ -1,2 +1,2 @@
-source :rubygems
+source 'https://rubygems.org'
 gemspec

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    rbtrace (0.3.16)
+    rbtrace (0.3.18)
       ffi (>= 1.0.6)
       msgpack (>= 0.4.3)
       trollop (>= 1.16.2)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     ffi (1.0.11)
     msgpack (0.4.6)

data/bin/rbtrace

@@ -43,7 +43,7 @@ module MsgQ
     end
 
     def self.recv_cmd(q, block=true)
-      MsgQ.rb_enable_interrupt if RUBY_VERSION > '1.9'
+      MsgQ.rb_enable_interrupt if RUBY_VERSION > '1.9' && RUBY_VERSION < '2.0'
 
       msg = EventMsg.new
       ret = MsgQ.msgrcv(q, msg, BUF_SIZE, 0, block ? 0 : IPC_NOWAIT)
@@ -57,7 +57,7 @@ module MsgQ
 
       msg[:buf].to_ptr.read_string_length(BUF_SIZE)
     ensure
-      MsgQ.rb_disable_interrupt if RUBY_VERSION > '1.9'
+      MsgQ.rb_disable_interrupt if RUBY_VERSION > '1.9' && RUBY_VERSION < '2.0'
     end
   end
 
@@ -65,7 +65,7 @@ module MsgQ
   attach_function :msgrcv, [:int, EventMsg.ptr, :size_t, :long, :int], :int
   attach_function :msgsnd, [:int, EventMsg.ptr, :size_t, :int], :int
 
-  if RUBY_VERSION > '1.9'
+  if RUBY_VERSION > '1.9' && RUBY_VERSION < '2.0'
     attach_function :rb_enable_interrupt,  [], :void
     attach_function :rb_disable_interrupt, [], :void
   end
@@ -629,18 +629,37 @@ class RBTracer
       @max_nesting = nesting if nesting > @max_nesting
       @last_nesting = nesting
 
-    when 'gc'
+    when 'gc_start'
       time, = *cmd
+      @gc_start = time
+      print 'garbage_collect'
 
+    when 'gc_end'
+      time, = *cmd
+      diff = time - @gc_start
+      # if @gc_mark
+      #   mark = ((@gc_mark - @gc_start) * 100.0 / diff).to_i
+      #   print '(mark: %d%%, sweep: %d%%)' % [mark, 100-mark]
+      # end
+      print ' <%f>' % (diff/1_000_000.0) if @show_duration
+      @gc_start = nil
       newline
-      if @show_time
-        t = Time.at(time/1_000_000)
-        print t.strftime("%H:%M:%S.")
-        print "%06d " % (time - t.to_f*1_000_000).round
+
+    when 'gc'
+      time, = *cmd
+      @gc_mark = time
+
+      unless @gc_start
+        newline
+        if @show_time
+          t = Time.at(time/1_000_000)
+          print t.strftime("%H:%M:%S.")
+          print "%06d " % (time - t.to_f*1_000_000).round
+        end
+        print @prefix*@last_nesting if @last_nesting > 0
+        print "garbage_collect"
+        puts if @watch_slow
       end
-      print @prefix*@last_nesting if @last_nesting > 0
-      print "garbage_collect"
-      puts if @watch_slow
 
     else
       puts "unknown event #{event}: #{cmd.inspect}"
@@ -870,7 +889,7 @@ EOS
       list = `ps aux`.split("\n")
       filtered = list.grep(Regexp.new opts[:ps])
       filtered.reject! do |line|
-        line =~ /^\w+\s+#{Process.pid}\s+/ # cannot trace self
+        line =~ /^\w+\s+(#{Process.pid}|#{Process.ppid})\s+/ # cannot trace self
       end
 
       if filtered.size > 0

data/ext/extconf.rb

@@ -57,6 +57,7 @@ unless have_library('msgpackc_ext') and have_header('msgpack.h')
 end
 
 have_func('rb_during_gc', 'ruby.h')
+have_func('rb_gc_add_event_hook', ['ruby.h', 'node.h'])
 
 # increase message size on linux
 if RUBY_PLATFORM =~ /linux/

data/ext/rbtrace.c

@@ -304,8 +304,10 @@ event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
   if (in_event_hook) return;
   in_event_hook++;
 
+#ifdef ID_ALLOCATOR
   // skip allocators
   if (mid == ID_ALLOCATOR) goto out;
+#endif
 
 #ifdef RUBY_VM
   if (mid == 0) {
@@ -531,6 +533,29 @@ event_hook_remove()
   }
 }
 
+#ifdef HAVE_RB_GC_ADD_EVENT_HOOK
+// requires https://github.com/tmm1/brew2deb/blob/master/packages/ruby/patches/gc-hooks.patch
+static void
+rbtrace_gc_event_hook(rb_gc_event_t gc_event, VALUE obj)
+{
+  switch(gc_event)
+  {
+    case RUBY_GC_EVENT_START:
+      rbtrace__send_event(1,
+        "gc_start",
+        'n'
+      );
+      break;
+    case RUBY_GC_EVENT_END:
+      rbtrace__send_event(1,
+        "gc_end",
+        'n'
+      );
+      break;
+  }
+}
+#endif
+
 static int
 rbtracer_remove(char *query, int id)
 {
@@ -609,6 +634,11 @@ rbtracer_detach()
   if (rbtracer.klass_tbl)
     st_free_table(rbtracer.klass_tbl);
   rbtracer.klass_tbl = NULL;
+
+  event_hook_remove();
+#ifdef HAVE_RB_GC_ADD_EVENT_HOOK
+  rb_gc_remove_event_hook(rbtrace_gc_event_hook);
+#endif
 }
 
 static int
@@ -900,6 +930,9 @@ rbtrace__process_event(msgpack_object cmd)
 
   } else if (0 == strncmp("gc", str.ptr, str.size)) {
     rbtracer.gc = true;
+#ifdef HAVE_RB_GC_ADD_EVENT_HOOK
+    rb_gc_add_event_hook(rbtrace_gc_event_hook, RUBY_GC_EVENT_START|RUBY_GC_EVENT_END);
+#endif
 
   } else if (0 == strncmp("devmode", str.ptr, str.size)) {
     rbtracer.devmode = true;

data/rbtrace.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'rbtrace'
-  s.version = '0.3.18'
+  s.version = '0.3.19'
   s.homepage = 'http://github.com/tmm1/rbtrace'
 
   s.authors = 'Aman Gupta'

data/server.rb

@@ -38,7 +38,7 @@ while true
       reload_test.call
       Test.run
 
-      fib(1024*100)
+      #fib(1024*100)
     end
   }.call
 end

data/test.sh

@@ -24,28 +24,24 @@ trace() {
   echo ./bin/rbtrace -p $PID $*
   echo ------------------------------------------
   ./bin/rbtrace -p $PID $* &
-  sleep 5
+  sleep 2
   kill $!
   wait $! || true
   echo
 }
 
-# bin/rbtrace -m sleep --wait 2 --exec ruby -e '10.times{ sleep 0.5 }'
-
-trace --slowcpu=500
-
-# trace -m Test.run --devmode
-# trace -m sleep
-# trace -m sleep Dir.chdir Dir.pwd Process.pid "String#gsub" "String#*"
-# trace -m "Kernel#"
-# trace -m "String#gsub(self,@test)" "String#*(self,__source__)" "String#multiply_vowels(self,self.length,num)"
-# trace --gc --slow=200
-# trace --gc -m Dir.
-# trace --slow=250
-# trace --slow=250 --slow-methods sleep
-# trace --gc -m Dir. --slow=250 --slow-methods sleep
-# trace --gc -m Dir. --slow=250
-# trace -m Process. Dir.pwd "Proc#call"
+trace -m Test.run --devmode
+trace -m sleep
+trace -m sleep Dir.chdir Dir.pwd Process.pid "String#gsub" "String#*"
+trace -m "Kernel#"
+trace -m "String#gsub(self,@test)" "String#*(self,__source__)" "String#multiply_vowels(self,self.length,num)"
+trace --gc --slow=200
+trace --gc -m Dir.
+trace --slow=250
+trace --slow=250 --slow-methods sleep
+trace --gc -m Dir. --slow=250 --slow-methods sleep
+trace --gc -m Dir. --slow=250
+trace -m Process. Dir.pwd "Proc#call"
 # trace --firehose
 
 cleanup

metadata

@@ -1,80 +1,66 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rbtrace
-version: !ruby/object:Gem::Version 
-  hash: 55
-  prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 18
-  version: 0.3.18
+version: !ruby/object:Gem::Version
+  version: 0.3.19
 platform: ruby
-authors: 
+authors:
 - Aman Gupta
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-04 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-02-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: ffi
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 0
-        - 6
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 1.0.6
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: trollop
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 83
-        segments: 
-        - 1
-        - 16
-        - 2
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.6
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 1.16.2
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: msgpack
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 4
-        - 3
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.16.2
+- !ruby/object:Gem::Dependency
+  name: msgpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
         version: 0.4.3
   type: :runtime
-  version_requirements: *id003
-description: rbtrace shows you method calls happening inside another ruby process in real time.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.3
+description: rbtrace shows you method calls happening inside another ruby process
+  in real time.
 email: aman@tmm1.net
-executables: 
+executables:
 - rbtrace
-extensions: 
+extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
@@ -94,39 +80,28 @@ files:
 - tracers/redis.tracer
 - tracers/testunit.tracer
 - tracers/unicorn.tracer
-has_rdoc: true
 homepage: http://github.com/tmm1/rbtrace
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
-summary: "rbtrace: like strace but for ruby code"
+specification_version: 4
+summary: 'rbtrace: like strace but for ruby code'
 test_files: []
-
+has_rdoc: