1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

profiler.rb: concurrent-execution

* lib/profiler.rb (Profiler__::PROFILE_PROC, print_profile): store
  profile data per threads for concurrent-execution.
  [ruby-core:22046] [Bug #1152]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38576 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-12-23 08:57:32 +00:00
parent c81a5012f1
commit 80b55686f0
2 changed files with 30 additions and 9 deletions

View file

@ -1,4 +1,8 @@
Sun Dec 23 17:57:25 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
Sun Dec 23 17:57:30 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/profiler.rb (Profiler__::PROFILE_PROC, print_profile): store
profile data per threads for concurrent-execution.
[ruby-core:22046] [Bug #1152]
* lib/profiler.rb (Profiler__::Wrapper): support calling singleton
methods of an instance of BasicObject.

View file

@ -73,30 +73,35 @@ module Profiler__
end
# internal values
@@start = @@stack = @@map = nil
@@start = nil # the start time that profiling began
@@stacks = nil # the map of stacks keyed by thread
@@maps = nil # the map of call data keyed by thread, class and id. Call data contains the call count, total time,
PROFILE_PROC = TracePoint.new(:call, :c_call, :return, :c_return) {|tp|
case tp.event
when :call, :c_call
now = Process.times[0]
@@stack.push [now, 0.0]
stack = (@@stacks[Thread.current] ||= [])
stack.push [now, 0.0]
when :return, :c_return
now = Process.times[0]
key = Wrapper.new(tp.defined_class, tp.method_id)
if tick = @@stack.pop
data = (@@map[key] ||= [0, 0.0, 0.0, key])
stack = (@@stacks[Thread.current] ||= [])
if tick = stack.pop
threadmap = (@@maps[Thread.current] ||= {})
data = (threadmap[key] ||= [0, 0.0, 0.0, key])
data[0] += 1
cost = now - tick[0]
data[1] += cost
data[2] += cost - tick[1]
@@stack[-1][1] += cost if @@stack[-1]
stack[-1][1] += cost if stack[-1]
end
end
}
module_function
def start_profile
@@start = Process.times[0]
@@stack = []
@@map = {}
@@stacks = {}
@@maps = {}
PROFILE_PROC.enable
end
def stop_profile
@ -106,7 +111,19 @@ module_function
stop_profile
total = Process.times[0] - @@start
if total == 0 then total = 0.01 end
data = @@map.values
totals = {}
@@maps.values.each do |threadmap|
threadmap.each do |key, data|
total_data = (totals[key] ||= [0, 0.0, 0.0, key])
total_data[0] += data[0]
total_data[1] += data[1]
total_data[2] += data[2]
end
end
# Maybe we should show a per thread output and a totals view?
data = totals.values
data = data.sort_by{|x| -x[2]}
sum = 0
f.printf " %% cumulative self self total\n"