rbtrace 0.3.20 → 0.4.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rbtrace (0.3.19)
+    rbtrace (0.4.0)
       ffi (>= 1.0.6)
       msgpack (>= 0.4.3)
       trollop (>= 1.16.2)

data/bin/rbtrace

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+require 'socket'
+require 'fileutils'
 require 'rubygems'
 require 'ffi'
 require 'msgpack'
@@ -154,17 +156,23 @@ class RBTracer
       raise ArgumentError, 'could not signal process, are you running as root?'
     end
 
+    path = "/tmp/rbtrace-#{@pid}.sock"
+    @sock = Socket.new Socket::AF_UNIX, Socket::SOCK_DGRAM, 0
+    @sockaddr = Socket.pack_sockaddr_un(path)
+    @sock.bind(@sockaddr)
+    FileUtils.chmod 0666, path
+    at_exit{ FileUtils.rm(path) if File.exists?(path) }
+
     5.times do
       signal
       sleep 0.15 # wait for process to create msgqs
 
-      @qi = MsgQ.msgget( pid, 0666)
       @qo = MsgQ.msgget(-pid, 0666)
 
-      break if @qi > -1 || @qo > -1
+      break if @qo > -1
     end
 
-    if @qi == -1 || @qo == -1
+    if @qo == -1
       raise ArgumentError, 'pid is not listening for messages, did you `require "rbtrace"`'
     end
 
@@ -419,11 +427,13 @@ class RBTracer
   end
 
   def recv_cmd(block=true)
-    MsgQ::EventMsg.recv_cmd(@qi, block)
-  rescue Errno::EINTR
-    # on linux, an incoming signal will interrupt msgrcv()
-    # regardless of what SA_RESTART is set to
-    retry
+    if block
+      @sock.recv(65536)
+    else
+      @sock.recv_nonblock(65536)
+    end
+  rescue Errno::EAGAIN
+    nil
   end
 
   def valid_syntax?(code)
@@ -811,6 +821,10 @@ EOS
         :type => String,
         :short => '-e'
 
+      opt :backtrace,
+        "get lines from the current backtrace in the process",
+        :type => :int
+
       opt :wait,
         "seconds to wait before attaching to process",
         :default => 0,
@@ -834,7 +848,7 @@ EOS
       ARGV.clear
     end
 
-    unless %w[ fork eval slow slowcpu firehose methods config gc ].find{ |n| opts[:"#{n}_given"] }
+    unless %w[ fork eval backtrace slow slowcpu firehose methods config gc ].find{ |n| opts[:"#{n}_given"] }
       $stderr.puts "Error: --slow, --slowcpu, --gc, --firehose, --methods or --config required."
       $stderr.puts "Try --help for help."
       exit(-1)
@@ -1011,6 +1025,14 @@ EOS
         pid = tracer.fork
         STDERR.puts "*** forked off a busy looping copy at #{pid} (make sure to kill -9 it when you're done)"
 
+      elsif opts[:backtrace_given]
+        num = opts[:backtrace]
+        code = "caller.first(#{num}).join('|')"
+
+        if res = tracer.eval(code)
+          tracer.puts res[1..-2].split('|').join("\n  ")
+        end
+
       elsif opts[:eval_given]
         if res = tracer.eval(code = opts[:eval])
           tracer.puts ">> #{code}"

data/ext/rbtrace.c

@@ -12,8 +12,10 @@
 #include <sys/ipc.h>
 #include <sys/msg.h>
 #include <sys/resource.h>
+#include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/types.h>
+#include <sys/un.h>
 #include <sys/wait.h>
 #include <time.h>
 #include <unistd.h>
@@ -108,11 +110,13 @@ static struct {
   unsigned int num_slow;
   rbtracer_t list[MAX_TRACERS];
 
-  key_t mqo_key;
   key_t mqi_key;
-  int mqo_id;
   int mqi_id;
 
+  int mqo_fd;
+  struct sockaddr_un mqo_addr;
+  socklen_t mqo_len;
+
   msgpack_sbuffer *sbuf;
   msgpack_packer *msgpacker;
 }
@@ -137,11 +141,12 @@ rbtracer = {
   .num_slow = 0,
   .list = {},
 
-  .mqo_key = 0,
   .mqi_key = 0,
-  .mqo_id = -1,
   .mqi_id = -1,
 
+  .mqo_fd = -1,
+  .mqo_addr = {.sun_family = AF_UNIX},
+
   .sbuf = NULL,
   .msgpacker = NULL
 };
