diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2006-06-27 05:55:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-27 20:32:47 -0400 |
commit | 0bafd214e4ba55dc1fb81a3031d0249292f1bc05 (patch) | |
tree | 754b3ad381078c57061515549642889b19aaf86d /scripts | |
parent | e74c69f46d93d29eea0ad8647863d1c6488f0f55 (diff) |
[PATCH] rtmutex: Modify rtmutex-tester to test the setscheduler propagation
Make test suite setscheduler calls asynchronously. Remove the waits in the
test cases and add a new testcase to verify the correctness of the
setscheduler priority propagation.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/rt-tester/check-all.sh | 1 | ||||
-rw-r--r-- | scripts/rt-tester/t2-l1-2rt-sameprio.tst | 2 | ||||
-rw-r--r-- | scripts/rt-tester/t2-l1-pi.tst | 2 | ||||
-rw-r--r-- | scripts/rt-tester/t2-l1-signal.tst | 2 | ||||
-rw-r--r-- | scripts/rt-tester/t2-l2-2rt-deadlock.tst | 2 | ||||
-rw-r--r-- | scripts/rt-tester/t3-l1-pi-1rt.tst | 3 | ||||
-rw-r--r-- | scripts/rt-tester/t3-l1-pi-2rt.tst | 3 | ||||
-rw-r--r-- | scripts/rt-tester/t3-l1-pi-3rt.tst | 3 | ||||
-rw-r--r-- | scripts/rt-tester/t3-l1-pi-signal.tst | 3 | ||||
-rw-r--r-- | scripts/rt-tester/t3-l1-pi-steal.tst | 3 | ||||
-rw-r--r-- | scripts/rt-tester/t3-l2-pi.tst | 3 | ||||
-rw-r--r-- | scripts/rt-tester/t4-l2-pi-deboost.tst | 4 | ||||
-rw-r--r-- | scripts/rt-tester/t5-l4-pi-boost-deboost-setsched.tst | 183 | ||||
-rw-r--r-- | scripts/rt-tester/t5-l4-pi-boost-deboost.tst | 5 |
14 files changed, 184 insertions, 35 deletions
diff --git a/scripts/rt-tester/check-all.sh b/scripts/rt-tester/check-all.sh index ac45c3e65a35..43098afe7431 100644 --- a/scripts/rt-tester/check-all.sh +++ b/scripts/rt-tester/check-all.sh | |||
@@ -18,4 +18,5 @@ testit t3-l1-pi-steal.tst | |||
18 | testit t3-l2-pi.tst | 18 | testit t3-l2-pi.tst |
19 | testit t4-l2-pi-deboost.tst | 19 | testit t4-l2-pi-deboost.tst |
20 | testit t5-l4-pi-boost-deboost.tst | 20 | testit t5-l4-pi-boost-deboost.tst |
21 | testit t5-l4-pi-boost-deboost-setsched.tst | ||
21 | 22 | ||
diff --git a/scripts/rt-tester/t2-l1-2rt-sameprio.tst b/scripts/rt-tester/t2-l1-2rt-sameprio.tst index a2b6f2aae755..8821f27cc8be 100644 --- a/scripts/rt-tester/t2-l1-2rt-sameprio.tst +++ b/scripts/rt-tester/t2-l1-2rt-sameprio.tst | |||
@@ -57,9 +57,7 @@ W: opcodeeq: 0: 0 | |||
57 | 57 | ||
58 | # Set schedulers | 58 | # Set schedulers |
59 | C: schedfifo: 0: 80 | 59 | C: schedfifo: 0: 80 |
60 | W: opcodeeq: 0: 0 | ||
61 | C: schedfifo: 1: 80 | 60 | C: schedfifo: 1: 80 |
62 | W: opcodeeq: 1: 0 | ||
63 | 61 | ||
64 | # T0 lock L0 | 62 | # T0 lock L0 |
65 | C: locknowait: 0: 0 | 63 | C: locknowait: 0: 0 |
diff --git a/scripts/rt-tester/t2-l1-pi.tst b/scripts/rt-tester/t2-l1-pi.tst index aa4c8940acd6..cde1f189a02b 100644 --- a/scripts/rt-tester/t2-l1-pi.tst +++ b/scripts/rt-tester/t2-l1-pi.tst | |||
@@ -57,9 +57,7 @@ W: opcodeeq: 0: 0 | |||
57 | 57 | ||
58 | # Set schedulers | 58 | # Set schedulers |
59 | C: schedother: 0: 0 | 59 | C: schedother: 0: 0 |
60 | W: opcodeeq: 0: 0 | ||
61 | C: schedfifo: 1: 80 | 60 | C: schedfifo: 1: 80 |
62 | W: opcodeeq: 1: 0 | ||
63 | 61 | ||
64 | # T0 lock L0 | 62 | # T0 lock L0 |
65 | C: locknowait: 0: 0 | 63 | C: locknowait: 0: 0 |
diff --git a/scripts/rt-tester/t2-l1-signal.tst b/scripts/rt-tester/t2-l1-signal.tst index c47ba06af209..3ab0bfc49950 100644 --- a/scripts/rt-tester/t2-l1-signal.tst +++ b/scripts/rt-tester/t2-l1-signal.tst | |||
@@ -57,9 +57,7 @@ W: opcodeeq: 0: 0 | |||
57 | 57 | ||
58 | # Set schedulers | 58 | # Set schedulers |
59 | C: schedother: 0: 0 | 59 | C: schedother: 0: 0 |
60 | W: opcodeeq: 0: 0 | ||
61 | C: schedother: 1: 0 | 60 | C: schedother: 1: 0 |
62 | W: opcodeeq: 1: 0 | ||
63 | 61 | ||
64 | # T0 lock L0 | 62 | # T0 lock L0 |
65 | C: locknowait: 0: 0 | 63 | C: locknowait: 0: 0 |
diff --git a/scripts/rt-tester/t2-l2-2rt-deadlock.tst b/scripts/rt-tester/t2-l2-2rt-deadlock.tst index 0cee476b206e..f4b5d5d6215f 100644 --- a/scripts/rt-tester/t2-l2-2rt-deadlock.tst +++ b/scripts/rt-tester/t2-l2-2rt-deadlock.tst | |||
@@ -57,9 +57,7 @@ W: opcodeeq: 0: 0 | |||
57 | 57 | ||
58 | # Set schedulers | 58 | # Set schedulers |
59 | C: schedfifo: 0: 80 | 59 | C: schedfifo: 0: 80 |
60 | W: opcodeeq: 0: 0 | ||
61 | C: schedfifo: 1: 80 | 60 | C: schedfifo: 1: 80 |
62 | W: opcodeeq: 1: 0 | ||
63 | 61 | ||
64 | # T0 lock L0 | 62 | # T0 lock L0 |
65 | C: locknowait: 0: 0 | 63 | C: locknowait: 0: 0 |
diff --git a/scripts/rt-tester/t3-l1-pi-1rt.tst b/scripts/rt-tester/t3-l1-pi-1rt.tst index a5eaf7ed5d54..63440ca2cce9 100644 --- a/scripts/rt-tester/t3-l1-pi-1rt.tst +++ b/scripts/rt-tester/t3-l1-pi-1rt.tst | |||
@@ -57,11 +57,8 @@ W: opcodeeq: 0: 0 | |||
57 | 57 | ||
58 | # Set schedulers | 58 | # Set schedulers |
59 | C: schedother: 0: 0 | 59 | C: schedother: 0: 0 |
60 | W: opcodeeq: 0: 0 | ||
61 | C: schedother: 1: 0 | 60 | C: schedother: 1: 0 |
62 | W: opcodeeq: 1: 0 | ||
63 | C: schedfifo: 2: 82 | 61 | C: schedfifo: 2: 82 |
64 | W: opcodeeq: 2: 0 | ||
65 | 62 | ||
66 | # T0 lock L0 | 63 | # T0 lock L0 |
67 | C: locknowait: 0: 0 | 64 | C: locknowait: 0: 0 |
diff --git a/scripts/rt-tester/t3-l1-pi-2rt.tst b/scripts/rt-tester/t3-l1-pi-2rt.tst index c622391a8afe..e5816fe67df3 100644 --- a/scripts/rt-tester/t3-l1-pi-2rt.tst +++ b/scripts/rt-tester/t3-l1-pi-2rt.tst | |||
@@ -57,11 +57,8 @@ W: opcodeeq: 0: 0 | |||
57 | 57 | ||
58 | # Set schedulers | 58 | # Set schedulers |
59 | C: schedother: 0: 0 | 59 | C: schedother: 0: 0 |
60 | W: opcodeeq: 0: 0 | ||
61 | C: schedfifo: 1: 81 | 60 | C: schedfifo: 1: 81 |
62 | W: opcodeeq: 1: 0 | ||
63 | C: schedfifo: 2: 82 | 61 | C: schedfifo: 2: 82 |
64 | W: opcodeeq: 2: 0 | ||
65 | 62 | ||
66 | # T0 lock L0 | 63 | # T0 lock L0 |
67 | C: locknowait: 0: 0 | 64 | C: locknowait: 0: 0 |
diff --git a/scripts/rt-tester/t3-l1-pi-3rt.tst b/scripts/rt-tester/t3-l1-pi-3rt.tst index b5057fb13e09..718b82b5d3bb 100644 --- a/scripts/rt-tester/t3-l1-pi-3rt.tst +++ b/scripts/rt-tester/t3-l1-pi-3rt.tst | |||
@@ -57,11 +57,8 @@ W: opcodeeq: 0: 0 | |||
57 | 57 | ||
58 | # Set schedulers | 58 | # Set schedulers |
59 | C: schedfifo: 0: 80 | 59 | C: schedfifo: 0: 80 |
60 | W: opcodeeq: 0: 0 | ||
61 | C: schedfifo: 1: 81 | 60 | C: schedfifo: 1: 81 |
62 | W: opcodeeq: 1: 0 | ||
63 | C: schedfifo: 2: 82 | 61 | C: schedfifo: 2: 82 |
64 | W: opcodeeq: 2: 0 | ||
65 | 62 | ||
66 | # T0 lock L0 | 63 | # T0 lock L0 |
67 | C: locknowait: 0: 0 | 64 | C: locknowait: 0: 0 |
diff --git a/scripts/rt-tester/t3-l1-pi-signal.tst b/scripts/rt-tester/t3-l1-pi-signal.tst index 3e427daa33ff..c6e213563498 100644 --- a/scripts/rt-tester/t3-l1-pi-signal.tst +++ b/scripts/rt-tester/t3-l1-pi-signal.tst | |||
@@ -55,11 +55,8 @@ W: opcodeeq: 0: 0 | |||
55 | 55 | ||
56 | # Set priorities | 56 | # Set priorities |
57 | C: schedother: 0: 0 | 57 | C: schedother: 0: 0 |
58 | W: opcodeeq: 0: 0 | ||
59 | C: schedfifo: 1: 80 | 58 | C: schedfifo: 1: 80 |
60 | W: opcodeeq: 1: 0 | ||
61 | C: schedfifo: 2: 81 | 59 | C: schedfifo: 2: 81 |
62 | W: opcodeeq: 2: 0 | ||
63 | 60 | ||
64 | # T0 lock L0 | 61 | # T0 lock L0 |
65 | C: lock: 0: 0 | 62 | C: lock: 0: 0 |
diff --git a/scripts/rt-tester/t3-l1-pi-steal.tst b/scripts/rt-tester/t3-l1-pi-steal.tst index 72c24a9e4be4..f53749d59d79 100644 --- a/scripts/rt-tester/t3-l1-pi-steal.tst +++ b/scripts/rt-tester/t3-l1-pi-steal.tst | |||
@@ -57,11 +57,8 @@ W: opcodeeq: 0: 0 | |||
57 | 57 | ||
58 | # Set schedulers | 58 | # Set schedulers |
59 | C: schedother: 0: 0 | 59 | C: schedother: 0: 0 |
60 | W: opcodeeq: 0: 0 | ||
61 | C: schedfifo: 1: 80 | 60 | C: schedfifo: 1: 80 |
62 | W: opcodeeq: 1: 0 | ||
63 | C: schedfifo: 2: 81 | 61 | C: schedfifo: 2: 81 |
64 | W: opcodeeq: 2: 0 | ||
65 | 62 | ||
66 | # T0 lock L0 | 63 | # T0 lock L0 |
67 | C: lock: 0: 0 | 64 | C: lock: 0: 0 |
diff --git a/scripts/rt-tester/t3-l2-pi.tst b/scripts/rt-tester/t3-l2-pi.tst index 2ba0dced48fa..cdc3e4fd7bac 100644 --- a/scripts/rt-tester/t3-l2-pi.tst +++ b/scripts/rt-tester/t3-l2-pi.tst | |||
@@ -57,11 +57,8 @@ W: opcodeeq: 0: 0 | |||
57 | 57 | ||
58 | # Set schedulers | 58 | # Set schedulers |
59 | C: schedother: 0: 0 | 59 | C: schedother: 0: 0 |
60 | W: opcodeeq: 0: 0 | ||
61 | C: schedother: 1: 0 | 60 | C: schedother: 1: 0 |
62 | W: opcodeeq: 1: 0 | ||
63 | C: schedfifo: 2: 82 | 61 | C: schedfifo: 2: 82 |
64 | W: opcodeeq: 2: 0 | ||
65 | 62 | ||
66 | # T0 lock L0 | 63 | # T0 lock L0 |
67 | C: locknowait: 0: 0 | 64 | C: locknowait: 0: 0 |
diff --git a/scripts/rt-tester/t4-l2-pi-deboost.tst b/scripts/rt-tester/t4-l2-pi-deboost.tst index 01f1a80fa02a..baa14137f473 100644 --- a/scripts/rt-tester/t4-l2-pi-deboost.tst +++ b/scripts/rt-tester/t4-l2-pi-deboost.tst | |||
@@ -57,13 +57,9 @@ W: opcodeeq: 0: 0 | |||
57 | 57 | ||
58 | # Set schedulers | 58 | # Set schedulers |
59 | C: schedother: 0: 0 | 59 | C: schedother: 0: 0 |
60 | W: opcodeeq: 0: 0 | ||
61 | C: schedother: 1: 0 | 60 | C: schedother: 1: 0 |
62 | W: opcodeeq: 1: 0 | ||
63 | C: schedfifo: 2: 82 | 61 | C: schedfifo: 2: 82 |
64 | W: opcodeeq: 2: 0 | ||
65 | C: schedfifo: 3: 83 | 62 | C: schedfifo: 3: 83 |
66 | W: opcodeeq: 3: 0 | ||
67 | 63 | ||
68 | # T0 lock L0 | 64 | # T0 lock L0 |
69 | C: locknowait: 0: 0 | 65 | C: locknowait: 0: 0 |
diff --git a/scripts/rt-tester/t5-l4-pi-boost-deboost-setsched.tst b/scripts/rt-tester/t5-l4-pi-boost-deboost-setsched.tst new file mode 100644 index 000000000000..e6ec0c81b54d --- /dev/null +++ b/scripts/rt-tester/t5-l4-pi-boost-deboost-setsched.tst | |||
@@ -0,0 +1,183 @@ | |||
1 | # | ||
2 | # rt-mutex test | ||
3 | # | ||
4 | # Op: C(ommand)/T(est)/W(ait) | ||
5 | # | opcode | ||
6 | # | | threadid: 0-7 | ||
7 | # | | | opcode argument | ||
8 | # | | | | | ||
9 | # C: lock: 0: 0 | ||
10 | # | ||
11 | # Commands | ||
12 | # | ||
13 | # opcode opcode argument | ||
14 | # schedother nice value | ||
15 | # schedfifo priority | ||
16 | # lock lock nr (0-7) | ||
17 | # locknowait lock nr (0-7) | ||
18 | # lockint lock nr (0-7) | ||
19 | # lockintnowait lock nr (0-7) | ||
20 | # lockcont lock nr (0-7) | ||
21 | # unlock lock nr (0-7) | ||
22 | # lockbkl lock nr (0-7) | ||
23 | # unlockbkl lock nr (0-7) | ||
24 | # signal thread to signal (0-7) | ||
25 | # reset 0 | ||
26 | # resetevent 0 | ||
27 | # | ||
28 | # Tests / Wait | ||
29 | # | ||
30 | # opcode opcode argument | ||
31 | # | ||
32 | # prioeq priority | ||
33 | # priolt priority | ||
34 | # priogt priority | ||
35 | # nprioeq normal priority | ||
36 | # npriolt normal priority | ||
37 | # npriogt normal priority | ||
38 | # locked lock nr (0-7) | ||
39 | # blocked lock nr (0-7) | ||
40 | # blockedwake lock nr (0-7) | ||
41 | # unlocked lock nr (0-7) | ||
42 | # lockedbkl dont care | ||
43 | # blockedbkl dont care | ||
44 | # unlockedbkl dont care | ||
45 | # opcodeeq command opcode or number | ||
46 | # opcodelt number | ||
47 | # opcodegt number | ||
48 | # eventeq number | ||
49 | # eventgt number | ||
50 | # eventlt number | ||
51 | |||
52 | # | ||
53 | # 5 threads 4 lock PI - modify priority of blocked threads | ||
54 | # | ||
55 | C: resetevent: 0: 0 | ||
56 | W: opcodeeq: 0: 0 | ||
57 | |||
58 | # Set schedulers | ||
59 | C: schedother: 0: 0 | ||
60 | C: schedfifo: 1: 81 | ||
61 | C: schedfifo: 2: 82 | ||
62 | C: schedfifo: 3: 83 | ||
63 | C: schedfifo: 4: 84 | ||
64 | |||
65 | # T0 lock L0 | ||
66 | C: locknowait: 0: 0 | ||
67 | W: locked: 0: 0 | ||
68 | |||
69 | # T1 lock L1 | ||
70 | C: locknowait: 1: 1 | ||
71 | W: locked: 1: 1 | ||
72 | |||
73 | # T1 lock L0 | ||
74 | C: lockintnowait: 1: 0 | ||
75 | W: blocked: 1: 0 | ||
76 | T: prioeq: 0: 81 | ||
77 | |||
78 | # T2 lock L2 | ||
79 | C: locknowait: 2: 2 | ||
80 | W: locked: 2: 2 | ||
81 | |||
82 | # T2 lock L1 | ||
83 | C: lockintnowait: 2: 1 | ||
84 | W: blocked: 2: 1 | ||
85 | T: prioeq: 0: 82 | ||
86 | T: prioeq: 1: 82 | ||
87 | |||
88 | # T3 lock L3 | ||
89 | C: locknowait: 3: 3 | ||
90 | W: locked: 3: 3 | ||
91 | |||
92 | # T3 lock L2 | ||
93 | C: lockintnowait: 3: 2 | ||
94 | W: blocked: 3: 2 | ||
95 | T: prioeq: 0: 83 | ||
96 | T: prioeq: 1: 83 | ||
97 | T: prioeq: 2: 83 | ||
98 | |||
99 | # T4 lock L3 | ||
100 | C: lockintnowait: 4: 3 | ||
101 | W: blocked: 4: 3 | ||
102 | T: prioeq: 0: 84 | ||
103 | T: prioeq: 1: 84 | ||
104 | T: prioeq: 2: 84 | ||
105 | T: prioeq: 3: 84 | ||
106 | |||
107 | # Reduce prio of T4 | ||
108 | C: schedfifo: 4: 80 | ||
109 | T: prioeq: 0: 83 | ||
110 | T: prioeq: 1: 83 | ||
111 | T: prioeq: 2: 83 | ||
112 | T: prioeq: 3: 83 | ||
113 | T: prioeq: 4: 80 | ||
114 | |||
115 | # Increase prio of T4 | ||
116 | C: schedfifo: 4: 84 | ||
117 | T: prioeq: 0: 84 | ||
118 | T: prioeq: 1: 84 | ||
119 | T: prioeq: 2: 84 | ||
120 | T: prioeq: 3: 84 | ||
121 | T: prioeq: 4: 84 | ||
122 | |||
123 | # Reduce prio of T3 | ||
124 | C: schedfifo: 3: 80 | ||
125 | T: prioeq: 0: 84 | ||
126 | T: prioeq: 1: 84 | ||
127 | T: prioeq: 2: 84 | ||
128 | T: prioeq: 3: 84 | ||
129 | T: prioeq: 4: 84 | ||
130 | |||
131 | # Increase prio of T3 | ||
132 | C: schedfifo: 3: 85 | ||
133 | T: prioeq: 0: 85 | ||
134 | T: prioeq: 1: 85 | ||
135 | T: prioeq: 2: 85 | ||
136 | T: prioeq: 3: 85 | ||
137 | T: prioeq: 4: 84 | ||
138 | |||
139 | # Reduce prio of T3 | ||
140 | C: schedfifo: 3: 83 | ||
141 | T: prioeq: 0: 84 | ||
142 | T: prioeq: 1: 84 | ||
143 | T: prioeq: 2: 84 | ||
144 | T: prioeq: 3: 84 | ||
145 | T: prioeq: 4: 84 | ||
146 | |||
147 | # Signal T4 | ||
148 | C: signal: 4: 0 | ||
149 | W: unlocked: 4: 3 | ||
150 | T: prioeq: 0: 83 | ||
151 | T: prioeq: 1: 83 | ||
152 | T: prioeq: 2: 83 | ||
153 | T: prioeq: 3: 83 | ||
154 | |||
155 | # Signal T3 | ||
156 | C: signal: 3: 0 | ||
157 | W: unlocked: 3: 2 | ||
158 | T: prioeq: 0: 82 | ||
159 | T: prioeq: 1: 82 | ||
160 | T: prioeq: 2: 82 | ||
161 | |||
162 | # Signal T2 | ||
163 | C: signal: 2: 0 | ||
164 | W: unlocked: 2: 1 | ||
165 | T: prioeq: 0: 81 | ||
166 | T: prioeq: 1: 81 | ||
167 | |||
168 | # Signal T1 | ||
169 | C: signal: 1: 0 | ||
170 | W: unlocked: 1: 0 | ||
171 | T: priolt: 0: 1 | ||
172 | |||
173 | # Unlock and exit | ||
174 | C: unlock: 3: 3 | ||
175 | C: unlock: 2: 2 | ||
176 | C: unlock: 1: 1 | ||
177 | C: unlock: 0: 0 | ||
178 | |||
179 | W: unlocked: 3: 3 | ||
180 | W: unlocked: 2: 2 | ||
181 | W: unlocked: 1: 1 | ||
182 | W: unlocked: 0: 0 | ||
183 | |||
diff --git a/scripts/rt-tester/t5-l4-pi-boost-deboost.tst b/scripts/rt-tester/t5-l4-pi-boost-deboost.tst index efa0788c1189..ca64f8bbf4bc 100644 --- a/scripts/rt-tester/t5-l4-pi-boost-deboost.tst +++ b/scripts/rt-tester/t5-l4-pi-boost-deboost.tst | |||
@@ -57,15 +57,10 @@ W: opcodeeq: 0: 0 | |||
57 | 57 | ||
58 | # Set schedulers | 58 | # Set schedulers |
59 | C: schedother: 0: 0 | 59 | C: schedother: 0: 0 |
60 | W: opcodeeq: 0: 0 | ||
61 | C: schedfifo: 1: 81 | 60 | C: schedfifo: 1: 81 |
62 | W: opcodeeq: 1: 0 | ||
63 | C: schedfifo: 2: 82 | 61 | C: schedfifo: 2: 82 |
64 | W: opcodeeq: 2: 0 | ||
65 | C: schedfifo: 3: 83 | 62 | C: schedfifo: 3: 83 |
66 | W: opcodeeq: 3: 0 | ||
67 | C: schedfifo: 4: 84 | 63 | C: schedfifo: 4: 84 |
68 | W: opcodeeq: 4: 0 | ||
69 | 64 | ||
70 | # T0 lock L0 | 65 | # T0 lock L0 |
71 | C: locknowait: 0: 0 | 66 | C: locknowait: 0: 0 |