1 files changed, 337 insertions, 140 deletions
diff --git a/testsuites/smptests/smpmrsp01/smpmrsp01.scn b/testsuites/smptests/smpmrsp01/smpmrsp01.scn
index 5762a02c8c..bbae93a381 100644
--- a/testsuites/smptests/smpmrsp01/smpmrsp01.scn
+++ b/testsuites/smptests/smpmrsp01/smpmrsp01.scn
@@ -2,146 +2,343 @@
 test MrsP flush error
 test MrsP initially locked error
 test MrsP nested obtain error
+test MrsP unlock order error
+test MrsP deadlock error
+test MrsP multiple obtain
+test MrsP obtain and sleep and release
+[0] MAIN ->  RUN (prio   2, node  RUN)
+[0]  RUN -> MAIN (prio   1, node MAIN)
+[0] MAIN -> IDLE (prio   1, node MAIN)
+[0] IDLE -> MAIN (prio   1, node MAIN)
+test MrsP obtain and release with help
+[1] IDLE -> HELP (prio   3, node HELP)
+[0] MAIN -> IDLE (prio   2, node MAIN)
+[0] IDLE -> MAIN (prio   2, node MAIN)
+[1] HELP -> MAIN (prio   2, node HELP)
+[0] MAIN ->  RUN (prio   1, node  RUN)
+[1] MAIN -> HELP (prio   2, node HELP)
+[1] HELP -> MAIN (prio   2, node HELP)
+[0]  RUN -> IDLE (prio   2, node MAIN)
+[1] MAIN -> HELP (prio   2, node HELP)
+[1] HELP -> MAIN (prio   2, node HELP)
+[1] MAIN -> HELP (prio   2, node HELP)
+[0] IDLE -> MAIN (prio   3, node MAIN)
 test MrsP obtain and release
 test MrsP load
