rblineprof 0.3.3.beta → 0.3.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a6c7319f8169d091dde957717561a5776edfec3e
+  data.tar.gz: a39aa28cc67dbe8084b68085ec8ce495fdcf3655
+SHA512:
+  metadata.gz: 26059d9a1c174f9fa1721bc66ae6339ac0727b0164f7f9df8f973315a64bb8e94f359db6461a50f083e7a6abb772ad113fbf8a7041d72eb13459d6efe90daf33
+  data.tar.gz: 56f634c3c42af0a5b040fb68c2eeb11f45561f2c6613781f8a84d86a80843dcb74ef6f97d55e7b4786923a0a19f734490c62ba61af5c62c6a9b62f020a3ba139

data/.gitignore

@@ -0,0 +1,3 @@
+/tmp
+/lib/*.bundle
+/lib/*.so

data/Gemfile

@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gemspec

data/Gemfile.lock

@@ -0,0 +1,16 @@
+PATH
+  remote: .
+  specs:
+    rblineprof (0.3.2)
+      debugger-ruby_core_source (~> 1.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    debugger-ruby_core_source (1.3.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rblineprof!

data/README.md

@@ -31,6 +31,10 @@
            | end
 ```
 
+### Rails integration
+
+* [peek-rblineprof](https://github.com/peek/peek-rblineprof#peekrblineprof)
+
 ## Other profilers
 
 * [PLine](https://github.com/soba1104/PLine) line-profiler for ruby 1.9
@@ -39,3 +43,7 @@
 * [ruby-prof](https://github.com/rdp/ruby-prof)
 * [perftools.rb](https://github.com/tmm1/perftools.rb)
 * [zenprofile](https://github.com/seattlerb/zenprofile)
+
+## License
+
+rblineprof is released under the [MIT License](http://www.opensource.org/licenses/MIT).

data/Rakefile

@@ -0,0 +1,31 @@
+task :default => :test
+
+# ==========================================================
+# Packaging
+# ==========================================================
+
+GEMSPEC = eval(File.read('rblineprof.gemspec'))
+
+require 'rubygems/package_task'
+Gem::PackageTask.new(GEMSPEC) do |pkg|
+end
+
+# ==========================================================
+# Ruby Extension
+# ==========================================================
+
+require 'rake/extensiontask'
+Rake::ExtensionTask.new('rblineprof', GEMSPEC) do |ext|
+  ext.ext_dir = 'ext'
+end
+task :build => :compile
+
+# ==========================================================
+# Testing
+# ==========================================================
+
+require 'rake/testtask'
+Rake::TestTask.new 'test' do |t|
+  t.test_files = FileList['test/test_*.rb']
+end
+task :test => :build

data/ext/extconf.rb

@@ -2,7 +2,12 @@ require 'mkmf'
 
 have_func('rb_os_allocated_objects')
 
-if RUBY_VERSION >= "1.9"
+if RUBY_VERSION >= "2.1"
+  have_func('rb_gc_stat')
+  have_func('rb_profile_frames')
+  have_func('rb_tracepoint_new')
+  create_makefile 'rblineprof'
+elsif RUBY_VERSION >= "1.9"
   require "debugger/ruby_core_source"
 
   hdrs = proc {

data/ext/rblineprof.c

@@ -4,15 +4,19 @@
 #include <sys/time.h>
 #include <sys/resource.h>
 
-#ifdef RUBY_VM
+#if defined(RUBY_VM)
   #include <ruby/re.h>
+  #include <ruby/debug.h>
   #include <ruby/intern.h>
-  #include <vm_core.h>
-  #include <iseq.h>
 
-  // There's a compile error on 1.9.3. So:
-  #ifdef RTYPEDDATA_DATA
-  #define ruby_current_thread ((rb_thread_t *)RTYPEDDATA_DATA(rb_thread_current()))
+  #if !defined(HAVE_RB_PROFILE_FRAMES)
+    #include <vm_core.h>
+    #include <iseq.h>
+
+    // There's a compile error on 1.9.3. So:
+    #ifdef RTYPEDDATA_DATA
+    #define ruby_current_thread ((rb_thread_t *)RTYPEDDATA_DATA(rb_thread_current()))
+    #endif
   #endif
 #else
   #include <st.h>
@@ -28,6 +32,7 @@ size_t rb_os_allocated_objects(void);
 #endif
 
 static VALUE gc_hook;
+static VALUE sym_total_allocated_object;
 
 /*
  * Time in microseconds
@@ -40,7 +45,7 @@ typedef uint64_t prof_time_t;
 typedef struct snapshot {
   prof_time_t wall_time;
   prof_time_t cpu_time;
-#ifdef HAVE_RB_OS_ALLOCATED_OBJECTS
+#if defined(HAVE_RB_OS_ALLOCATED_OBJECTS) || defined(HAVE_RB_GC_STAT)
   size_t allocated_objects;
 #endif
 } snapshot_t;
@@ -78,7 +83,9 @@ typedef struct sourcefile {
 typedef struct stackframe {
   // data emitted from Ruby to our profiler hook
   rb_event_flag_t event;
-#ifdef RUBY_VM
+#if defined(HAVE_RB_PROFILE_FRAMES)
+  VALUE thread;
+#elif defined(RUBY_VM)
   rb_thread_t *thread;
 #else
   NODE *node;
@@ -162,7 +169,7 @@ snapshot_diff(snapshot_t *t1, snapshot_t *t2)
   snapshot_t diff = {
     .wall_time         = t1->wall_time - t2->wall_time,
     .cpu_time          = t1->cpu_time  - t2->cpu_time,
-#ifdef HAVE_RB_OS_ALLOCATED_OBJECTS
+#if defined(HAVE_RB_OS_ALLOCATED_OBJECTS) || defined(HAVE_RB_GC_STAT)
     .allocated_objects = t1->allocated_objects - t2->allocated_objects
 #endif
   };
@@ -175,7 +182,7 @@ snapshot_increment(snapshot_t *s, snapshot_t *inc)
 {
   s->wall_time         += inc->wall_time;
   s->cpu_time          += inc->cpu_time;
-#ifdef HAVE_RB_OS_ALLOCATED_OBJECTS
+#if defined(HAVE_RB_OS_ALLOCATED_OBJECTS) || defined(HAVE_RB_GC_STAT)
   s->allocated_objects += inc->allocated_objects;
 #endif
 }
@@ -277,7 +284,7 @@ sourcefile_lookup(char *filename)
   return srcfile;
 }
 
-#ifdef RUBY_VM
+#if defined(RUBY_VM) && !defined(HAVE_RB_PROFILE_FRAMES)
 /* Find the source of the current method call. This is based on rb_f_caller
  * in vm_eval.c, and replicates the behavior of `caller.first` from ruby.
  *
@@ -343,7 +350,17 @@ profiler_hook(rb_event_flag_t event, NODE *node, VALUE self, ID mid, VALUE klass
    * we use ruby_current_node here to get the caller's file/line info,
    * (as opposed to node, which points to the callee method being invoked)
    */
