* parse.y (do_block): split "do" block and tLBRACE_ARG block.

* parse.y (cmd_brace_block): new tLBRACE_ARG block rule

* parse.y (command): can take optional cmd_brace_block; use %prec
  to resolve shift/reduce conflict. (ruby-bugs-ja PR#372)

* eval.c (ruby_finalize): trace_func should be cleared here (after
  executing exit procs and finalizers).

* eval.c (rb_define_alloc_func): new allocation framework, based
  on Nobu's work [ruby-dev:19116].  "allocate" method is no longer
  used for object allocation.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3188 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

lib/profile.rb

@@ -1,19 +1,15 @@
-
 module Profiler__
   Times = if defined? Process.times then Process else Time end
-  Start = Float(Times::times[0])
-  top = "toplevel".intern
-  Stack = [[0, 0, top]]
-  MAP = {"#toplevel" => [1, 0, 0, "#toplevel"]}
-
-  p = proc{|event, file, line, id, binding, klass|
+  # internal values
+  @@start = @@stack = @@map = nil
+  PROFILE_PROC = proc{|event, file, line, id, binding, klass|
     case event
     when "call", "c-call"
       now = Float(Times::times[0])
-      Stack.push [now, 0.0, id]
+      @@stack.push [now, 0.0, id]
     when "return", "c-return"
       now = Float(Times::times[0])
-      tick = Stack.pop
+      tick = @@stack.pop
       name = klass.to_s
       if name.nil? then name = '' end
       if klass.kind_of? Class
@@ -22,26 +18,34 @@ module Profiler__
 	name += "."
       end
       name += id.id2name
-      data = MAP[name]
+      data = @@map[name]
       unless data
 	data = [0.0, 0.0, 0.0, name]
-	MAP[name] = data
+	@@map[name] = data
       end
       data[0] += 1
       cost = now - tick[0]
       data[1] += cost
       data[2] += cost - tick[1]
-      Stack[-1][1] += cost
+      @@stack[-1][1] += cost
     end
   }
-  END {
+module_function
+  def start_profile
+    @@start = Float(Times::times[0])
+    @@stack = [[0, 0, :toplevel], [0, 0, :dummy]]
+    @@map = {"#toplevel" => [1, 0, 0, "#toplevel"]}
+    set_trace_func PROFILE_PROC
+  end
+  def stop_profile
     set_trace_func nil
-    total = Float(Times::times[0]) - Start
+  end
+  def print_profile(f)
+    stop_profile
+    total = Float(Times::times[0]) - @@start
     if total == 0 then total = 0.01 end
-    MAP["#toplevel"][1] = total
-#    f = open("./rmon.out", "w")
-    f = STDERR
-    data = MAP.values
+    @@map["#toplevel"][1] = total
+    data = @@map.values
     data.sort!{|a,b| b[2] <=> a[2]}
     sum = 0
     f.printf "  %%   cumulative   self              self     total\n"           
@@ -51,7 +55,9 @@ module Profiler__
       f.printf "%6.2f %8.2f  %8.2f %8d ", d[2]/total*100, sum, d[2], d[0]
       f.printf "%8.2f %8.2f  %s\n", d[2]*1000/d[0], d[1]*1000/d[0], d[3]
     end
-    f.close
+  end
+  END {
+    print_profile(STDERR)
   }
-  set_trace_func p
+  start_profile
 end