summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-12-07 15:46:49 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-12-07 15:46:49 +0000
commit41c48d1ee8626699c345a86ede86cbada70d2b2c (patch)
treed18032936aa231b6e81dd85f193348fdf404713f
parentda32ce1a67677bd0f5df8fa31e0ab05c26c7d401 (diff)
* eval.c (call_trace_func): klass parameter should be a
class/module that defines calling method. [ruby-talk:169307] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9656 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--eval.c2
-rw-r--r--lib/profiler.rb2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c1c762b..8b8e50c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 8 00:40:52 2005 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * eval.c (call_trace_func): klass parameter should be a
+ class/module that defines calling method. [ruby-talk:169307]
+
Wed Dec 7 17:10:27 2005 Kazuhiro NISHIYAMA <zn@mbf.nifty.com>
* sprintf.c (rb_f_sprintf): [ruby-dev:27967]
diff --git a/eval.c b/eval.c
index db01897..c46bb5e 100644
--- a/eval.c
+++ b/eval.c
@@ -2514,7 +2514,7 @@ call_trace_func(rb_event_t event, NODE *node, VALUE self, ID id, VALUE klass /*
klass = RBASIC(klass)->klass;
}
else if (FL_TEST(klass, FL_SINGLETON)) {
- klass = self;
+ klass = rb_iv_get(klass, "__attached__");
}
}
PUSH_TAG(PROT_NONE);
diff --git a/lib/profiler.rb b/lib/profiler.rb
index 9762fa1..1067106 100644
--- a/lib/profiler.rb
+++ b/lib/profiler.rb
@@ -34,7 +34,7 @@ module_function
total = Process.times[0] - @@start
if total == 0 then total = 0.01 end
data = @@map.values
- data.sort!{|a,b| b[2] <=> a[2]}
+ data = data.sort_by{|x| x[2]}
sum = 0
f.printf " %% cumulative self self total\n"
f.printf " time seconds seconds calls ms/call ms/call name\n"