Skip to content

Commit

Permalink
compare: fix nasty fall through error when some stats file does not e…
Browse files Browse the repository at this point in the history
…xist
  • Loading branch information
Fengguang Wu committed Apr 21, 2012
1 parent 0f11e36 commit f538bf6
Showing 1 changed file with 13 additions and 8 deletions.
21 changes: 13 additions & 8 deletions compare
Original file line number Diff line number Diff line change
Expand Up @@ -281,20 +281,25 @@ def add_dd(path)
if $evaluate == "write_bw"
bw = write_bw(path)
# puts path, bw
return if bw == 0
elsif $evaluate.index("nfs_") == 0 and nfs_stats(path)
valid = (bw != 0)
elsif $evaluate.index("nfs_") == 0
valid = nfs_stats(path)
eval "bw = $#{$evaluate}"
elsif $evaluate.index("cpu_") == 0 and iostat_cpu(path)
elsif $evaluate.index("cpu_") == 0
valid = iostat_cpu(path)
eval "bw = $#{$evaluate}"
elsif $evaluate.index("io_") == 0 and iostat_disk(path)
elsif $evaluate.index("io_") == 0
valid = iostat_disk(path)
eval "bw = $#{$evaluate}"
elsif is_perf_event($evaluate) and perf_stats(path)
elsif is_perf_event($evaluate)
valid = perf_stats(path)
bw = $perf_event[$evaluate]
elsif vmstat(path)
eval "bw = $#{$evaluate}"
else
return
valid = vmstat(path)
eval "bw = $#{$evaluate}"
end
return if not valid

prefix = ""
if path =~ /(.*\/)(.*)/
prefix = $1
Expand Down

0 comments on commit f538bf6

Please sign in to comment.