From 6698dd81e6d05b76baddf76703308c5d20f2a492 Mon Sep 17 00:00:00 2001
From: ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 28 Sep 2007 03:51:41 +0000
Subject: [PATCH] * benchmark/driver.rb: fix file selection algorithm.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13540 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog           |  4 ++++
 benchmark/driver.rb | 48 ++++++++++++++++++++++++++++++++-------------
 version.h           |  6 +++---
 3 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cb273aa4c3..9c3cafc0f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Sep 28 12:49:05 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* benchmark/driver.rb: fix file selection algorithm.
+
 Thu Sep 27 17:36:28 2007  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* win32/REAMDE.win32: follow recent changes.
diff --git a/benchmark/driver.rb b/benchmark/driver.rb
index ff214619e6..56c3efff0e 100644
--- a/benchmark/driver.rb
+++ b/benchmark/driver.rb
@@ -22,7 +22,7 @@ class BenchmarkDriver
       next if e.empty?
 
       v =  `#{e} -v`.chomp
-      v.sub!(' patchlevel 0', '')
+      v.sub!(/ patchlevel \d+/, '')
       [e, v]
     }.compact
 
@@ -89,19 +89,39 @@ class BenchmarkDriver
 
   end
 
-  def run
-    Dir.glob(File.join(@dir, 'bm*.rb')){|file|
+  def files
+    flag = {}
+    vm1 = vm2 = wl1 = wl2 = false
+    @files = Dir.glob(File.join(@dir, 'bm*.rb')).map{|file|
       next if @pattern && /#{@pattern}/ !~ File.basename(file)
+      case file
+      when /bm_(vm[12])_/, /bm_loop_(whileloop2?).rb/
+        flag[$1] = true
+      end
+      file
+    }.compact
 
-      if /bm_vm1_/ =~ file and !@loop_wl1
-        r = measure_file(File.join(File.dirname(file), 'bm_loop_whileloop.rb'))
+    if flag['vm1'] && !flag['whileloop']
+      @files << File.join(@dir, 'bm_loop_whileloop.rb')
+    elsif flag['vm2'] && !flag['whileloop2']
+      @files << File.join(@dir, 'bm_loop_whileloop2.rb')
+    end
+
+    @files.sort!
+    STDERR.puts "total: #{@files.size * @repeat} trial(s) (#{@repeat} trial(s) for #{@files.size} benchmark(s))"
+    @files
+  end
+
+  def run
+    files.each_with_index{|file, i|
+      @i = i
+      r = measure_file(file)
+
+      if /bm_loop_whileloop.rb/ =~ file
         @loop_wl1 = r[1].map{|e| e.min}
-      elsif /bm_vm1_/ =~ file and !@loop_wl2
-        r = measure_file(File.join(File.dirname(file), 'bm_loop_whileloop2.rb'))
+      elsif /bm_loop_whileloop2.rb/ =~ file
         @loop_wl2 = r[1].map{|e| e.min}
       end
-
-      measure_file(file)
     }
   end
 
@@ -161,20 +181,20 @@ if __FILE__ == $0
     :repeat => 1,
   }
   parser = OptionParser.new{|o|
-    o.on('-e', '--executables [EXECUTABLES]',
-         'Specify benchmark targets ("exec1; exec2; exec3, ...")'){|e|
+    o.on('-e', '--executables [EXECS]',
+         "Specify benchmark one or more targets. (exec1; exec2; exec3, ...)"){|e|
       opt[:execs] = e.split(/;/)
     }
-    o.on('-d', '--directory [DIRECTORY]'){|d|
+    o.on('-d', '--directory [DIRECTORY]', "Benchmark directory"){|d|
       opt[:dir] = d
     }
     o.on('-p', '--pattern [PATTERN]', "Benchmark name pattern"){|p|
       opt[:pattern] = p
     }
-    o.on('-n', '--repeat-num [NUM]', "Repeat count"){|n|
+    o.on('-r', '--repeat-count [NUM]', "Repeat count"){|n|
       opt[:repeat] = n.to_i
     }
-    o.on('-q', '--quiet'){|q|
+    o.on('-q', '--quiet', "Run without notify information except result table."){|q|
       opt[:quiet] = q
     }
     o.on('-v', '--verbose'){|v|
diff --git a/version.h b/version.h
index 7d2357a789..dd9f7bd595 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-09-27"
+#define RUBY_RELEASE_DATE "2007-09-28"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20070927
+#define RUBY_RELEASE_CODE 20070928
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 27
+#define RUBY_RELEASE_DAY 28
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];