aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLisa Nguyen <lisa.nguyen@linaro.org>2015-11-17 17:24:28 -0800
committerLisa Nguyen <lisa.nguyen@linaro.org>2015-11-19 17:34:09 -0800
commite714553039fcac2471b2d222cfb3c08b17f52b6d (patch)
treec402bc4e0e662077fcd71d853dc20fd4358d39f5
parentbab54c06eb5009db6b7196f33d36094bfadfd465 (diff)
functions: Rewrite wait_latency() function
Improve the logic on finding the sampling_rate. If the sampling_rate cannot be found at all, return 1. Signed-off-by: Lisa Nguyen <lisa.nguyen@linaro.org>
-rw-r--r--include/functions.sh18
1 files changed, 14 insertions, 4 deletions
diff --git a/include/functions.sh b/include/functions.sh
index 74e85c7..b849cce 100644
--- a/include/functions.sh
+++ b/include/functions.sh
@@ -169,20 +169,30 @@ wait_latency() {
# consider per-policy governor case
if [ -e $CPU_PATH/$wait_latency_cpu/cpufreq/$gov ]; then
- sampling_rate=$(cat $CPU_PATH/$wait_latency_cpu/cpufreq/$gov/sampling_rate)
+ #try one path to see if the sampling_rate can be found
+ if [ -e $CPU_PATH/$wait_latency_cpu/cpufreq/$gov/sampling_rate ]; then
+ sampling_rate=$(cat $CPU_PATH/$wait_latency_cpu/cpufreq/$gov/sampling_rate)
+ else
+ # try another path to get the sampling_rate
+ if [ -e $CPU_PATH/cpufreq/$gov/sampling_rate ]; then
+ sampling_rate=$(cat $CPU_PATH/cpufreq/$gov/sampling_rate)
+ else
+ return 1
+ fi
+ fi
else
- sampling_rate=$(cat $CPU_PATH/cpufreq/$gov/sampling_rate)
+ return 1
fi
sampling_rate=$((sampling_rate * 1000)) # unit nsec
latency=$(cat $cpufreq_dirpath/cpuinfo_transition_latency)
if [ $? -ne 0 ]; then
- return 1
+ return 1
fi
nrfreq=$(cat $cpufreq_dirpath/scaling_available_frequencies | wc -w)
if [ $? -ne 0 ]; then
- return 1
+ return 1
fi
nrfreq=$((nrfreq + 1))