-#ifndef RUBY_VM
+#if defined(HAVE_RB_PROFILE_FRAMES)
+  int l;
+  VALUE iseq, path;
+  rb_profile_frames(0, 1, &iseq, &l);
+
+  /* TODO: use fstring VALUE directly */
+  path = rb_profile_frame_absolute_path(iseq);
+  if (!RTEST(path)) path = rb_profile_frame_path(iseq);
+  file = RSTRING_PTR(path);
+  line = l;
+#elif !defined(RUBY_VM)
   NODE *caller_node = ruby_frame->node;
   if (!caller_node) return;
 
@@ -390,8 +407,10 @@ profiler_hook(rb_event_flag_t event, NODE *node, VALUE self, ID mid, VALUE klass
   snapshot_t now = {
     .wall_time         = walltime_usec(),
     .cpu_time          = cputime_usec(),
-#ifdef HAVE_RB_OS_ALLOCATED_OBJECTS
+#if defined(HAVE_RB_OS_ALLOCATED_OBJECTS)
     .allocated_objects = rb_os_allocated_objects()
+#elif defined(HAVE_RB_GC_STAT)
+    .allocated_objects = rb_gc_stat(sym_total_allocated_object)
 #endif
   };
 
@@ -415,7 +434,9 @@ profiler_hook(rb_event_flag_t event, NODE *node, VALUE self, ID mid, VALUE klass
         frame->line = line;
         frame->start = now;
         frame->srcfile = srcfile;
-#ifdef RUBY_VM
+#if defined(HAVE_RB_PROFILE_FRAMES)
+        frame->thread = rb_thread_current();
+#elif defined(RUBY_VM)
         frame->thread = th;
 #else
         frame->node = node;
@@ -462,7 +483,9 @@ profiler_hook(rb_event_flag_t event, NODE *node, VALUE self, ID mid, VALUE klass
         if (rblineprof.stack_depth > 0)
           rblineprof.stack_depth--;
       } while (frame &&
-#ifdef RUBY_VM
+#if defined(HAVE_RB_PROFILE_FRAMES)
+               frame->thread != rb_thread_current() &&
+#elif defined(RUBY_VM)
                frame->thread != th &&
 #endif
                /* Break when we find a matching CALL/C_CALL.
@@ -531,7 +554,7 @@ summarize_files(st_data_t key, st_data_t record, st_data_t arg)
   long i;
 
   rb_ary_store(ary, 0, rb_ary_new3(
-#ifdef HAVE_RB_OS_ALLOCATED_OBJECTS
+#if defined(HAVE_RB_OS_ALLOCATED_OBJECTS) || defined(HAVE_RB_GC_STAT)
     7,
 #else
     6,
@@ -542,14 +565,14 @@ summarize_files(st_data_t key, st_data_t record, st_data_t arg)
     ULL2NUM(srcfile->total.cpu_time),
     ULL2NUM(srcfile->child.cpu_time),
     ULL2NUM(srcfile->exclusive.cpu_time)
-#ifdef HAVE_RB_OS_ALLOCATED_OBJECTS
+#if defined(HAVE_RB_OS_ALLOCATED_OBJECTS) || defined(HAVE_RB_GC_STAT)
     , ULL2NUM(srcfile->total.allocated_objects)
 #endif
   ));
 
   for (i=1; i<srcfile->nlines; i++)
     rb_ary_store(ary, i, rb_ary_new3(
-#ifdef HAVE_RB_OS_ALLOCATED_OBJECTS
+#if defined(HAVE_RB_OS_ALLOCATED_OBJECTS) || defined(HAVE_RB_GC_STAT)
       4,
 #else
       3,
@@ -557,7 +580,7 @@ summarize_files(st_data_t key, st_data_t record, st_data_t arg)
       ULL2NUM(srcfile->lines[i].total.wall_time),
       ULL2NUM(srcfile->lines[i].total.cpu_time),
       ULL2NUM(srcfile->lines[i].calls)
-#ifdef HAVE_RB_OS_ALLOCATED_OBJECTS
+#if defined(HAVE_RB_OS_ALLOCATED_OBJECTS) || defined(HAVE_RB_GC_STAT)
       , ULL2NUM(srcfile->lines[i].total.allocated_objects)
 #endif
     ));
@@ -621,7 +644,6 @@ lineprof(VALUE self, VALUE filename)
   rb_ensure(rb_yield, Qnil, lineprof_ensure, self);
 
   VALUE ret = rb_hash_new();
-  VALUE ary = Qnil;
 
   if (rblineprof.source_filename) {
     summarize_files(Qnil, (st_data_t)&rblineprof.file, ret);
@@ -642,6 +664,7 @@ rblineprof_gc_mark()
 void
 Init_rblineprof()
 {
+  sym_total_allocated_object = ID2SYM(rb_intern("total_allocated_object"));
   gc_hook = Data_Wrap_Struct(rb_cObject, rblineprof_gc_mark, NULL, NULL);
   rb_global_variable(&gc_hook);
 

data/rblineprof.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'rblineprof'
-  s.version = '0.3.3.beta'
+  s.version = '0.3.3'
   s.homepage = 'http://github.com/tmm1/rblineprof'
 
   s.authors = 'Aman Gupta'
@@ -12,5 +12,7 @@ Gem::Specification.new do |s|
   s.summary = 'line-profiler for ruby'
   s.description = 'rblineprof shows you lines of code that are slow.'
 
+  s.license = 'MIT'
+
   s.add_dependency 'debugger-ruby_core_source', '~> 1.2'
 end

data/test.rb

@@ -1,4 +1,4 @@
-$:.unshift 'ext'
+$:.unshift 'lib'
 require 'rblineprof'
 
 class Obj
@@ -108,16 +108,20 @@ profile = lineprof(/./) do
   ('a'..'z').to_a
 end
 
+allocation_mode = false
+
 File.readlines(file).each_with_index do |line, num|
   wall, cpu, calls, allocations = profile[file][num+1]
 
-  if allocations > 0
-    printf "% 10d objs | %s", allocations, line
-  else
-    printf "                | %s", line
-  end
+  if allocation_mode
+    if allocations > 0
+      printf "% 10d objs | %s", allocations, line
+    else
+      printf "                | %s", line
+    end
 
-  next
+    next
+  end
 
   if calls && calls > 0
     printf "% 8.1fms + % 8.1fms (% 5d) | %s", cpu/1000.0, (wall-cpu)/1000.0, calls, line

data/test/test_lineprof.rb

@@ -0,0 +1,33 @@
+$:.unshift File.expand_path('../../lib', __FILE__)
+require 'rblineprof'
+require 'test/unit'
+
+class LineProfTest < Test::Unit::TestCase
+  def test_real
+    profile = lineprof(/./) do
+      sleep 0.001
+    end
+
+    line = profile[__FILE__][__LINE__-3]
+    assert_in_delta 1000, line[0], 600
+    assert_equal 1, line[2]
+  end
+
+  def test_cpu
+    profile = lineprof(/./) do
+      (fibonacci = Hash.new{ |h,k| h[k] = k < 2 ?  k : h[k-1] + h[k-2] })[500]
+    end
+
+    line = profile[__FILE__][__LINE__-3]
+    assert_operator line[1], :>=, 800
+  end
+
+  def test_objects
+    profile = lineprof(/./) do
+      100.times{ "str" }
+    end
+
+    line = profile[__FILE__][__LINE__-3]
+    assert_equal 100, line[3]
+  end
+end

metadata

@@ -1,30 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: rblineprof
 version: !ruby/object:Gem::Version
-  version: 0.3.3.beta
-  prerelease: 6
+  version: 0.3.3
 platform: ruby
 authors:
 - Aman Gupta
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-12 00:00:00.000000000 Z
+date: 2014-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debugger-ruby_core_source
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
 description: rblineprof shows you lines of code that are slow.
@@ -34,34 +31,40 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
+- ".gitignore"
+- Gemfile
+- Gemfile.lock
 - README.md
+- Rakefile
 - ext/.gitignore
 - ext/extconf.rb
 - ext/rblineprof.c
 - rblineprof.gemspec
 - test.rb
+- test/test_lineprof.rb
 homepage: http://github.com/tmm1/rblineprof
-licenses: []
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.0.rc.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: line-profiler for ruby
 test_files: []
+has_rdoc: