rbtrace 0.2.3 → 0.2.4

data/.gitignore

@@ -0,0 +1 @@
+*.gem

data/Gemfile.lock

@@ -0,0 +1,20 @@
+PATH
+  remote: .
+  specs:
+    rbtrace (0.2.3)
+      ffi (>= 1.0.5)
+      trollop (>= 1.16.2)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    ffi (1.0.5)
+      rake (>= 0.8.7)
+    rake (0.8.7)
+    trollop (1.16.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rbtrace!

data/bin/rbtrace

@@ -176,7 +176,7 @@ class RBTracer
   # Returns nothing.
   def add(methods)
     Array(methods).each do |func|
-      func.strip!
+      func = func.strip
 
       if func =~ /^(.+)\((.+?)\)$/
         func, args = $1, $2
@@ -195,8 +195,20 @@ class RBTracer
   #
   # Returns nothing.
   def detach
-    send_cmd('detach')
+    begin
+      send_cmd('detach')
+    rescue Errno::ESRCH
+    end
+
     puts
+
+    # drain queue
+    5.times do
+      begin
+        true while recv_cmd(false)
+      rescue
+      end
+    end
   end
 
   # Process events from the traced process.
@@ -364,7 +376,7 @@ class RBTracer
     opts = Trollop.options do
       version <<-EOS
 rbtrace: like strace, but for ruby code
-  version 0.2.3
+  version 0.2.4
   (c) 2011 Aman Gupta (tmm1)
   http://github.com/tmm1/rbtrace
 EOS

data/ext/rbtrace.c

@@ -22,6 +22,10 @@
 #include <node.h>
 #define rb_sourcefile() (ruby_current_node ? ruby_current_node->nd_file : 0)
 #define rb_sourceline() (ruby_current_node ? nd_line(ruby_current_node) : 0)
+#else
+// 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
@@ -141,6 +145,18 @@ event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
   // skip allocators
   if (mid == ID_ALLOCATOR) goto out;
 
+  // some serious 1.9.2 hax
+#ifdef RUBY_VM
+  if (mid == 0 && ruby_current_thread) {
+    ID _mid;
+    VALUE _klass;
+    rb_thread_method_id_and_class(ruby_current_thread, &_mid, &_klass);
+
+    mid = _mid;
+    klass = _klass;
+  }
+#endif
+
   // normalize klass and check for class-level methods
   bool singleton = 0;
   if (klass) {
@@ -215,8 +231,8 @@ event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
   }
 
   switch (event) {
-    case RUBY_EVENT_C_CALL:
     case RUBY_EVENT_CALL:
+    case RUBY_EVENT_C_CALL:
       SEND_EVENT(
         "%s,%d,%s,%d,%s",
         event == RUBY_EVENT_CALL ? "call" : "ccall",
@@ -269,8 +285,8 @@ event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
       }
       break;
 
-    case RUBY_EVENT_C_RETURN:
     case RUBY_EVENT_RETURN:
+    case RUBY_EVENT_C_RETURN:
       SEND_EVENT(
         "%s,%d",
         event == RUBY_EVENT_RETURN ? "return" : "creturn",

data/rbtrace.gemspec

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rbtrace
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Aman Gupta
@@ -59,7 +59,9 @@ extensions:
 extra_rdoc_files: []
 
 files: 
+- .gitignore
 - Gemfile
+- Gemfile.lock
 - README.md
 - bin/rbtrace
 - ext/.gitignore