rbtrace 0.2.8 → 0.3.0

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    rbtrace (0.2.3)
+    rbtrace (0.2.8)
       ffi (>= 1.0.5)
+      msgpack (>= 0.4.4)
       trollop (>= 1.16.2)
 
 GEM
@@ -10,6 +11,7 @@ GEM
   specs:
     ffi (1.0.5)
       rake (>= 0.8.7)
+    msgpack (0.4.4)
     rake (0.8.7)
     trollop (1.16.2)
 

data/README.md

@@ -5,12 +5,40 @@ time.
 
 rbtrace works on ruby 1.8 and 1.9, running on linux or mac osx.
 
+rbtrace is designed to have minimal overhead, and should be safe to run
+in production.
+
 ## usage
 
     % gem install rbtrace
     % rbtrace --help
 
-## examples
+## tracer types
+
+rbtrace has several different tracing modes:
+
+### firehose: show everything
+
+    % rbtrace -p <PID> --firehose
+
+### slow: show any method calls that take longer than `<N>` milliseconds
+
+    % rbtrace -p <PID> --slow=<N>
+
+### methods: trace calls to specific methods
+
+    % rbtrace -p <PID> --methods "Kernel#sleep" "Proc#call"
+
+## predefined tracers
+
+rbtrace also includes a set of [predefined tracers](https://github.com/tmm1/rbtrace/tree/master/tracers)
+for popular ruby libraries and functions.
+
+### trace calls to activerecord adapters and any i/o functions
+
+    % rbtrace -p <PID> -c activerecord io
+
+## detailed example
 
 ### require rbtrace into a process
 
@@ -119,7 +147,7 @@ rbtrace works on ruby 1.8 and 1.9, running on linux or mac osx.
 
 ### get values of variables and other expressions
 
-    % rbtrace -p 87854 -m "String#gsub(self, @test)" "String#*(self)" "String#multiply_vowels(self, self.length, num)"
+    % rbtrace -p 87854 -m "String#gsub(self, @test)" "String#*(self, __source__)" "String#multiply_vowels(self, self.length, num)"
     *** attached to process 87854
 
     String#multiply_vowels(self="hello", self.length=5, num=3)
@@ -154,7 +182,6 @@ rbtrace works on ruby 1.8 and 1.9, running on linux or mac osx.
 
 ## todo
 
-* switch ipc to [msgpack](https://github.com/dhotson/msgpack/tree/master/c) instead of csv
 * add triggers to start tracing slow methods only inside another method
 * syntax check expressions before adding them
 * add special expressions for method args (_arg0_, _arguments_)

data/bin/rbtrace

@@ -1,8 +1,13 @@
 #!/usr/bin/env ruby
 require 'rubygems'
 require 'ffi'
+require 'msgpack'
 require 'trollop'
 
+class String
+  alias :bytesize :size
+end unless ''.respond_to?(:bytesize)
+
 module FFI::LastError
   def self.exception
     Errno::constants.map(&Errno.method(:const_get)).find{ |c| c.const_get(:Errno) == error }
@@ -17,7 +22,7 @@ module MsgQ
   ffi_lib 'c'
 
   class EventMsg < FFI::Struct
-    BUF_SIZE = RUBY_PLATFORM =~ /linux/ ? 256 : 120
+    BUF_SIZE = RUBY_PLATFORM =~ /linux/ ? 256 : 64
     IPC_NOWAIT = 004000
 
     layout :mtype, :long,
@@ -43,7 +48,7 @@ module MsgQ
         FFI::LastError.raise
       end
 
-      msg[:buf].to_ptr.read_string
+      msg[:buf].to_ptr.read_string_length(BUF_SIZE)
     end
   end
 
@@ -172,14 +177,14 @@ class RBTracer
   #
   # Returns nothing.
   def watch(msec)
-    send_cmd("watch,#{msec}")
+    send_cmd(:watch, msec)
   end
 
   # Turn on the firehose (show all method calls).
   #
   # Returns nothing.
   def firehose
-    send_cmd('firehose')
+    send_cmd(:firehose)
   end
 
   # Add tracers for the given list of methods.
@@ -197,10 +202,10 @@ class RBTracer
         args = args.split(',').map{ |a| a.strip }
       end
 
-      send_cmd("add,#{func}")
+      send_cmd(:add, func)
 
       args.each do |arg|
-        send_cmd("addexpr,#{arg}")
+        send_cmd(:addexpr, arg)
       end if args and args.any?
     end
   end
@@ -209,7 +214,7 @@ class RBTracer
   #
   # Returns nothing.
   def attach
-    send_cmd("attach,#{Process.pid}")
+    send_cmd(:attach, Process.pid)
     if wait_for{ @attached == true }
       STDERR.puts "*** attached to process #{pid}"
     else
@@ -222,7 +227,7 @@ class RBTracer
   # Returns nothing.
   def detach
     begin
-      send_cmd('detach')
+      send_cmd(:detach)
     rescue Errno::ESRCH
     end
 
@@ -294,8 +299,10 @@ class RBTracer
     false
   end
 
-  def send_cmd(msg)
+  def send_cmd(*cmd)
     begin
+      msg = cmd.to_msgpack
+      raise ArgumentError, 'command is too long' if msg.bytesize > MsgQ::EventMsg::BUF_SIZE
       MsgQ::EventMsg.send_cmd(@qo, msg)
     rescue Errno::EINTR
       retry
@@ -320,67 +327,76 @@ class RBTracer
     @out.puts(*args)
   end
 
+  def parse_cmd(line)
+    unpacker = MessagePack::Unpacker.new
+    unpacker.feed(line)
+
+    obj = nil
+    unpacker.each{|o| obj = o; break }
+    obj
+  end
+
   def process_line(line)
-    time, event, _id, *args = line.strip.split(',')
-    time = time.to_i
-    id = _id.to_i
+    return unless cmd = parse_cmd(line)
+    event = cmd.shift
 
     case event
     when 'attached'
-      @attached = true
-      if id != Process.pid
+      tracer_pid = *cmd
+      if tracer_pid != Process.pid
         STDERR.puts "*** process #{pid} is already being traced"
         exit!(-1)
       end
+
+      @attached = true
       return
 
     when 'detached'
-      @attached = false
+      tracer_pid = *cmd
+      if tracer_pid != Process.pid
+        STDERR.puts "*** process #{pid} detached #{tracer_pid}, but we are #{Process.pid}"
+      else
+        @attached = false
+      end
+
       return
     end
 
-    if !@attached
+    unless @attached
       STDERR.puts "*** got #{event} before attaching"
       return
     end
 
-    tracer = @tracers[id] if id > -1
-
     case event
     when 'mid'
-      @methods[id.to_i] = args.first
+      mid, name = *cmd
+      @methods[mid] = name
 
     when 'klass'
-      @klasses[_id.to_i(16)] = args.first
+      kid, name = *cmd
+      @klasses[kid] = name
 
     when 'add'
-      if id == -1
-        puts line
-      else
-        query = args.first
-        @tracers.delete(id)
-        @tracers[id][:query] = query
-      end
-
-    when 'remove'
-      if id == -1
-        puts line
+      tracer_id, query = *cmd
+      if tracer_id == -1
+        STDERR.puts "*** unable to add tracer for #{query}"
       else
-        @tracers.delete(id)
+        @tracers.delete(tracer_id)
+        @tracers[tracer_id][:query] = query
       end
 
     when 'newexpr'
-      expr_id, expr = *args
-      expr_id = expr_id.to_i
+      tracer_id, expr_id, expr = *cmd
+      tracer = @tracers[tracer_id]
 
-      if expr_id > -1 and tracer
+      if expr_id > -1
         tracer[:exprs][expr_id] = expr
       end
 
     when 'exprval'
-      expr_id = args.shift
-      val = args.join(',')
-      expr_id = expr_id.to_i
+      tracer_id, expr_id, val = *cmd
+
+      tracer = @tracers[tracer_id]
       expr = tracer[:exprs][expr_id]
 
       if tracer[:arglist]
@@ -394,11 +410,12 @@ class RBTracer
       tracer[:arglist] = true
 
     when 'call','ccall'
-      method, is_singleton, klass = *args
-      is_singleton = (is_singleton == '1')
-      klass = @klasses[klass.to_i(16)]
+      time, tracer_id, mid, is_singleton, klass = *cmd
+
+      tracer = @tracers[tracer_id]
+      klass = @klasses[klass]
       name = klass ? "#{klass}#{ is_singleton ? '.' : '#' }" : ''
-      name += @methods[method.to_i] || '(unknown)'
+      name += @methods[mid] || '(unknown)'
 
       tracer[:times] << time
       tracer[:names] << name
@@ -422,6 +439,9 @@ class RBTracer
       tracer[:last] = name
 
     when 'return','creturn'
+      time, tracer_id = *cmd
+      tracer = @tracers[tracer_id]
+
       @nesting -= 1 if @nesting > 0
 
       if start = tracer[:times].pop
@@ -449,14 +469,11 @@ class RBTracer
       tracer[:arglist] = false
 
     when 'slow', 'cslow'
-      diff, nesting, method, is_singleton, klass = *args
-      nesting = nesting.to_i
-      diff = diff.to_i
+      diff, nesting, mid, is_singleton, klass = *cmd
 
-      is_singleton = (is_singleton == '1')
-      klass = @klasses[klass.to_i(16)]
+      klass = @klasses[klass]
       name = klass ? "#{klass}#{ is_singleton ? '.' : '#' }" : ''
-      name += @methods[method.to_i] || '(unknown)'
+      name += @methods[mid] || '(unknown)'
 
       print @prefix*nesting if nesting > 0
       print name
@@ -472,7 +489,7 @@ class RBTracer
 
     end
   rescue => e
-    STDERR.puts "error on: #{line}"
+    STDERR.puts "error on #{event}: #{cmd.inspect}"
     raise e
   end
 
@@ -483,7 +500,7 @@ class RBTracer
     parser = Trollop::Parser.new do
       version <<-EOS
 rbtrace: like strace, but for ruby code
-  version 0.2.8
+  version 0.3.0
   (c) 2011 Aman Gupta (tmm1)
   http://github.com/tmm1/rbtrace
 EOS

data/ext/.gitignore

@@ -2,3 +2,8 @@ Makefile
 *.bundle
 *.o
 *.so
+*.a
+mkmf.log
+conftest.dSYM/
+dst/
+src/msgpack-0.5.4/

data/ext/extconf.rb

@@ -1,4 +1,37 @@
+CWD = File.expand_path('../', __FILE__)
+
+def sys(cmd)
+  puts "  -- #{cmd}"
+  unless ret = xsystem(cmd)
+    raise "#{cmd} failed, please report to https://github.com/tmm1/rbtrace/issues"
+  end
+  ret
+end
+
 require 'mkmf'
+require 'fileutils'
+
+Logging.message "Building msgpack\n"
+
+msgpack = File.basename('msgpack-0.5.4.tar.gz')
+dir = File.basename(msgpack, '.tar.gz')
+
+Dir.chdir('src') do
+  FileUtils.rm_rf(dir) if File.exists?(dir)
+
+  sys("tar zxvf #{msgpack}")
+  Dir.chdir(dir) do
+    sys("./configure --disable-shared --with-pic --prefix=#{CWD}/dst/")
+    sys("make install")
+  end
+end
+
+FileUtils.cp "#{CWD}/dst/lib/libmsgpackc.a", "#{CWD}/libmsgpackc_ext.a"
+$INCFLAGS[0,0] = "-I#{CWD}/dst/include "
+
+unless have_library('msgpackc_ext') and have_header('msgpack.h')
+  raise 'msgpack build failed'
+end
 
 # increase message size on linux
 if RUBY_PLATFORM =~ /linux/

data/ext/rbtrace.c

@@ -1,6 +1,7 @@
 #include <inttypes.h>
 #include <errno.h>
 #include <signal.h>
+#include <stdarg.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdint.h>
@@ -14,6 +15,7 @@
 #include <time.h>
 #include <unistd.h>
 
+#include <msgpack.h>
 #include <ruby.h>
 
 #ifndef RUBY_VM
@@ -49,10 +51,10 @@ timeofday_usec()
 #define MAX_TRACERS 100 // max method tracers
 #define MAX_EXPRS 10    // max expressions per tracer
 #ifndef BUF_SIZE        // msgq buffer size
-#define BUF_SIZE 120
+#define BUF_SIZE 64
 #endif
 
-struct rbtracer_t {
+typedef struct {
   int id;
 
   char *query;
@@ -62,13 +64,12 @@ struct rbtracer_t {
 
   int num_exprs;
   char *exprs[MAX_EXPRS];
-};
-typedef struct rbtracer_t rbtracer_t;
+} rbtracer_t;
 
-struct event_msg {
+typedef struct {
   long mtype;
   char buf[BUF_SIZE];
-};
+} event_msg_t;
 
 static struct {
   st_table *mid_tbl;
@@ -92,6 +93,9 @@ static struct {
   key_t mqi_key;
   int mqo_id;
   int mqi_id;
+
+  msgpack_sbuffer *sbuf;
+  msgpack_packer *msgpacker;
 }
 rbtracer = {
   .mid_tbl = NULL,
@@ -108,36 +112,114 @@ rbtracer = {
   .threshold = 250,
 
   .num = 0,
+  .list = {},
 
   .mqo_key = 0,
   .mqi_key = 0,
   .mqo_id = -1,
-  .mqi_id = -1
+  .mqi_id = -1,
+
+  .sbuf = NULL,
+  .msgpacker = NULL
 };
 
-#define SEND_EVENT(format, ...) do {\
-  uint64_t usec = timeofday_usec();\
-  if (false) {\
-    fprintf(stderr, "%" PRIu64 "," format, usec, __VA_ARGS__);\
-    fprintf(stderr, "\n");\
-  } else if (rbtracer.mqo_id != -1 && rbtracer.attached_pid) {\
-    struct event_msg msg;\
-    int ret = -1, n = 0;\
-    \
-    msg.mtype = 1;\
-    snprintf(msg.buf, sizeof(msg.buf), "%" PRIu64 "," format, usec, __VA_ARGS__);\
-    \
-    for (n=0; n<10 && ret==-1; n++)\
-      ret = msgsnd(rbtracer.mqo_id, &msg, sizeof(msg)-sizeof(long), IPC_NOWAIT);\
-    \
-    if (ret == -1 && rbtracer.mqo_id != -1 && errno != EINVAL) {\
-      fprintf(stderr, "msgsnd(%d): %s\n", rbtracer.mqo_id, strerror(errno));\
-      struct msqid_ds stat;\
-      msgctl(rbtracer.mqo_id, IPC_STAT, &stat);\
-      fprintf(stderr, "cbytes: %lu, qbytes: %lu, qnum: %lu\n", stat.msg_cbytes, stat.msg_qbytes, stat.msg_qnum);\
-    }\
-  }\
-} while (0)
+static inline void
+SEND_EVENT(int nargs, char *name, ...)
+{
+  if (!rbtracer.attached_pid ||
+      !rbtracer.sbuf ||
+      !rbtracer.msgpacker ||
+      rbtracer.mqo_id == -1)
+    return;
+
+  int n;
+
+  msgpack_sbuffer_clear(rbtracer.sbuf);
+  msgpack_packer *pk = rbtracer.msgpacker;
+
+  msgpack_pack_array(pk, nargs+1);
+
+  msgpack_pack_raw(pk, strlen(name));
+  msgpack_pack_raw_body(pk, name, strlen(name));
+
+  if (nargs > 0) {
+    int type;
+    uint32_t uint;
+    int sint;
+    unsigned long ulong;
+    char *str;
+
+    va_list ap;
+    va_start(ap, name);
+
+    for (n=0; n<nargs; n++) {
+      type = va_arg(ap, int);
+      switch (type) {
+        case 't':
+          msgpack_pack_uint64(pk, timeofday_usec());
+          break;
+
+        case 'b':
+          if (va_arg(ap, int))
+            msgpack_pack_true(pk);
+          else
+            msgpack_pack_false(pk);
+          break;
+
+        case 'u':
+          uint = va_arg(ap, uint32_t);
+          msgpack_pack_uint32(pk, uint);
+          break;
+
+        case 'l':
+          ulong = va_arg(ap, unsigned long);
+          msgpack_pack_unsigned_long(pk, ulong);
+          break;
+
+        case 'd':
+          sint = va_arg(ap, int);
+          msgpack_pack_int(pk, sint);
+          break;
+
+        case 's':
+          str = va_arg(ap, char *);
+          if (!str)
+            str = "";
+
+          msgpack_pack_raw(pk, strlen(str));
+          msgpack_pack_raw_body(pk, str, strlen(str));
+          break;
+
+        default:
+          fprintf(stderr, "unknown type (%c) passed to SEND_EVENT\n", (char)type);
+      }
+    }
+
+    va_end(ap);
+  }
+
+  event_msg_t msg;
+  msg.mtype = 1;
+
+  if (rbtracer.sbuf->size > sizeof(msg.buf)) {
+    fprintf(stderr, "SEND_EVENT(): message is too large (%zd > %lu)\n", rbtracer.sbuf->size, sizeof(msg.buf));
+    return;
+  }
+
+  memcpy(msg.buf, rbtracer.sbuf->data, rbtracer.sbuf->size);
+
+  int ret = -1;
+  for (n=0; n<10 && ret==-1; n++)
+    ret = msgsnd(rbtracer.mqo_id, &msg, sizeof(msg)-sizeof(long), IPC_NOWAIT);
+
+  if (ret == -1 && rbtracer.mqo_id != -1 && errno != EINVAL) {
+    fprintf(stderr, "msgsnd(%d): %s\n", rbtracer.mqo_id, strerror(errno));
+
+    struct msqid_ds stat;
+    msgctl(rbtracer.mqo_id, IPC_STAT, &stat);
+    fprintf(stderr, "cbytes: %lu, qbytes: %lu, qnum: %lu\n", stat.msg_cbytes, stat.msg_qbytes, stat.msg_qnum);
+  }
+}
 
 static inline void
 SEND_NAMES(ID mid, VALUE klass)
@@ -147,10 +229,10 @@ SEND_NAMES(ID mid, VALUE klass)
 
   if (!st_is_member(rbtracer.mid_tbl, mid)) {
     st_insert(rbtracer.mid_tbl, (st_data_t)mid, (st_data_t)1);
-    SEND_EVENT(
-      "mid,%lu,%s",
-      mid,
-      rb_id2name(mid)
+    SEND_EVENT(2,
+      "mid",
+      'l', mid,
+      's', rb_id2name(mid)
     );
   }
 
@@ -159,10 +241,10 @@ SEND_NAMES(ID mid, VALUE klass)
 
   if (!st_is_member(rbtracer.klass_tbl, klass)) {
     st_insert(rbtracer.klass_tbl, (st_data_t)klass, (st_data_t)1);
-    SEND_EVENT(
-      "klass,%p,%s",
-      (void*)klass,
-      rb_class2name(klass)
+    SEND_EVENT(2,
+      "klass",
+      'l', klass,
+      's', rb_class2name(klass)
     );
   }
 }
@@ -231,14 +313,13 @@ event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
 
     if (diff > rbtracer.threshold * 1e3) {
       SEND_NAMES(mid, singleton ? self : klass);
-      SEND_EVENT(
-        "%s,-1,%" PRIu64 ",%d,%lu,%d,%p",
+      SEND_EVENT(5,
         event == RUBY_EVENT_RETURN ? "slow" : "cslow",
-        diff,
-        rbtracer.num_calls,
-        mid,
-        singleton,
-        (void*)(singleton ? self : klass)
+        'u', diff,
+        'u', rbtracer.num_calls,
+        'l', mid,
+        'b', singleton,
+        'l', singleton ? self : klass
       );
     }
 
@@ -275,13 +356,13 @@ event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
     case RUBY_EVENT_CALL:
     case RUBY_EVENT_C_CALL:
       SEND_NAMES(mid, singleton ? self : klass);
-      SEND_EVENT(
-        "%s,%d,%lu,%d,%p",
+      SEND_EVENT(5,
         event == RUBY_EVENT_CALL ? "call" : "ccall",
-        tracer ? tracer->id : 255, // hax
-        mid,
-        singleton,
-        (void*)(singleton ? self : klass)
+        't',
+        'd', tracer ? tracer->id : 255, // hax
+        'l', mid,
+        'b', singleton,
+        'l', singleton ? self : klass
       );
 
       if (tracer && tracer->num_exprs) {
@@ -312,13 +393,12 @@ event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
             result = RSTRING_PTR(val);
           }
 
-          if (result) {
-            SEND_EVENT(
-              "%s,%d,%d,%s",
+          if (result && *result) {
+            SEND_EVENT(3,
               "exprval",
-              tracer->id,
-              i,
-              result
+              'd', tracer->id,
+              'd', i,
+              's', result
             );
           }
         }
@@ -327,10 +407,10 @@ event_hook(rb_event_t event, NODE *node, VALUE self, ID mid, VALUE klass)
 
     case RUBY_EVENT_RETURN:
     case RUBY_EVENT_C_RETURN:
-      SEND_EVENT(
-        "%s,%d",
+      SEND_EVENT(2,
         event == RUBY_EVENT_RETURN ? "return" : "creturn",
-        tracer ? tracer->id : 255 // hax
+        't',
+        'd', tracer ? tracer->id : 255 // hax
       );
       break;
   }
@@ -406,10 +486,10 @@ rbtracer_remove(char *query, int id)
   }
 
 out:
-  SEND_EVENT(
-    "remove,%d,%s",
-    tracer_id,
-    query
+  SEND_EVENT(2,
+    "remove",
+    'd', tracer_id,
+    's', query
   );
   return tracer_id;
 }
@@ -498,10 +578,10 @@ rbtracer_add(char *query)
   rbtracer.num++;
 
 out:
-  SEND_EVENT(
-    "add,%d,%s",
-    tracer_id,
-    query
+  SEND_EVENT(2,
+    "add",
+    'd', tracer_id,
+    's', query
   );
   return tracer_id;
 }
@@ -526,11 +606,11 @@ rbtracer_add_expr(int id, char *expr)
   }
 
 out:
-  SEND_EVENT(
-    "newexpr,%d,%d,%s",
-    tracer_id,
-    expr_id,
-    expr
+  SEND_EVENT(3,
+    "newexpr",
+    'd', tracer_id,
+    'd', expr_id,
+    's', expr
   );
 }
 
@@ -579,7 +659,7 @@ ruby_teardown(VALUE data)
   msgq_teardown();
 }
 
-static void
+static inline void
 msgq_setup()
 {
   pid_t pid = getpid();
@@ -603,22 +683,6 @@ msgq_setup()
 
   if (rbtracer.mqi_id == -1)
     fprintf(stderr, "msgget() failed to create msgq\n");
-
-  /*
-  struct msqid_ds stat;
-  int ret;
-
-  msgctl(rbtracer.mqo_id, IPC_STAT, &stat);
-  printf("cbytes: %lu, qbytes: %lu, qnum: %lu\n", stat.msg_cbytes, stat.msg_qbytes, stat.msg_qnum);
-
-  stat.msg_qbytes += 10;
-  ret = msgctl(rbtracer.mqo_id, IPC_SET, &stat);
-  printf("cbytes: %lu, qbytes: %lu, qnum: %lu\n", stat.msg_cbytes, stat.msg_qbytes, stat.msg_qnum);
-  printf("ret: %d, errno: %d\n", ret, errno);
-
-  msgctl(rbtracer.mqo_id, IPC_STAT, &stat);
-  printf("cbytes: %lu, qbytes: %lu, qnum: %lu\n", stat.msg_cbytes, stat.msg_qbytes, stat.msg_qnum);
-  */
 }
 
 static void
@@ -628,9 +692,7 @@ sigurg(int signal)
   msgq_setup();
   if (rbtracer.mqi_id == -1) return;
 
-  struct event_msg msg;
-  char *query = NULL;
-  size_t len = 0;
+  event_msg_t msg;
   int n = 0;
 
   while (true) {
@@ -642,61 +704,87 @@ sigurg(int signal)
     if (ret == -1) {
       break;
     } else {
-      len = strlen(msg.buf);
-      if (msg.buf[len-1] == '\n')
-        msg.buf[len-1] = 0;
-
-      if (0 == strncmp("add,", msg.buf, 4)) {
-        query = msg.buf + 4;
-        last_tracer_id = rbtracer_add(query);
+      char query[sizeof(msg.buf)];
 
-      } else if (0 == strncmp("del,", msg.buf, 4)) {
-        query = msg.buf + 4;
-        rbtracer_remove(query, -1);
+      msgpack_object cmd;
+      msgpack_object_array ary;
+      msgpack_object_raw str;
 
-      } else if (0 == strncmp("firehose", msg.buf, 8)) {
-        rbtracer.firehose = true;
-        event_hook_install();
+      msgpack_unpacked unpacked;
+      msgpack_unpacked_init(&unpacked);
 
-      } else if (0 == strncmp("addexpr,", msg.buf, 8)) {
-        query = msg.buf + 8;
-        rbtracer_add_expr(last_tracer_id, query);
+      bool success = msgpack_unpack_next(&unpacked, msg.buf, sizeof(msg.buf), NULL);
+      cmd = unpacked.data;
 
-      } else if (0 == strncmp("watch,", msg.buf, 6)) {
-        int msec = 250;
+      if (!success || cmd.type != MSGPACK_OBJECT_ARRAY)
+        continue;
 
-        query = msg.buf + 6;
-        if (query && *query)
-          msec = atoi(query);
+      ary = cmd.via.array;
 
-        rbtracer_watch(msec);
+      if (ary.size < 1 ||
+          ary.ptr[0].type != MSGPACK_OBJECT_RAW)
+        continue;
 
-      } else if (0 == strncmp("unwatch", msg.buf, 7)) {
-        rbtracer_unwatch();
+      str = ary.ptr[0].via.raw;
 
-      } else if (0 == strncmp("attach,", msg.buf, 7)) {
-        pid_t pid = 0;
+      if (0 == strncmp("attach", str.ptr, str.size)) {
+        if (ary.size != 2 ||
+            ary.ptr[1].type != MSGPACK_OBJECT_POSITIVE_INTEGER)
+          continue;
 
-        query = msg.buf + 7;
-        if (query && *query)
-          pid = (pid_t)atoi(query);
+        pid_t pid = (pid_t) ary.ptr[1].via.u64;
 
         if (pid && rbtracer.attached_pid == 0)
           rbtracer.attached_pid = pid;
 
-        SEND_EVENT(
-          "attached,%u",
-          rbtracer.attached_pid
+        SEND_EVENT(1,
+          "attached",
+          'u', (uint32_t) rbtracer.attached_pid
         );
 
-      } else if (0 == strncmp("detach", msg.buf, 6)) {
-        SEND_EVENT(
-          "detached,%u",
-          rbtracer.attached_pid
+      } else if (0 == strncmp("detach", str.ptr, str.size)) {
+        SEND_EVENT(1,
+          "detached",
+          'u', (uint32_t) rbtracer.attached_pid
         );
+
         rbtracer.attached_pid = 0;
         rbtracer_remove_all();
 
+      } else if (0 == strncmp("watch", str.ptr, str.size)) {
+        if (ary.size != 2 ||
+            ary.ptr[1].type != MSGPACK_OBJECT_POSITIVE_INTEGER)
+          continue;
+
+        unsigned int msec = ary.ptr[1].via.u64;
+        rbtracer_watch(msec);
+
+      } else if (0 == strncmp("firehose", str.ptr, str.size)) {
+        rbtracer.firehose = true;
+        event_hook_install();
+
+      } else if (0 == strncmp("add", str.ptr, str.size)) {
+        if (ary.size != 2 ||
+            ary.ptr[1].type != MSGPACK_OBJECT_RAW)
+          continue;
+
+        str = ary.ptr[1].via.raw;
+
+        strncpy(query, str.ptr, str.size);
+        query[str.size] = 0;
+        last_tracer_id = rbtracer_add(query);
+
+      } else if (0 == strncmp("addexpr", str.ptr, str.size)) {
+        if (ary.size != 2 ||
+            ary.ptr[1].type != MSGPACK_OBJECT_RAW)
+          continue;
+
+        str = ary.ptr[1].via.raw;
+
+        strncpy(query, str.ptr, str.size);
+        query[str.size] = 0;
+        rbtracer_add_expr(last_tracer_id, query);
+
       }
     }
   }
@@ -705,6 +793,10 @@ sigurg(int signal)
 void
 Init_rbtrace()
 {
+  // setup msgpack
+  rbtracer.sbuf = msgpack_sbuffer_new();
+  rbtracer.msgpacker = msgpack_packer_new(rbtracer.sbuf, msgpack_sbuffer_write);
+
   // zero out tracer
   memset(&rbtracer.list, 0, sizeof(rbtracer.list));
 

data/rbtrace.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'rbtrace'
-  s.version = '0.2.8'
+  s.version = '0.3.0'
   s.homepage = 'http://github.com/tmm1/rbtrace'
 
   s.authors = 'Aman Gupta'
@@ -12,8 +12,9 @@ Gem::Specification.new do |s|
   s.bindir = 'bin'
   s.executables << 'rbtrace'
 
-  s.add_dependency 'ffi', '>= 1.0.5'
+  s.add_dependency 'ffi',     '>= 1.0.5'
   s.add_dependency 'trollop', '>= 1.16.2'
+  s.add_dependency 'msgpack', '>= 0.4.4'
 
   s.summary = 'rbtrace: like strace but for ruby code'
   s.description = 'rbtrace shows you method calls happening inside another ruby process in real time.'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rbtrace
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 8
-  version: 0.2.8
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Aman Gupta
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-17 00:00:00 -08:00
+date: 2011-02-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,6 +50,22 @@ dependencies:
         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: 7
+        segments: 
+        - 0
+        - 4
+        - 4
+        version: 0.4.4
+  type: :runtime
+  version_requirements: *id003
 description: rbtrace shows you method calls happening inside another ruby process in real time.
 email: aman@tmm1.net
 executables: 
@@ -67,6 +83,7 @@ files:
 - ext/.gitignore
 - ext/extconf.rb
 - ext/rbtrace.c
+- ext/src/msgpack-0.5.4.tar.gz
 - rbtrace.gemspec
 - server.rb
 - test.sh