rbtrace 0.4.11 → 0.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb8fa0f63b60cff1f92eebde1a7a69e907a8c2f89d026ada05a1b059720d9f3f
-  data.tar.gz: db1534f9c0fd26a521b3d24cfc1f6153c47633b1404125306aa44e7ec2aa3553
+  metadata.gz: 90ef44223d9a9594cd447443fff128884825d19b5bb553ba3d4c2924df6c2da0
+  data.tar.gz: a09e1b41bca4f998e47b7de04a711915440deb4bbc81007cbf27264dac9bfcbb
 SHA512:
-  metadata.gz: 7810fbf225e045a4f7a9eea100546cb9f076261f829255266ee99a046eebef74b9891d4ecda0ecb37e97f6d01485977ea4a70b4d3e88539829edf9fa019aa59a
-  data.tar.gz: 88730842962e602cbe033910ae900f68e5aae87b33a4f8149db39465a5c7b9df4f28fd8712432015509f1260371ff61e6e724fc1d43c1b2446252c4b0bc9481f
+  metadata.gz: 828eead6b86f3b21b743b6391e69ae854bb19ba0b1a6e84258a9b67f2675036dd46a91b6178a622d7568466e480e858b519fa7aa9d099e3030470422a3fa706e
+  data.tar.gz: b735bf29d7fb23d56a36a008df77d8ea23325fc0f1c9d0f16826941077000c11a25fa4e7b9b637cd7157e988bd2db5e0f5017ca53218a6b1b23bab8b7df4d46e

data/.gitignore

@@ -2,3 +2,4 @@
 .bundle
 ext/src/msgpack*
 tmp/*
+Gemfile.lock

data/ext/rbtrace.c

@@ -862,6 +862,22 @@ msgq_setup()
 #endif
 }
 
+static VALUE
+eval_inspect(VALUE rb_code) {
+  VALUE binding, result;
+
+  binding = rb_eval_string("$rbtrace_binding ||= binding");
+  result = rb_funcall(binding, rb_intern("eval"), 1, rb_code);
+  return rb_funcall(result, rb_intern("inspect"), 0);
+}
+
+static VALUE
+rescue_inspect(VALUE arg) {
+  VALUE exception = rb_errinfo(); /* get last exception */
+  rb_set_errinfo(Qnil);
+  return rb_funcall(exception, rb_intern("inspect"), 0);
+}
+
 static void
 rbtrace__process_event(msgpack_object cmd)
 {
@@ -1012,8 +1028,10 @@ rbtrace__process_event(msgpack_object cmd)
     strncpy(query, str.ptr, str.size);
     query[str.size] = 0;
 
-    snprintf(code, BUF_SIZE+150, "(begin; %s; rescue Exception => e; e; end).inspect", query);
-    val = rb_eval_string_protect(code, 0);
+    VALUE rb_code, binding;
+    rb_code = rb_str_new2(query);
+
+    val = rb_rescue(eval_inspect, rb_code, rescue_inspect, Qnil);
 
     if (TYPE(val) == T_STRING) {
       rbtrace__send_event(1,
@@ -1021,7 +1039,6 @@ rbtrace__process_event(msgpack_object cmd)
         's', RSTRING_PTR(val)
       );
     }
-
   }
 }
 
@@ -1102,9 +1119,26 @@ signal_handler_wrapper(VALUE arg, VALUE ctx)
 }
 #endif
 
+static VALUE
+send_write(VALUE klass, VALUE val) {
+  if (TYPE(val) == T_STRING) {
+    rbtrace__send_event(1,
+      "write",
+      's', RSTRING_PTR(val)
+    );
+  }
+
+  return Qnil;
+}
+
 void
 Init_rbtrace()
 {
+  VALUE mod = rb_define_module("RBTrace");
+  VALUE output = rb_define_module_under(mod, "OUT");
+
+  rb_define_singleton_method(output, "write", send_write, 1);
+
   // hook into the gc
   gc_hook = Data_Wrap_Struct(rb_cObject, rbtrace_gc_mark, NULL, NULL);
   rb_global_variable(&gc_hook);

data/lib/rbtrace/cli.rb

@@ -34,7 +34,7 @@ class RBTraceCLI
   # Returns nothing.
   def self.cleanup_queues
     if (pids = `ps ax -o pid`.split("\n").map{ |p| p.strip.to_i }).any?
-      ipcs = `ipcs -q`.split("\n").grep(/^(q|0x)/).map{ |line| line[/(0x[a-f0-9]+)/,1] }
+      ipcs = `ipcs -q`.split("\n").grep(/^(q|0x)/).map{ |line| line[/(0x[a-f0-9]+)/,1] }.compact
       ipcs.each do |ipci|
         next if ipci.match(/^0xf/)
 

data/lib/rbtrace/rbtracer.rb

@@ -321,7 +321,9 @@ class RBTracer
   def send_cmd(*cmd)
     begin
       msg = cmd.to_msgpack
-      raise ArgumentError, 'command is too long' if msg.bytesize > MsgQ::EventMsg::BUF_SIZE
+      # A message is null-terminated, but bytesize gives the unterminated
+      # length.
+      raise ArgumentError, 'command is too long' if msg.bytesize >= MsgQ::EventMsg::BUF_SIZE
       MsgQ::EventMsg.send_cmd(@qo, msg)
     rescue Errno::EINTR
       retry
@@ -575,6 +577,10 @@ class RBTracer
         puts if @watch_slow
       end
 
+    when 'write'
+      data, = *cmd
+      STDOUT.write(data)
+
     else
       puts "unknown event #{event}: #{cmd.inspect}"
 

data/lib/rbtrace/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RBTracer
-  VERSION = '0.4.11'
+  VERSION = '0.4.12'
 end

data/tracers/activerecord.tracer

@@ -1,3 +1,4 @@
+ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter#execute(sql)
 ActiveRecord::ConnectionAdapters::MysqlAdapter#execute(sql)
 ActiveRecord::ConnectionAdapters::PostgreSQLAdapter#execute(sql)
 ActiveRecord::ConnectionAdapters::SQLiteAdapter#execute(sql)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbtrace
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.12
 platform: ruby
 authors:
 - Aman Gupta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-05 00:00:00.000000000 Z
+date: 2020-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -77,7 +77,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -124,8 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: 'rbtrace: like strace but for ruby code'

data/Gemfile.lock

@@ -1,25 +0,0 @@
-PATH
-  remote: .
-  specs:
-    rbtrace (0.4.11)
-      ffi (>= 1.0.6)
-      msgpack (>= 0.4.3)
-      optimist (>= 3.0.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ffi (1.9.25)
-    msgpack (1.2.4)
-    optimist (3.0.0)
-    rake (10.5.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rake (~> 10.0)
-  rbtrace!
-
-BUNDLED WITH
-   1.16.4