rbtrace 0.3.6 → 0.3.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbtrace (0.3.6)
+    rbtrace (0.3.7)
       ffi (>= 1.0.5)
       msgpack (>= 0.4.3)
       trollop (>= 1.16.2)

data/bin/rbtrace

@@ -43,6 +43,8 @@ module MsgQ
     end
 
     def self.recv_cmd(q, block=true)
+      MsgQ.enable_interrupt  if RUBY_VERSION > '1.9'
+
       msg = EventMsg.new
       ret = MsgQ.msgrcv(q, msg, BUF_SIZE, 0, block ? 0 : IPC_NOWAIT)
       if ret == -1
@@ -54,6 +56,23 @@ module MsgQ
       end
 
       msg[:buf].to_ptr.read_string_length(BUF_SIZE)
+    ensure
+      MsgQ.disable_interrupt if RUBY_VERSION > '1.9'
+    end
+  end
+
+  if RUBY_VERSION > '1.9'
+    require 'fiddle'
+
+    handle = DL::Handle.new
+    @enable_interrupt  = Fiddle::Function.new(handle['rb_enable_interrupt'],  [], DL::TYPE_VOID)
+    @disable_interrupt = Fiddle::Function.new(handle['rb_disable_interrupt'], [], DL::TYPE_VOID)
+
+    def self.enable_interrupt
+      @enable_interrupt.call
+    end
+    def self.disable_interrupt
+      @disable_interrupt.call
     end
   end
 
@@ -616,7 +635,7 @@ class RBTracer
     parser = Trollop::Parser.new do
       version <<-EOS
 rbtrace: like strace, but for ruby code
-  version 0.3.6
+  version 0.3.7
   (c) 2011 Aman Gupta (tmm1)
   http://github.com/tmm1/rbtrace
 EOS

data/ext/rbtrace.c

@@ -27,9 +27,6 @@
 #define rb_sourceline() (ruby_current_node ? nd_line(ruby_current_node) : 0)
 #else
 #include <ruby/st.h>
-// this is a nasty hack, and will probably break on anything except 1.9.2p136
-int rb_thread_method_id_and_class(void *th, ID *idp, VALUE *klassp);
-RUBY_EXTERN void *ruby_current_thread;
 #endif
 
 #ifndef RSTRING_PTR
@@ -293,11 +290,10 @@ event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
   if (mid == ID_ALLOCATOR) goto out;
 
 #ifdef RUBY_VM
-  // some serious 1.9.2 hax
-  if (mid == 0 && ruby_current_thread) {
+  if (mid == 0) {
     ID _mid;
     VALUE _klass;
-    rb_thread_method_id_and_class(ruby_current_thread, &_mid, &_klass);
+    rb_frame_method_id_and_class(&_mid, &_klass);
 
     mid = _mid;
     klass = _klass;
@@ -305,12 +301,20 @@ event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
 #endif
 
   // normalize klass and check for class-level methods
-  bool singleton = 0;
+  bool singleton = false;
   if (klass) {
     if (TYPE(klass) == T_ICLASS) {
       klass = RBASIC(klass)->klass;
     }
+
     singleton = FL_TEST(klass, FL_SINGLETON);
+
+#ifdef RUBY_VM
+    if (singleton &&
+        !(TYPE(self) == T_CLASS ||
+          TYPE(self) == T_MODULE))
+      singleton = false;
+#endif
   }
 
   rbtracer_t *tracer = NULL;

data/rbtrace.gemspec

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

data/server.rb

@@ -24,6 +24,7 @@ while true
       'hello'.multiply_vowels(3){ :ohai }
       sleep rand*0.5
 
+      ENV['blah']
       GC.start
 
       reload_test.call

data/tracers/mongo.tracer

@@ -0,0 +1 @@
+Mongo::DB#command(selector, opts)

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rbtrace
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 3
-  - 6
-  version: 0.3.6
+  - 7
+  version: 0.3.7
 platform: ruby
 authors: 
 - Aman Gupta
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
         segments: 
         - 1
         - 0
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 83
         segments: 
         - 1
         - 16
@@ -58,7 +55,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 0
         - 4
@@ -90,6 +86,7 @@ files:
 - tracers/activerecord.tracer
 - tracers/eventmachine.tracer
 - tracers/io.tracer
+- tracers/mongo.tracer
 - tracers/redis.tracer
 - tracers/unicorn.tracer
 has_rdoc: true
@@ -106,7 +103,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -115,14 +111,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: "rbtrace: like strace but for ruby code"