-worker[0][0]
-  sleep = 890
-  timeout = 1455
-  obtain[0] = 141069
-  obtain[1] = 111062
-  obtain[2] = 255631
-  obtain[3] = 186559
-  obtain[4] = 310707
-  obtain[5] = 246838
-  obtain[6] = 331853
-  obtain[7] = 298938
-  obtain[8] = 331989
-  obtain[9] = 343041
-  obtain[10] = 310191
-  obtain[11] = 381001
-  obtain[12] = 269001
-  obtain[13] = 412849
-  obtain[14] = 217768
-  obtain[15] = 444036
-  obtain[16] = 160721
-  obtain[17] = 476211
-  obtain[18] = 151929
-  obtain[19] = 438664
-  obtain[20] = 132708
-  obtain[21] = 388090
-  obtain[22] = 118166
-  obtain[23] = 337468
-  obtain[24] = 96676
-  obtain[25] = 271392
-  obtain[26] = 75445
-  obtain[27] = 203259
-  obtain[28] = 52933
-  obtain[29] = 132769
-  obtain[30] = 27856
-  obtain[31] = 57014
-worker[0][1]
-  sleep = 15
-  timeout = 33
-  obtain[0] = 2241
-  obtain[1] = 1890
-  obtain[2] = 4128
-  obtain[3] = 3128
-  obtain[4] = 5110
-  obtain[5] = 3981
-  obtain[6] = 5348
-  obtain[7] = 4825
-  obtain[8] = 5184
-  obtain[9] = 5720
-  obtain[10] = 4488
-  obtain[11] = 6038
-  obtain[12] = 4095
-  obtain[13] = 6658
-  obtain[14] = 3754
-  obtain[15] = 6768
-  obtain[16] = 2654
-  obtain[17] = 7051
-  obtain[18] = 2679
-  obtain[19] = 6956
-  obtain[20] = 2498
-  obtain[21] = 6173
-  obtain[22] = 2024
-  obtain[23] = 5514
-  obtain[24] = 1650
-  obtain[25] = 4141
-  obtain[26] = 1568
-  obtain[27] = 3285
-  obtain[28] = 812
-  obtain[29] = 2317
-  obtain[30] = 527
-  obtain[31] = 996
-worker[1][0]
-  sleep = 890
-  timeout = 1581
-  obtain[0] = 140732
-  obtain[1] = 111655
-  obtain[2] = 256936
-  obtain[3] = 186534
-  obtain[4] = 311714
-  obtain[5] = 248065
-  obtain[6] = 333155
-  obtain[7] = 300734
-  obtain[8] = 329675
-  obtain[9] = 343832
-  obtain[10] = 309112
-  obtain[11] = 380452
-  obtain[12] = 270156
-  obtain[13] = 416600
-  obtain[14] = 223484
-  obtain[15] = 444991
-  obtain[16] = 163750
-  obtain[17] = 476096
-  obtain[18] = 150317
-  obtain[19] = 432827
-  obtain[20] = 133946
-  obtain[21] = 388441
-  obtain[22] = 119760
-  obtain[23] = 337033
-  obtain[24] = 99153
-  obtain[25] = 271558
-  obtain[26] = 77535
-  obtain[27] = 202607
-  obtain[28] = 53225
-  obtain[29] = 130801
-  obtain[30] = 27321
-  obtain[31] = 56239
-worker[1][1]
-  sleep = 25
-  timeout = 48
-  obtain[0] = 2164
-  obtain[1] = 1722
-  obtain[2] = 4095
-  obtain[3] = 3002
-  obtain[4] = 4950
-  obtain[5] = 4020
-  obtain[6] = 5235
-  obtain[7] = 4716
-  obtain[8] = 5407
-  obtain[9] = 5070
-  obtain[10] = 5082
-  obtain[11] = 6130
-  obtain[12] = 4368
-  obtain[13] = 6108
-  obtain[14] = 3270
-  obtain[15] = 6800
-  obtain[16] = 2652
-  obtain[17] = 7633
-  obtain[18] = 2451
-  obtain[19] = 7480
-  obtain[20] = 2079
-  obtain[21] = 6232
-  obtain[22] = 1590
-  obtain[23] = 5739
-  obtain[24] = 1627
-  obtain[25] = 4030
-  obtain[26] = 1296
-  obtain[27] = 2803
-  obtain[28] = 969
-  obtain[29] = 2253
-  obtain[30] = 217
-  obtain[31] = 930
+worker[0]
+  sleep = 16
+  timeout = 3420
+  obtain[0] = 2503
+  obtain[1] = 1671
+  obtain[2] = 4446
+  obtain[3] = 2850
+  obtain[4] = 5003
+  obtain[5] = 3793
+  obtain[6] = 5575
+  obtain[7] = 4468
+  obtain[8] = 5326
+  obtain[9] = 4645
+  obtain[10] = 4565
+  obtain[11] = 5082
+  obtain[12] = 4050
+  obtain[13] = 5203
+  obtain[14] = 2945
+  obtain[15] = 5704
+  obtain[16] = 1652
+  obtain[17] = 5870
+  obtain[18] = 1472
+  obtain[19] = 4933
+  obtain[20] = 1136
+  obtain[21] = 3463
+  obtain[22] = 1257
+  obtain[23] = 3230
+  obtain[24] = 823
+  obtain[25] = 2860
+  obtain[26] = 736
+  obtain[27] = 1270
+  obtain[28] = 438
+  obtain[29] = 1273
+  obtain[30] = 378
+  obtain[31] = 422
+  cpu[0] = 116428
+  cpu[1] = 16133
+  cpu[2] = 32982
+  cpu[3] = 32557
+worker[1]
+  sleep = 1
+  timeout = 4
+  obtain[0] = 2
+  obtain[1] = 0
+  obtain[2] = 3
+  obtain[3] = 8
+  obtain[4] = 10
+  obtain[5] = 0
+  obtain[6] = 7
+  obtain[7] = 0
+  obtain[8] = 0
+  obtain[9] = 0
+  obtain[10] = 11
+  obtain[11] = 0
+  obtain[12] = 26
+  obtain[13] = 14
+  obtain[14] = 5
+  obtain[15] = 0
+  obtain[16] = 0
+  obtain[17] = 18
+  obtain[18] = 12
+  obtain[19] = 0
+  obtain[20] = 0
+  obtain[21] = 0
+  obtain[22] = 0
+  obtain[23] = 0
+  obtain[24] = 0
+  obtain[25] = 0
+  obtain[26] = 0
+  obtain[27] = 0
+  obtain[28] = 0
+  obtain[29] = 0
+  obtain[30] = 0
+  obtain[31] = 0
+  cpu[0] = 140
+  cpu[1] = 24
+  cpu[2] = 33
+  cpu[3] = 36
+worker[2]
+  sleep = 14
+  timeout = 3513
+  obtain[0] = 2474
+  obtain[1] = 1793
+  obtain[2] = 4551
+  obtain[3] = 2833
+  obtain[4] = 5293
+  obtain[5] = 3681
+  obtain[6] = 5309
+  obtain[7] = 4565
+  obtain[8] = 5270
+  obtain[9] = 4610
+  obtain[10] = 4817
+  obtain[11] = 4760
+  obtain[12] = 3858
+  obtain[13] = 5919
+  obtain[14] = 3172
+  obtain[15] = 5286
+  obtain[16] = 1968
+  obtain[17] = 5800
+  obtain[18] = 1768
+  obtain[19] = 4629
+  obtain[20] = 1446
+  obtain[21] = 4109
+  obtain[22] = 1046
+  obtain[23] = 3119
+  obtain[24] = 1012
+  obtain[25] = 2338
+  obtain[26] = 790
+  obtain[27] = 1628
+  obtain[28] = 432
+  obtain[29] = 1281
+  obtain[30] = 270
+  obtain[31] = 418
+  cpu[0] = 15589
+  cpu[1] = 121473
+  cpu[2] = 31797
+  cpu[3] = 31645
+worker[3]
+  sleep = 1
+  timeout = 3
+  obtain[0] = 4
+  obtain[1] = 0
+  obtain[2] = 9
+  obtain[3] = 0
+  obtain[4] = 5
+  obtain[5] = 0
+  obtain[6] = 0
+  obtain[7] = 8
+  obtain[8] = 0
+  obtain[9] = 10
+  obtain[10] = 0
+  obtain[11] = 0
+  obtain[12] = 0
+  obtain[13] = 0
+  obtain[14] = 0
+  obtain[15] = 16
+  obtain[16] = 0
+  obtain[17] = 18
+  obtain[18] = 0
+  obtain[19] = 0
+  obtain[20] = 0
+  obtain[21] = 1
+  obtain[22] = 0
+  obtain[23] = 24
+  obtain[24] = 0
+  obtain[25] = 0
+  obtain[26] = 0
+  obtain[27] = 0
+  obtain[28] = 0
+  obtain[29] = 0
+  obtain[30] = 0
+  obtain[31] = 0
+  cpu[0] = 22
+  cpu[1] = 123
+  cpu[2] = 7
+  cpu[3] = 39
+worker[4]
+  sleep = 19
+  timeout = 3025
+  obtain[0] = 2574
+  obtain[1] = 1845
+  obtain[2] = 4423
+  obtain[3] = 2985
+  obtain[4] = 5086
+  obtain[5] = 3679
+  obtain[6] = 5286
+  obtain[7] = 4447
+  obtain[8] = 5885
+  obtain[9] = 4771
+  obtain[10] = 4857
+  obtain[11] = 5467
+  obtain[12] = 4554
+  obtain[13] = 5210
+  obtain[14] = 3547
+  obtain[15] = 6169
+  obtain[16] = 2337
+  obtain[17] = 6109
+  obtain[18] = 1797
+  obtain[19] = 5136
+  obtain[20] = 1646
+  obtain[21] = 4251
+  obtain[22] = 1041
+  obtain[23] = 3235
+  obtain[24] = 975
+  obtain[25] = 2961
+  obtain[26] = 739
+  obtain[27] = 1704
+  obtain[28] = 554
+  obtain[29] = 1344
+  obtain[30] = 182
+  obtain[31] = 559
+  cpu[0] = 5617
+  cpu[1] = 5834
+  cpu[2] = 100129
+  cpu[3] = 99149
+worker[5]
+  sleep = 18
+  timeout = 3123
+  obtain[0] = 2439
+  obtain[1] = 1878
+  obtain[2] = 4576
+  obtain[3] = 2938
+  obtain[4] = 5088
+  obtain[5] = 3723
+  obtain[6] = 5611
+  obtain[7] = 4411
+  obtain[8] = 5522
+  obtain[9] = 4893
+  obtain[10] = 4877
+  obtain[11] = 4932
+  obtain[12] = 4263
+  obtain[13] = 5608
+  obtain[14] = 2791
+  obtain[15] = 5905
+  obtain[16] = 1739
+  obtain[17] = 5322
+  obtain[18] = 1892
+  obtain[19] = 5118
+  obtain[20] = 1360
+  obtain[21] = 4764
+  obtain[22] = 1099
+  obtain[23] = 3180
+  obtain[24] = 913
+  obtain[25] = 2612
+  obtain[26] = 807
+  obtain[27] = 1588
+  obtain[28] = 493
+  obtain[29] = 1348
+  obtain[30] = 389
+  obtain[31] = 471
+  cpu[0] = 5554
+  cpu[1] = 6139
+  cpu[2] = 97852
+  cpu[3] = 95573
+worker[6]
+  sleep = 1
+  timeout = 11
+  obtain[0] = 2
+  obtain[1] = 2
+  obtain[2] = 9
+  obtain[3] = 4
+  obtain[4] = 15
+  obtain[5] = 12
+  obtain[6] = 7
+  obtain[7] = 16
+  obtain[8] = 10
+  obtain[9] = 20
+  obtain[10] = 11
+  obtain[11] = 5
+  obtain[12] = 0
+  obtain[13] = 0
+  obtain[14] = 0
+  obtain[15] = 16
+  obtain[16] = 0
+  obtain[17] = 0
+  obtain[18] = 0
+  obtain[19] = 20
+  obtain[20] = 0
+  obtain[21] = 44
+  obtain[22] = 0
+  obtain[23] = 0
+  obtain[24] = 0
+  obtain[25] = 7
+  obtain[26] = 0
+  obtain[27] = 0
+  obtain[28] = 0
+  obtain[29] = 0
+  obtain[30] = 0
+  obtain[31] = 0
+  cpu[0] = 10
+  cpu[1] = 6
+  cpu[2] = 168
+  cpu[3] = 217
+worker[7]
+  sleep = 1
+  timeout = 0
+  obtain[0] = 0
+  obtain[1] = 0
+  obtain[2] = 0
+  obtain[3] = 0
+  obtain[4] = 0
+  obtain[5] = 0
+  obtain[6] = 0
+  obtain[7] = 0
+  obtain[8] = 0
+  obtain[9] = 0
+  obtain[10] = 0
+  obtain[11] = 0
+  obtain[12] = 0
+  obtain[13] = 0
+  obtain[14] = 0
+  obtain[15] = 0
+  obtain[16] = 0
+  obtain[17] = 0
+  obtain[18] = 0
+  obtain[19] = 0
+  obtain[20] = 0
+  obtain[21] = 0
+  obtain[22] = 0
+  obtain[23] = 0
+  obtain[24] = 0
+  obtain[25] = 0
+  obtain[26] = 0
+  obtain[27] = 0
+  obtain[28] = 0
+  obtain[29] = 0
+  obtain[30] = 0
+  obtain[31] = 0
+  cpu[0] = 0
+  cpu[1] = 0
+  cpu[2] = 1
+  cpu[3] = 0
+migrations[0] = 110919
+migrations[1] = 110920
+migrations[2] = 109762
+migrations[3] = 112076
 *** END OF TEST SMPMRSP 1 ***