rbtrace 0.3.11 → 0.3.12

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    rbtrace (0.3.11)
-      ffi (>= 1.0.5)
+    rbtrace (0.3.12)
+      ffi (>= 1.0.6)
       msgpack (>= 0.4.3)
       trollop (>= 1.16.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    ffi (1.0.5)
+    ffi (1.0.6)
       rake (>= 0.8.7)
     msgpack (0.4.4)
     rake (0.8.7)

data/bin/rbtrace

@@ -585,6 +585,7 @@ class RBTracer
           print name
         end
         print ' <%f>' % (diff/1_000_000.0) if @show_duration
+        newline
 
         if @nesting == 0 and @max_nesting > 1
           # unless tracer == @last_tracer and @last_tracer[:last] == name
@@ -653,7 +654,7 @@ class RBTracer
     parser = Trollop::Parser.new do
       version <<-EOS
 rbtrace: like strace, but for ruby code
-  version 0.3.11
+  version 0.3.12
   (c) 2011 Aman Gupta (tmm1)
   http://github.com/tmm1/rbtrace
 EOS

data/ext/extconf.rb

@@ -29,6 +29,9 @@ unless File.exists?("#{CWD}/dst/lib/libmsgpackc.a")
 
     sys("tar zxvf #{msgpack}")
     Dir.chdir(dir) do
+      if RUBY_PLATFORM =~ /i686/ and gcc = `gcc -v 2>&1` and gcc =~ /gcc version 4\.1/
+        ENV['CFLAGS'] += " -march=i686 "
+      end
       sys("./configure --disable-dependency-tracking --disable-shared --disable-cxx --with-pic --prefix=#{CWD}/dst/")
       sys("make install")
     end

data/ext/rbtrace.c

@@ -13,6 +13,7 @@
 #include <sys/msg.h>
 #include <sys/time.h>
 #include <sys/types.h>
+#include <sys/wait.h>
 #include <time.h>
 #include <unistd.h>
 
@@ -191,7 +192,7 @@ rbtrace__send_event(int nargs, const char *name, ...)
           msgpack_pack_unsigned_long(pk, ulong);
           break;
 
-        case 't': // unsigned long long (timestamps)
+        case 't': // uint64 (timestamps)
           uint64 = va_arg(ap, uint64_t);
           msgpack_pack_uint64(pk, uint64);
           break;
@@ -210,7 +211,7 @@ rbtrace__send_event(int nargs, const char *name, ...)
           break;
 
         default:
-          fprintf(stderr, "unknown type (%c) passed to rbtrace__send_event\n", (char)type);
+          fprintf(stderr, "unknown type (%d) passed to rbtrace__send_event for %s\n", (int)type, name);
       }
     }
 
@@ -221,7 +222,7 @@ rbtrace__send_event(int nargs, const char *name, ...)
   msg.mtype = 1;
 
   if (rbtracer.sbuf->size > sizeof(msg.buf)) {
-    fprintf(stderr, "rbtrace__send_event(): message is too large (%zd > %lu)\n", rbtracer.sbuf->size, sizeof(msg.buf));
+    fprintf(stderr, "rbtrace__send_event(): message is too large (%zd > %zu)\n", rbtracer.sbuf->size, sizeof(msg.buf));
     return;
   }
 
@@ -403,7 +404,7 @@ event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
       rbtrace__send_event(6,
         event == RUBY_EVENT_RETURN ? "slow" : "cslow",
         't', rbtracer.call_times[ rbtracer.num_calls ],
-        'u', diff,
+        't', diff,
         'u', rbtracer.num_calls,
         'l', mid,
         'b', singleton,
@@ -448,7 +449,7 @@ event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
             val = rb_inspect(rb_ivar_get(self, rb_intern(expr)));
 
           } else {
-            snprintf(buffer, len+150, "(begin; ObjectSpace._id2ref(%p >> 1).instance_eval{ %s }; rescue Exception => e; e; end).inspect", (void*)self, expr);
+            snprintf(buffer, len+150, "(begin; ObjectSpace._id2ref(%ld).instance_eval{ %s }; rescue Exception => e; e; end).inspect", NUM2LONG(rb_obj_id(self)), expr);
             val = rb_eval_string_protect(buffer, 0);
           }
 

data/rbtrace.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'rbtrace'
-  s.version = '0.3.11'
+  s.version = '0.3.12'
   s.homepage = 'http://github.com/tmm1/rbtrace'
 
   s.authors = 'Aman Gupta'
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.bindir = 'bin'
   s.executables << 'rbtrace'
 
-  s.add_dependency 'ffi',     '>= 1.0.5'
+  s.add_dependency 'ffi',     '>= 1.0.6'
   s.add_dependency 'trollop', '>= 1.16.2'
   s.add_dependency 'msgpack', '>= 0.4.3'
 

data/test.sh

@@ -13,7 +13,7 @@ export RUBYOPT="-I."
 ruby server.rb &
 export PID=$!
 
-trap cleanup SIGINT SIGTERM
+trap cleanup INT TERM
 cleanup() {
   kill $PID
   wait $PID || true

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rbtrace
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 3
-  - 11
-  version: 0.3.11
+  - 12
+  version: 0.3.12
 platform: ruby
 authors: 
 - Aman Gupta
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 -08:00
+date: 2011-03-05 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 27
         segments: 
         - 1
         - 0
-        - 5
-        version: 1.0.5
+        - 6
+        version: 1.0.6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency