2007-08-17 Martin Hunt <hunt@redhat.com>

	* bench2/bench.rb: Send HUP to stapio, instead of staprun.

diff --git a/runtime/ChangeLog b/runtime/ChangeLog
index 56ad61031a49925ede371a35d0e03df30352a05c..aa2d8fc25bc0fd70ee6ecaceda57f0fc3fa6cbdc 100644 (file)
--- a/runtime/ChangeLog
+++ b/runtime/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-17  Martin Hunt  <hunt@redhat.com>
+
+       * bench2/bench.rb: Send HUP to stapio, instead of staprun.
+
 2007-08-10  Josh Stone  <joshua.i.stone@intel.com>
 
        PR 4593

diff --git a/runtime/bench2/bench.rb b/runtime/bench2/bench.rb
index cde93245bdf57bb8c6ab3612abdff75972e5f28e..a671b582bf2ccf92ad2aeb0973a9cbe26d755e71 100644 (file)
--- a/runtime/bench2/bench.rb
+++ b/runtime/bench2/bench.rb
@@ -67,7 +67,7 @@ class Bench
       load
       sum=0
       `./itest #{threads} > #{@dir}/bench`
-      `sudo killall -HUP staprun`
+      `sudo killall -HUP stapio`
       Process.wait     # wait for staprun to exit
       @results[threads] = `cat #{@dir}/bench`.split[0].to_i - @@ftime[threads]
       File.open("#{@dir}/xxx.out") do |file|
@@ -129,7 +129,7 @@ class Bench
   @@minfreq = 0
 
   def cleanup
-    system('sudo killall -HUP staprun &> /dev/null')
+    system('sudo killall -HUP stapio &> /dev/null')
     system('sudo /sbin/rmmod bench &> /dev/null')
     `/bin/rm -f stap.out` if File.exists?("stap.out")
     `/bin/rm -f bench.stp` if File.exists?("bench.stp")
@@ -264,12 +264,12 @@ class Stapbench < Bench
       load
       sum=0
       `./itest #{threads} > bench`
-      `sudo killall -HUP staprun`
+      `sudo killall -HUP stapio`
       if ($? != 0)
        puts "status=#{$?}"
        system("tail xxx.out")
       end
-      Process.wait     # wait for staprun to exit
+      Process.wait     # wait for stapio to exit
       @results[threads] = `cat bench`.split[0].to_i - @@ftime[threads]
       File.open("xxx.out") do |file|
        file.each_line do |line|