* object.c (Init_Object): should not remove Class#allocate.

* lib/profiler.rb: separate profiling functions, without
  trace_func and at_exit setting.


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

ChangeLog

@@ -1,3 +1,10 @@
+Fri Dec 20 17:40:59 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* object.c (Init_Object): should not remove Class#allocate.
+
+	* lib/profiler.rb: separate profiling functions, without
+	  trace_func and at_exit setting.
+
 Fri Dec 20 16:20:04 2002  Yukihiro Matsumoto  <matz@ruby-lang.org>
 
 	* parse.y (do_block): split "do" block and tLBRACE_ARG block.

lib/profile.rb

@@ -1,63 +1,6 @@
-module Profiler__
-  Times = if defined? Process.times then Process else Time end
-  # 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]
-    when "return", "c-return"
-      now = Float(Times::times[0])
-      tick = @@stack.pop
-      name = klass.to_s
-      if name.nil? then name = '' end
-      if klass.kind_of? Class
-	name += "#"
-      else
-	name += "."
-      end
-      name += id.id2name
-      data = @@map[name]
-      unless data
-	data = [0.0, 0.0, 0.0, name]
-	@@map[name] = data
-      end
-      data[0] += 1
-      cost = now - tick[0]
-      data[1] += cost
-      data[2] += cost - tick[1]
-      @@stack[-1][1] += cost
-    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
-  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
-    data = @@map.values
-    data.sort!{|a,b| b[2] <=> a[2]}
-    sum = 0
-    f.printf "  %%   cumulative   self              self     total\n"           
-    f.printf " time   seconds   seconds    calls  ms/call  ms/call  name\n"
-    for d in data
-      sum += d[2]
-      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
-  end
-  END {
-    print_profile(STDERR)
-  }
-  start_profile
-end
+require 'profiler'
+
+END {
+  Profiler__::print_profile(STDERR)
+}
+Profiler__::start_profile

lib/profiler.rb

@@ -0,0 +1,59 @@
+module Profiler__
+  Times = if defined? Process.times then Process else Time end
+  # 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]
+    when "return", "c-return"
+      now = Float(Times::times[0])
+      tick = @@stack.pop
+      name = klass.to_s
+      if name.nil? then name = '' end
+      if klass.kind_of? Class
+	name += "#"
+      else
+	name += "."
+      end
+      name += id.id2name
+      data = @@map[name]
+      unless data
+	data = [0.0, 0.0, 0.0, name]
+	@@map[name] = data
+      end
+      data[0] += 1
+      cost = now - tick[0]
+      data[1] += cost
+      data[2] += cost - tick[1]
+      @@stack[-1][1] += cost
+    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
+  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
+    data = @@map.values
+    data.sort!{|a,b| b[2] <=> a[2]}
+    sum = 0
+    f.printf "  %%   cumulative   self              self     total\n"           
+    f.printf " time   seconds   seconds    calls  ms/call  ms/call  name\n"
+    for d in data
+      sum += d[2]
+      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
+  end
+end

object.c

@@ -1426,6 +1426,7 @@ Init_Object()
     rb_define_method(rb_cModule, "class_variables", rb_mod_class_variables, 0);
     rb_define_private_method(rb_cModule, "remove_class_variable", rb_mod_remove_cvar, 1);
 
+    rb_define_method(rb_cClass, "allocate", rb_obj_alloc, 0);
     rb_define_method(rb_cClass, "new", rb_class_new_instance, -1);
     rb_define_method(rb_cClass, "initialize", rb_class_initialize, -1);
     rb_define_method(rb_cClass, "superclass", rb_class_superclass, 0);