@@ -156,7 +161,7 @@ rbtrace__send_event(int nargs, const char *name, ...)
   if (!rbtracer.attached_pid ||
       !rbtracer.sbuf ||
       !rbtracer.msgpacker ||
-      rbtracer.mqo_id == -1)
+      rbtracer.mqo_fd == -1)
     return;
 
   int n;
@@ -232,31 +237,26 @@ rbtrace__send_event(int nargs, const char *name, ...)
     va_end(ap);
   }
 
-  event_msg_t msg;
-  msg.mtype = 1;
-
-  if (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;
-  }
-
-  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);
+    ret = sendto(
+      rbtracer.mqo_fd,
+      rbtracer.sbuf->data, rbtracer.sbuf->size,
+#ifdef MSG_NOSIGNAL
+      MSG_NOSIGNAL,
+#else
+      0,
+#endif
+      &rbtracer.mqo_addr, rbtracer.mqo_len
+    );
 
-  if (ret == -1 && errno == EINVAL) {
-    fprintf(stderr, "msgsnd(%d): %s [detaching]\n", rbtracer.mqo_id, strerror(errno));
+  if (ret == -1 && (errno == EINVAL || errno == ENOENT || errno == ECONNREFUSED || errno == EPIPE)) {
+    fprintf(stderr, "sendto(%d): %s [detaching]\n", rbtracer.mqo_fd, strerror(errno));
 
     msgq_teardown();
     rbtracer_detach();
   } else if (ret == -1) {
-    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);
+    fprintf(stderr, "sendto(%d): %s\n", rbtracer.mqo_fd, strerror(errno));
   }
 }
 
@@ -797,11 +797,11 @@ msgq_teardown()
 {
   pid_t pid = getpid();
 
-  if (rbtracer.mqo_id != -1 && rbtracer.mqo_key == (key_t)pid) {
-    msgctl(rbtracer.mqo_id, IPC_RMID, NULL);
-    rbtracer.mqo_id = -1;
-    rbtracer.mqo_key = 0;
+  if (rbtracer.mqo_fd != -1) {
+    close(rbtracer.mqo_fd);
+    rbtracer.mqo_fd = -1;
   }
+
   if (rbtracer.mqi_id != -1 && rbtracer.mqi_key == (key_t)-pid) {
     msgctl(rbtracer.mqi_id, IPC_RMID, NULL);
     rbtracer.mqi_id = -1;
@@ -819,26 +819,36 @@ static inline void
 msgq_setup()
 {
   pid_t pid = getpid();
+  int val;
 
-  if (rbtracer.mqo_key != (key_t)pid ||
-      rbtracer.mqi_key != (key_t)-pid) {
+  if (rbtracer.mqi_key != (key_t)-pid ||
+      rbtracer.mqo_fd  == -1) {
     msgq_teardown();
   } else {
     return;
   }
 
-  rbtracer.mqo_key = (key_t) pid;
-  rbtracer.mqo_id  = msgget(rbtracer.mqo_key, 0666 | IPC_CREAT);
-
-  if (rbtracer.mqo_id == -1)
-    fprintf(stderr, "msgget() failed to create msgq\n");
-
 
   rbtracer.mqi_key = (key_t) -pid;
   rbtracer.mqi_id  = msgget(rbtracer.mqi_key, 0666 | IPC_CREAT);
 
   if (rbtracer.mqi_id == -1)
     fprintf(stderr, "msgget() failed to create msgq\n");
+
+
+  rbtracer.mqo_fd = socket(AF_UNIX, SOCK_DGRAM, 0);
+  if (rbtracer.mqo_fd == -1)
+    fprintf(stderr, "socket() failed to create dgram\n");
+
+  snprintf(rbtracer.mqo_addr.sun_path, sizeof(rbtracer.mqo_addr.sun_path), "/tmp/rbtrace-%d.sock", pid);
+  rbtracer.mqo_len = SUN_LEN(&rbtracer.mqo_addr);
+
+  val = 65536;
+  setsockopt(rbtracer.mqo_fd, SOL_SOCKET, SO_SNDBUF, &val, sizeof(int));
+#ifdef SO_NOSIGPIPE
+  val = 1;
+  setsockopt(rbtracer.mqo_fd, SOL_SOCKET, SO_NOSIGPIPE, &val, sizeof(int));
+#endif
 }
 
 static void

data/rbtrace.gemspec

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

data/test.sh

@@ -42,6 +42,6 @@ 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
+trace --firehose
 
 cleanup

metadata

@@ -2,7 +2,7 @@
 name: rbtrace
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.3.20
+  version: 0.4.0
 platform: ruby
 authors:
 - Aman Gupta