From c5436ff48289f4002417bc05fb5f824b443fb027 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 4 Mar 2015 11:56:25 +0100 Subject: smptests/smpcapture01: Avoid livelock condition --- testsuites/smptests/smpcapture01/init.c | 1 + testsuites/smptests/smpcapture01/smpcapture01.scn | 94 +++++++++++++---------- 2 files changed, 54 insertions(+), 41 deletions(-) diff --git a/testsuites/smptests/smpcapture01/init.c b/testsuites/smptests/smpcapture01/init.c index 114cd8b36c..5b0f337406 100644 --- a/testsuites/smptests/smpcapture01/init.c +++ b/testsuites/smptests/smpcapture01/init.c @@ -78,6 +78,7 @@ static void task(rtems_task_argument arg) task_data[arg].ran = true; task_data[arg].actual_cpu = rtems_get_current_processor(); rtems_semaphore_release(task_sem); + test_delay(1); } } } diff --git a/testsuites/smptests/smpcapture01/smpcapture01.scn b/testsuites/smptests/smpcapture01/smpcapture01.scn index 9f7c639e41..353919aa79 100644 --- a/testsuites/smptests/smpcapture01/smpcapture01.scn +++ b/testsuites/smptests/smpcapture01/smpcapture01.scn @@ -1,45 +1,57 @@ *** BEGIN OF TEST SMPCAPTURE 1 *** - 1 0:00:00.008653000 0a010003 TA02 5 5 5 4096 TASK_RECORD - 0 0:00:00.008659000 0a010004 TA03 6 6 6 4096 TASK_RECORD - 2 0:00:00.008663000 0a010002 TA01 8 8 8 4096 TASK_RECORD - 1 0:00:00.008681000 0 0a010003 5 5 SWITCHED_IN - 0 0:00:00.008686000 0 0a010004 6 6 SWITCHED_IN - 2 0:00:00.008691000 0 0a010002 8 8 SWITCHED_IN - 1 0:00:00.008734000 53000 0a010003 5 5 BEGIN - 0 0:00:00.008738000 52000 0a010004 6 6 BEGIN - 2 0:00:00.008743000 52000 0a010002 8 8 BEGIN - 3 0:00:00.008914000 0a010001 UI1 7 7 7 4096 TASK_RECORD - 3 0:00:00.008943000 0 0a010001 7 7 CREATED_BY - 3 0:00:00.009015000 0a010005 TA04 9 9 9 4096 TASK_RECORD - 3 0:00:00.009041000 98000 0a010005 9 9 CREATED - 3 0:00:00.009298000 257000 0a010001 7 7 STARTED_BY - 3 0:00:00.009326000 28000 0a010005 9 9 STARTED - 3 0:00:01.000432000 991106000 0a010001 7 7 SWITCHED_OUT - 1 0:00:01.000452000 991718000 0a010003 5 5 SWITCHED_OUT - 3 0:00:01.000456000 24000 0a010004 6 6 SWITCHED_IN - 0 0:00:01.000473000 991735000 0a010004 6 6 SWITCHED_OUT - 1 0:00:01.000476000 24000 0a010005 4 4 SWITCHED_IN - 2 0:00:01.000491000 991748000 0a010002 8 8 SWITCHED_OUT - 0 0:00:01.000496000 23000 0a010003 5 5 SWITCHED_IN - 2 0:00:01.000514000 0 0a010001 7 7 SWITCHED_IN - 1 0:00:01.000527000 0 0a010005 4 4 BEGIN - 2 0:00:01.500426000 499912000 0a010001 7 7 SWITCHED_OUT - 2 0:00:01.500450000 24000 0a010002 7 7 SWITCHED_IN - 2 0:00:01.500579000 129000 0a010002 7 7 TERMINATED - 2 0:00:01.500731000 152000 0a010002 7 7 SWITCHED_OUT - 2 0:00:01.500755000 24000 0a010001 7 7 SWITCHED_IN - 2 0:00:01.500966000 211000 0a010001 7 7 SWITCHED_OUT - 0 0:00:01.501049000 0 0a010003 7 5 TERMINATED - 2 0:00:01.501186000 220000 0a010001 7 7 SWITCHED_IN - 0 0:00:01.501200000 151000 0a010003 7 5 SWITCHED_OUT - 2 0:00:01.501391000 205000 0a010001 7 7 SWITCHED_OUT - 3 0:00:01.501476000 0 0a010004 7 6 TERMINATED - 3 0:00:01.501623000 147000 0a010004 7 6 SWITCHED_OUT - 3 0:00:01.501649000 26000 0a010001 7 7 SWITCHED_IN - 3 0:00:01.501867000 218000 0a010001 7 7 SWITCHED_OUT - 1 0:00:01.501945000 501418000 0a010005 7 4 TERMINATED - 3 0:00:01.502083000 216000 0a010001 7 7 SWITCHED_IN - 1 0:00:01.502136000 191000 0a010005 7 4 SWITCHED_OUT + 2 0:00:00.013922000 0a010002 TA01 8 8 8 4096 TASK_RECORD + 2 0:00:00.013946000 0 0a010002 8 8 SWITCHED_IN + 2 0:00:00.013977000 31000 0a010002 8 8 BEGIN + 3 0:00:00.013985000 0a010001 UI1 7 7 7 4096 TASK_RECORD + 3 0:00:00.014012000 0 0a010001 7 7 CREATED_BY + 3 0:00:00.014047000 0a010003 TA02 5 5 5 4096 TASK_RECORD + 3 0:00:00.014059000 47000 0a010003 5 5 CREATED + 3 0:00:00.014166000 107000 0a010001 7 7 STARTED_BY + 3 0:00:00.014183000 17000 0a010003 5 5 STARTED + 1 0:00:00.014245000 0 0a010003 5 5 SWITCHED_IN + 1 0:00:00.014294000 49000 0a010003 5 5 BEGIN + 3 0:00:00.014352000 169000 0a010001 7 7 CREATED_BY + 3 0:00:00.014381000 0a010004 TA03 6 6 6 4096 TASK_RECORD + 3 0:00:00.014394000 42000 0a010004 6 6 CREATED + 3 0:00:00.014499000 105000 0a010001 7 7 STARTED_BY + 3 0:00:00.014514000 15000 0a010004 6 6 STARTED + 0 0:00:00.014571000 0 0a010004 6 6 SWITCHED_IN + 0 0:00:00.014623000 52000 0a010004 6 6 BEGIN + 3 0:00:00.014680000 166000 0a010001 7 7 CREATED_BY + 3 0:00:00.014709000 0a010005 TA04 9 9 9 4096 TASK_RECORD + 3 0:00:00.014721000 41000 0a010005 9 9 CREATED + 3 0:00:00.014820000 99000 0a010001 7 7 STARTED_BY + 3 0:00:00.014834000 0 0a010005 9 9 STARTED + 1 0:00:00.110186000 0 0a010003 5 5 SWITCHED_OUT + 1 0:00:00.110203000 17000 0a010005 4 4 SWITCHED_IN + 2 0:00:00.110225000 0 0a010002 8 8 SWITCHED_OUT + 1 0:00:00.110235000 32000 0a010005 4 4 BEGIN + 3 0:00:00.110240000 95406000 0a010001 7 7 SWITCHED_OUT + 2 0:00:00.110246000 21000 0a010001 7 7 SWITCHED_IN + 0 0:00:00.110250000 0 0a010004 6 6 SWITCHED_OUT + 3 0:00:00.110257000 17000 0a010004 6 6 SWITCHED_IN + 0 0:00:00.110265000 15000 0a010003 5 5 SWITCHED_IN + 2 0:00:00.310234000 199988000 0a010001 7 7 SWITCHED_OUT + 2 0:00:00.310247000 13000 0a010002 7 7 SWITCHED_IN + 2 0:00:00.310310000 63000 0a010002 7 7 TERMINATED + 2 0:00:00.310382000 72000 0a010002 7 7 SWITCHED_OUT + 2 0:00:00.310395000 13000 0a010001 7 7 SWITCHED_IN + 0 0:00:00.310484000 200219000 0a010003 7 5 SWITCHED_OUT + 2 0:00:00.310503000 108000 0a010001 7 7 SWITCHED_OUT + 0 0:00:00.310536000 52000 0a010003 7 5 SWITCHED_IN + 0 0:00:00.310598000 62000 0a010003 7 5 TERMINATED + 2 0:00:00.310688000 185000 0a010001 7 7 SWITCHED_IN + 0 0:00:00.310693000 95000 0a010003 7 5 SWITCHED_OUT + 2 0:00:00.310795000 107000 0a010001 7 7 SWITCHED_OUT + 3 0:00:00.310821000 0 0a010004 7 6 TERMINATED + 3 0:00:00.310907000 86000 0a010004 7 6 SWITCHED_OUT + 3 0:00:00.310920000 13000 0a010001 7 7 SWITCHED_IN + 1 0:00:00.311038000 0 0a010005 7 4 SWITCHED_OUT + 3 0:00:00.311044000 124000 0a010001 7 7 SWITCHED_OUT + 1 0:00:00.311091000 53000 0a010005 7 4 SWITCHED_IN + 1 0:00:00.311152000 61000 0a010005 7 4 TERMINATED + 3 0:00:00.311243000 199000 0a010001 7 7 SWITCHED_IN + 1 0:00:00.311247000 95000 0a010005 7 4 SWITCHED_OUT *** END OF TEST SMPCAPTURE 1 *** Note: Times may differ -- cgit v1.2.3