* rcutorture module sets nreaders to twice the number of CPUs
* fix rcutorture types, some of them were removed,
some merged together in commits 99f8891 (v3.11), 2ec1f2d (v3.12)
Signed-off-by: Alexey Kodanev <alexey.koda...@oracle.com>
---
testcases/kernel/device-drivers/rcu/rcu_torture.sh | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/testcases/kernel/device-drivers/rcu/rcu_torture.sh
b/testcases/kernel/device-drivers/rcu/rcu_torture.sh
index 65c4fe0..55349fd 100755
--- a/testcases/kernel/device-drivers/rcu/rcu_torture.sh
+++ b/testcases/kernel/device-drivers/rcu/rcu_torture.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (c) 2014 Oracle and/or its affiliates. All Rights Reserved.
+# Copyright (c) 2014-2015 Oracle and/or its affiliates. All Rights Reserved.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License as
@@ -24,27 +24,25 @@
# For more information, please read Linux Documentation: RCU/torture.txt
TCID="rcu_torture"
-TST_TOTAL=14
+TST_TOTAL=4
+TST_CLEANUP=cleanup
. test.sh
# default options
test_time=60
-num_readers=10
num_writers=5
-while getopts :ht:r:w: opt; do
+while getopts :ht:w: opt; do
case "$opt" in
h)
echo "Usage:"
echo "h help"
echo "t x time in seconds for each test-case"
- echo "r x number of readers"
echo "w x number of writers"
exit 0
;;
t) test_time=$OPTARG ;;
- r) num_readers=$OPTARG ;;
w) num_writers=$OPTARG ;;
*)
tst_brkm TBROK "unknown option: $opt"
@@ -54,9 +52,8 @@ done
cleanup()
{
- tst_resm TINFO "test interrupted, cleanup..."
+ tst_resm TINFO "cleanup"
rmmod rcutorture > /dev/null 2>&1
- tst_exit
}
tst_require_root
@@ -68,9 +65,7 @@ rmmod rcutorture > /dev/null 2>&1
trap cleanup INT
-rcu_type="rcu rcu_sync rcu_expedited rcu_bh rcu_bh_sync rcu_bh_expedited \
- srcu srcu_sync srcu_expedited srcu_raw srcu_raw_sync sched \
- sched_sync sched_expedited"
+rcu_type="rcu rcu_bh srcu sched"
est_time=`echo "scale=2; $test_time * $TST_TOTAL / 60 " | bc`
tst_resm TINFO "estimate time $est_time min"
@@ -79,7 +74,7 @@ for type in $rcu_type; do
tst_resm TINFO "$type: running $test_time sec..."
- modprobe rcutorture nreaders=$num_readers nfakewriters=$num_writers \
+ modprobe rcutorture nfakewriters=$num_writers \
stat_interval=60 test_no_idle_hz=1 shuffle_interval=3 \
stutter=5 irqreader=1 fqs_duration=0 fqs_holdoff=0 \
fqs_stutter=3 test_boost=1 test_boost_interval=7 \
--
1.7.1
------------------------------------------------------------------------------
Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/
_______________________________________________
Ltp-list mailing list
Ltp-list@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ltp-list
