From bfea7d336b8081734ab47b5f9fa845a441a5da6c Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Mon, 11 Oct 2010 17:39:12 +0000 Subject: [PATCH] Works now on RHEL 5 too. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@2394 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scripts/blockdev-perftest | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/scripts/blockdev-perftest b/scripts/blockdev-perftest index 0170e6bcc..34d505d1c 100755 --- a/scripts/blockdev-perftest +++ b/scripts/blockdev-perftest @@ -73,6 +73,9 @@ drop_caches() { # provided. set_frequency_scaling() { local syscpu=/sys/devices/system/cpu + if [ ! -e $syscpu/cpufreq ]; then + return + fi local governor=$(<$syscpu/cpu0/cpufreq/scaling_governor) local cpuinfo_min_freq=$(<$syscpu/cpu0/cpufreq/cpuinfo_min_freq) local cpuinfo_max_freq=$(<$syscpu/cpu0/cpufreq/cpuinfo_max_freq) @@ -115,7 +118,7 @@ time_write() { dd_oflags="" fi { dd if=/dev/zero of="${device}" bs=$1 count=$2 ${dd_oflags} 2>&1; sync; } \ - | sed -n -e 's/.* \([0-9.]*\) s,.*/\1/p' | sed 's/^$/0/' + | sed -n -e 's/.* \([0-9.]*\) s[econds]*,.*/\1/p' | sed 's/^$/0/' fi } @@ -137,7 +140,7 @@ time_read() { dd_iflags="" fi dd if="${device}" of=/dev/null bs=$1 count=$2 ${dd_iflags} 2>&1 \ - | sed -n -e 's/.* \([0-9.]*\) s,.*/\1/p' | sed 's/^$/0/' + | sed -n -e 's/.* \([0-9.]*\) s[econds]*,.*/\1/p' | sed 's/^$/0/' fi } @@ -230,13 +233,15 @@ if ! can_drop_cache; then fi # Disable frequency scaling -if [ -w /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor ]; then - frequency_scaling_params="$(set_frequency_scaling)" -else - echo "" - echo "WARNING: insufficient privileges to disable CPU frequency scaling" - echo "-- results will be unreliable." - echo "" +if [ -e /sys/devices/system/cpu/cpu0/cpufreq ]; then + if [ -w /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor ]; then + frequency_scaling_params="$(set_frequency_scaling)" + else + echo "" + echo "WARNING: insufficient privileges to disable CPU frequency scaling" + echo "-- results will be unreliable." + echo "" + fi fi # Header, line 1