diff options
| author | hunt <hunt> | 2006-09-18 17:03:33 +0000 |
|---|---|---|
| committer | hunt <hunt> | 2006-09-18 17:03:33 +0000 |
| commit | aa14db816a565c3a1e958f1c1f82692707fae673 (patch) | |
| tree | dbfb7cedc5c0f800ee831cf166a24f56bbbbe7f3 /runtime/bench2/bench.rb | |
| parent | 1cb28d0992e3f5d3a91daeb3f7ff8991f41b68ed (diff) | |
| download | systemtap-steved-aa14db816a565c3a1e958f1c1f82692707fae673.tar.gz systemtap-steved-aa14db816a565c3a1e958f1c1f82692707fae673.tar.xz systemtap-steved-aa14db816a565c3a1e958f1c1f82692707fae673.zip | |
2006-09-18 Martin Hunt <hunt@redhat.com>
* bench2/bench.rb: Remove the deprecated "-m" option
to stpd. Also, don't use merge mode for relayfs.
* bench2/run_binary_print: New test. Compare various ways of
printing binary data.
Diffstat (limited to 'runtime/bench2/bench.rb')
| -rw-r--r-- | runtime/bench2/bench.rb | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/runtime/bench2/bench.rb b/runtime/bench2/bench.rb index 91ecfc74..4b8bc2ff 100644 --- a/runtime/bench2/bench.rb +++ b/runtime/bench2/bench.rb @@ -121,6 +121,8 @@ class Bench @@minfreq = 0 def cleanup + system('sudo killall -HUP stpd &> /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") `/bin/rm -rf #{@dir}` unless @dir.nil? @@ -128,8 +130,8 @@ class Bench end def load - args = "-rmq -b 8" - if @trans == RELAYFS then args = "-mq" end + args = "-q -b 8" + if @trans == RELAYFS then args = "-q" end fork do exec "sudo #{@@stpd} #{args} #{@dir}/bench.ko > #{@dir}/xxx 2> #{@dir}/xxx.out" end sleep 5 end @@ -169,6 +171,7 @@ int probe_start(void)\n{\n return _stp_register_kprobes (kp, NUM_KPROBES);\n}\n void probe_exit (void)\n{\n _stp_unregister_kprobes (kp, NUM_KPROBES); \n}\n" rescue puts "Error writing source file" + exit ensure f.close unless f.nil? end @@ -250,7 +253,7 @@ class Stapbench < Bench def load # we do this in several steps because the compilation phase can take a long time args = "-kvvp4" - if @trans == RELAYFS then args = "-bkvvp4" end + if @trans == RELAYFS then args = "-bMkvvp4" end res = `stap #{args} -m bench bench.stp &> stap.out` if $? != 0 puts "ERROR running stap\n#{res}" @@ -265,8 +268,8 @@ class Stapbench < Bench cleanup exit end - args = "-rmq -b 8" - if @trans == RELAYFS then args = "-mq" end + args = "-q -b 8" + if @trans == RELAYFS then args = "-q" end fork do exec "sudo #{@@stpd} #{args} #{@dir}/bench.ko > #{@dir}/xxx 2> #{@dir}/xxx.out" end sleep 5 end |