From afb02bbe92e55f877d50ed8705c95a41d541458d Mon Sep 17 00:00:00 2001
From: tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 1 Dec 2012 02:13:06 +0000
Subject: * variable.c (rb_class_path_no_cache): add a function to get the
 class   path without caching the computed path. Some classes are frozen, and 
  will raise an exception without this.

* probes.d (cmethod-entry, cmethod-return): separate cmethods from
  regular methods to match set trace func.

* probes_helper.h: refactor macros.  Fix probes to avoid calling
  #inspect when profiling.

* insns.def: update for use with new macros.

* vm_eval.c: ditto

* vm_insnhelper.c: ditto

* test/dtrace/test_singleton_function.rb: fix test for new output.

* test/dtrace/test_cmethod.rb: test the cmethod probes.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38099 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/dtrace/test_cmethod.rb            | 49 ++++++++++++++++++++++++++++++++++
 test/dtrace/test_singleton_function.rb |  4 +--
 2 files changed, 51 insertions(+), 2 deletions(-)
 create mode 100644 test/dtrace/test_cmethod.rb

(limited to 'test/dtrace')

diff --git a/test/dtrace/test_cmethod.rb b/test/dtrace/test_cmethod.rb
new file mode 100644
index 0000000000..138ec55ab3
--- /dev/null
+++ b/test/dtrace/test_cmethod.rb
@@ -0,0 +1,49 @@
+require 'dtrace/helper'
+
+module DTrace
+  class TestCMethod < TestCase
+    def test_entry
+      probe = <<-eoprobe
+ruby$target:::cmethod-entry
+{
+  printf("%s %s %s %d\\n", copyinstr(arg0), copyinstr(arg1), copyinstr(arg2), arg3);
+}
+      eoprobe
+
+      trap_probe(probe, ruby_program) { |d_file, rb_file, probes|
+	foo_calls = probes.map { |line| line.split }.find_all { |row|
+	  row[1] == 'times'
+	}
+
+	assert_equal 1, foo_calls.length
+      }
+    end
+
+    def test_exit
+      probe = <<-eoprobe
+ruby$target:::cmethod-return
+{
+  printf("%s %s %s %d\\n", copyinstr(arg0), copyinstr(arg1), copyinstr(arg2), arg3);
+}
+      eoprobe
+
+      trap_probe(probe, ruby_program) { |d_file, rb_file, probes|
+	foo_calls = probes.map { |line| line.split }.find_all { |row|
+	  row[1] == 'times'
+	}
+
+	assert_equal 1, foo_calls.length
+      }
+    end
+
+    def ruby_program
+      <<-eoruby
+      class Foo
+	def self.foo; end
+      end
+      10.times { Foo.foo }
+      eoruby
+    end
+  end
+end if defined?(DTrace::TestCase)
+
diff --git a/test/dtrace/test_singleton_function.rb b/test/dtrace/test_singleton_function.rb
index 06f070913b..4b5d3d7f18 100644
--- a/test/dtrace/test_singleton_function.rb
+++ b/test/dtrace/test_singleton_function.rb
@@ -13,7 +13,7 @@ ruby$target:::method-entry
 
       trap_probe(probe, ruby_program) { |d_file, rb_file, probes|
 	foo_calls = probes.map { |line| line.split }.find_all { |row|
-	  row.first == '#<Class:Foo>'  && row[1] == 'foo'
+	  row.first == 'Foo'  && row[1] == 'foo'
 	}
 
 	assert_equal 10, foo_calls.length
@@ -33,7 +33,7 @@ ruby$target:::method-return
 
       trap_probe(probe, ruby_program) { |d_file, rb_file, probes|
 	foo_calls = probes.map { |line| line.split }.find_all { |row|
-	  row.first == '#<Class:Foo>'  && row[1] == 'foo'
+	  row.first == 'Foo'  && row[1] == 'foo'
 	}
 
 	assert_equal 10, foo_calls.length
-- 
cgit v1.2.3