is_a 0.1.0 → 0.1.1

data/README.md

@@ -6,7 +6,9 @@ A small library of missing ruby methods for introspection. See Usage.
 
 Add this line to your application's Gemfile:
 
-    gem 'is_a'
+```ruby
+gem 'is_a'
+```
 
 And then execute:
 
@@ -42,7 +44,7 @@ ObjectSpace._id2ref(id) == obj # => true
  #For 1.9.3 use BasicObject#__id__
 ```
 
-### Fast getting of lines from caller
+### Fast single line from caller
 
 Ruby's `caller` is handy, but sometimes you do not need the whole array of strings it allocates generates on each call.
 
@@ -61,9 +63,9 @@ end
 Results:
 
 ```
-                  user     system      total        real
-caller[1]     0.430000   0.010000   0.440000 (  0.443102)
-caller_line   0.010000   0.000000   0.010000 (  0.002275)
+                          user     system      total        real
+caller[1]             1.760000   0.040000   1.800000 (  1.802799)
+caller_line           0.080000   0.000000   0.080000 (  0.089649)
 ```
 
 

data/Rakefile

@@ -4,77 +4,33 @@ require "bundler/gem_tasks"
 require 'rake/extensiontask'
 Rake::ExtensionTask.new('is_a')
 
-desc "Simple dump test,just to check if extension compiles and does not segfault on simple dump"
-task :test => :compile do
+require 'rake/testtask'
 
-  #TODO: use some testing framework like minitest...
+Rake::TestTask.new(:test) do |t|
+  t.pattern = 'spec/**/*_spec.rb'
+  t.libs.push 'spec'
+end
 
-  require "bundler/setup"
-  require 'is_a'
 
-  class SomeDSL < BasicObject
-    def initialize
-      @search_me = 12345
-    end
-    def lala
-    end
-  end
+desc "Simple dump test,just to check if extension compiles and does not segfault on simple dump"
+task :test => :compile
 
-  obj = SomeDSL.new
+task :default => :test
 
-  def cls obj
-    cls = IsA.class_of(obj)
-    cls1 = cls
-    classes = []
-    while cls = cls.superclass
-      classes << cls
+desc "Make simple benchmark for caller_line"
+task :bench_caller_line do
+  require 'bundler/setup'
+  require 'is_a'
+  require 'benchmark'
+  n = 50000
+  class UtilClassWithCallerline
+    class << self
+      define_method :caller_line, method(:caller_line)
     end
-
-    puts "Cls is #{cls1.inspect}, #{classes.inspect}"
-    cls1
-  end
-
-  c = cls obj
-  cls c
-  cls nil
-
-  id = IsA.id_of(obj)
-  puts "Id is #{id}"
-  if ObjectSpace._id2ref(id) == obj
-    puts "Getref ok"
-  else
-    puts "Getref FAIL"
   end
-
-  unless IsA.object?(obj)
-    puts "object? ok"
-  else
-    puts "object? FAIL"
-  end
-
-  if IsA.object?(c)
-    puts "object? ok"
-  else
-    puts "object? FAIL"
-  end
-
-  def test_caller
-    puts "Real caller: #{caller[0]}"
-    puts "Caller at 0: #{IsA.caller_line(0)}"
-    puts caller_line
-  end
-
-  test_caller
-
-  require 'benchmark'
-  n = 10000
-  Benchmark.bm(11) do |x|
+  Benchmark.bm(19) do |x|
     x.report("caller[1]") { n.times { caller[1] } }
     x.report("caller_line") { n.times { caller_line(1) } }
+    x.report("caller_line in ctx") { n.times { UtilClassWithCallerline.caller_line(1) } }
   end
-
-  #require 'heap_dump'
-  #HeapDump.dump
-end
-
-task :default => :test
+end

data/ext/is_a/is_a.c

@@ -35,13 +35,17 @@ static VALUE caller_line(int offset)
   rb_control_frame_t* cfp = th->cfp + offset;
   const rb_control_frame_t* stack_end = (void *)(th->stack + th->stack_size);
 
-  if(cfp < stack_end){
+  VALUE name = 0;
+
+  while(cfp < stack_end){
     if (cfp->iseq != 0) {
       if (cfp->pc != 0) {
         rb_iseq_t *iseq = cfp->iseq;
         int line_no = rb_vm_get_sourceline(cfp);
-        VALUE file = iseq->filename,
-              name = iseq->name;
+        VALUE file = iseq->filename;
+        //name may be passed from previous iteration
+        if(!name)
+          name = iseq->name;
         if (line_no) {
           return rb_enc_sprintf(
                 rb_enc_compatible(file, name),
@@ -55,12 +59,26 @@ static VALUE caller_line(int offset)
         }
       }
     } else {
-      // printf("CFUNC\n");
-      return Qnil;
+      // for CFUNCs - search for previous ruby frame for location
+      if (RUBYVM_CFUNC_FRAME_P(cfp)) {
+        if (!name){
+          ID id;
+          if (cfp->me->def)
+            id = cfp->me->def->original_id;
+          else
+            id = cfp->me->called_id;
+          if (id != ID_ALLOCATOR){
+            name = rb_id2str(id);
+          }
+        }
+      }
+      cfp += 1;
+      continue;
     }
-  } else {
-    // level is out of bounds
+    break;
   }
+
+  // level is out of bounds
   return Qnil;
 }
 

data/is_a.gemspec

@@ -19,4 +19,5 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency("debugger-ruby_core_source")
   gem.add_development_dependency "rake-compiler"
+  gem.add_development_dependency "minitest"
 end

data/lib/is_a/version.rb

@@ -1,3 +1,3 @@
 module IsA
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/is_a_spec.rb

@@ -0,0 +1,51 @@
+require 'minitest/autorun'
+require 'benchmark'
+require 'is_a'
+
+describe IsA do
+
+  subject { IsA }
+
+  it 'id_of' do
+    obj = Class.new(BasicObject){}.new
+
+    id = subject.id_of(obj)
+    assert_equal(obj, ObjectSpace._id2ref(id))
+  end
+
+  it "object?" do
+    subject.object?(Class.new(BasicObject){}.new).must_equal false
+    subject.object?("string is object").must_equal true
+  end
+
+  describe "caller_line" do
+    it "in methods" do
+      def test_caller
+        [caller[0], subject.caller_line(0)]
+      end
+      r = test_caller
+      r.first.must_equal r.last
+    end
+
+    it "in blocks" do
+      r = proc{
+        [caller[0], subject.caller_line(0)]
+      }.call
+      r.last.wont_be_nil
+      r.first.must_equal r.last
+    end
+
+    it "should be faster than caller[0]" do
+      n = 1000
+      anchor = Benchmark.measure{ n.times{ caller[0] } }
+      res = Benchmark.measure{ n.times{ subject.caller_line(0) } }
+      assert_operator res.total, :<, anchor.total
+      assert_operator res.real, :<, anchor.real
+      assert_operator res.utime, :<, anchor.utime
+
+      # no large memory allocation => no system cpu time
+      res.stime.must_equal 0.0
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: is_a
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-02 00:00:00.000000000 Z
+date: 2013-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debugger-ruby_core_source
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Fear weak references to BasicObject no more
 email:
 - vasilyfedoseyev@gmail.com
@@ -61,6 +77,7 @@ files:
 - is_a.gemspec
 - lib/is_a.rb
 - lib/is_a/version.rb
+- spec/is_a_spec.rb
 homepage: http://github.com/Vasfed/is_a
 licenses: []
 post_install_message: 
@@ -75,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3551024361612674054
+      hash: 2510194417071522637
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -84,11 +101,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3551024361612674054
+      hash: 2510194417071522637
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Defines methods to introspect any ruby object more deeply
-test_files: []
+test_files:
+- spec/is_a_spec.rb