From 42888e1eb418b9153c71a2a80bf0a014fe8a4a7a Mon Sep 17 00:00:00 2001 From: Jennifer Averett Date: Tue, 3 Jun 2014 07:25:24 -0500 Subject: schedsim_smpsimple: Add task verification per core to scenario. --- .../schedsim_smpsimple/scenarios/cpus1_priority.expected | 10 +++++----- .../shell/schedsim_smpsimple/scenarios/cpus1_priority.scen | 10 +++++----- .../scenarios/cpus1_resume_on_primary.expected | 10 +++++----- .../scenarios/cpus1_resume_on_primary.scen | 10 +++++----- .../scenarios/cpus1_suspend_on_primary.expected | 6 +++--- .../scenarios/cpus1_suspend_on_primary.scen | 6 +++--- .../schedsim_smpsimple/scenarios/cpus4_pick_older.expected | 12 ++++++------ .../shell/schedsim_smpsimple/scenarios/cpus4_pick_older.scen | 12 ++++++------ .../schedsim_smpsimple/scenarios/cpus4_priority.expected | 10 +++++----- .../shell/schedsim_smpsimple/scenarios/cpus4_priority.scen | 10 +++++----- .../scenarios/cpus4_simple_preemption.expected | 6 +++--- .../scenarios/cpus4_simple_preemption.scen | 6 +++--- .../scenarios/cpus4_suspend_on_all.expected | 4 ++-- .../schedsim_smpsimple/scenarios/cpus4_suspend_on_all.scen | 4 ++-- .../scenarios/cpus4_suspend_on_primary.expected | 6 +++--- .../scenarios/cpus4_suspend_on_primary.scen | 6 +++--- .../scenarios/cpus4_suspend_on_secondary.expected | 6 +++--- .../scenarios/cpus4_suspend_on_secondary.scen | 6 +++--- 18 files changed, 70 insertions(+), 70 deletions(-) diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_priority.expected b/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_priority.expected index 36994cb..337428e 100644 --- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_priority.expected +++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_priority.expected @@ -18,7 +18,7 @@ Task (smp2) created: id=0x0a010002, priority=8 Task (smp2) starting: id=0x0a010002, priority=8 ==> 7: dispatch ==> 8: # GOAL: 0x0a010001 is heir and executing on CPU 0 -==> 9: cpus +==> 9: cpus smp1 === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x0a010001 @ 5 / 0x0a010001 @ 5 false @@ -27,7 +27,7 @@ Task (smp2) starting: id=0x0a010002, priority=8 ==> 11: task_priority smp1 4 Task (0x0a010001) Change Priority from 5 to 4 ==> 12: # GOAL: 0x0a010001 is still heir and executing on CPU 0 -==> 13: cpus +==> 13: cpus smp1 === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x0a010001 @ 4 / 0x0a010001 @ 4 false @@ -36,7 +36,7 @@ Task (0x0a010001) Change Priority from 5 to 4 ==> 15: task_priority smp1 7 Task (0x0a010001) Change Priority from 4 to 7 ==> 16: # GOAL: 0x0a010001 is still heir and executing on CPU 0 -==> 17: cpus +==> 17: cpus smp1 === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x0a010001 @ 7 / 0x0a010001 @ 7 false @@ -47,7 +47,7 @@ Task (0x0a010001) Change Priority from 4 to 7 CPU 0: Thread Executing: 0x0a010002 priority=8 Task (0x0a010001) Change Priority from 7 to 8 ==> 20: # GOAL: 0x0a010002 is now heir and executing on CPU 0 -==> 21: cpus +==> 21: cpus smp2 === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x0a010002 @ 8 / 0x0a010002 @ 8 false @@ -58,7 +58,7 @@ Task (0x0a010001) Change Priority from 7 to 8 CPU 0: Thread Executing: 0x0a010001 priority=5 Task (0x0a010001) Change Priority from 8 to 5 ==> 24: # GOAL: 0x0a010001 is now heir and executing on CPU 0 -==> 25: cpus +==> 25: cpus smp1 === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x0a010001 @ 5 / 0x0a010001 @ 5 false diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_priority.scen b/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_priority.scen index 9e8377b..fe7bf5c 100644 --- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_priority.scen +++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_priority.scen @@ -6,20 +6,20 @@ task_create smp1 5 task_create smp2 8 dispatch # GOAL: 0x0a010001 is heir and executing on CPU 0 -cpus +cpus smp1 task_priority smp1 4 # GOAL: 0x0a010001 is still heir and executing on CPU 0 -cpus +cpus smp1 task_priority smp1 7 # GOAL: 0x0a010001 is still heir and executing on CPU 0 -cpus +cpus smp1 task_priority smp1 8 # GOAL: 0x0a010002 is now heir and executing on CPU 0 -cpus +cpus smp2 task_priority smp1 5 # GOAL: 0x0a010001 is now heir and executing on CPU 0 -cpus +cpus smp1 diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_resume_on_primary.expected b/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_resume_on_primary.expected index 598ecf0..9b17afd 100644 --- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_resume_on_primary.expected +++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_resume_on_primary.expected @@ -13,7 +13,7 @@ Task (smp1) starting: id=0x0a010001, priority=5 CPU 0: Thread Heir: 0x0a010001 priority=5 CPU 0: Thread Executing: 0x0a010001 priority=5 ==> 6: # GOAL: 0x0a010001 is heir and executing on CPU 0 -==> 7: cpus +==> 7: cpus smp1 === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x0a010001 @ 5 / 0x0a010001 @ 5 false @@ -24,13 +24,13 @@ Suspending task (0x0a010001) CPU 0: Thread Heir: 0x09010001 priority=255 CPU 0: Thread Executing: 0x09010001 priority=255 ==> 10: # GOAL: 0x09010001 is heir and executing on CPU 0 -==> 11: cpus +==> 11: cpus IDLE === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x09010001 @255 / 0x09010001 @255 false === End of Ready Set of Threads ==> 12: # GOAL: 0x09010001 is heir and executing on CPU 0 -==> 13: cpus +==> 13: cpus IDLE === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x09010001 @255 / 0x09010001 @255 false @@ -41,13 +41,13 @@ Resuming task (0x0a010001) CPU 0: Thread Heir: 0x0a010001 priority=5 CPU 0: Thread Executing: 0x0a010001 priority=5 ==> 16: # GOAL: 0x0a010001 is heir and executing on CPU 0 -==> 17: cpus +==> 17: cpus smp1 === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x0a010001 @ 5 / 0x0a010001 @ 5 false === End of Ready Set of Threads ==> 18: # GOAL: 0x0a010001 is heir and executing on CPU 0 -==> 19: cpus +==> 19: cpus smp1 === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x0a010001 @ 5 / 0x0a010001 @ 5 false diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_resume_on_primary.scen b/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_resume_on_primary.scen index 8feaade..df7cf18 100644 --- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_resume_on_primary.scen +++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_resume_on_primary.scen @@ -4,16 +4,16 @@ rtems_init 1 task_create smp1 5 # GOAL: 0x0a010001 is heir and executing on CPU 0 -cpus +cpus smp1 # suspend running task task_suspend smp1 # GOAL: 0x09010001 is heir and executing on CPU 0 -cpus +cpus IDLE # GOAL: 0x09010001 is heir and executing on CPU 0 -cpus +cpus IDLE # resume suspended task task_resume smp1 # GOAL: 0x0a010001 is heir and executing on CPU 0 -cpus +cpus smp1 # GOAL: 0x0a010001 is heir and executing on CPU 0 -cpus +cpus smp1 diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_suspend_on_primary.expected b/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_suspend_on_primary.expected index 8de9117..7868ca8 100644 --- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_suspend_on_primary.expected +++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_suspend_on_primary.expected @@ -12,7 +12,7 @@ Task (smp1) created: id=0x0a010001, priority=5 Task (smp1) starting: id=0x0a010001, priority=5 CPU 0: Thread Heir: 0x0a010001 priority=5 CPU 0: Thread Executing: 0x0a010001 priority=5 -==> 6: cpus +==> 6: cpus smp1 === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x0a010001 @ 5 / 0x0a010001 @ 5 false @@ -22,13 +22,13 @@ Task (smp1) starting: id=0x0a010001, priority=5 Suspending task (0x0a010001) CPU 0: Thread Heir: 0x09010001 priority=255 CPU 0: Thread Executing: 0x09010001 priority=255 -==> 9: cpus +==> 9: cpus IDLE === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x09010001 @255 / 0x09010001 @255 false === End of Ready Set of Threads ==> 10: # GOAL: 0x09010001 is heir and executing on CPU 0 -==> 11: cpus +==> 11: cpus IDLE === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x09010001 @255 / 0x09010001 @255 false diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_suspend_on_primary.scen b/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_suspend_on_primary.scen index 46e9e13..3dec6c9 100644 --- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_suspend_on_primary.scen +++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_suspend_on_primary.scen @@ -3,9 +3,9 @@ # rtems_init 1 task_create smp1 5 -cpus +cpus smp1 # GOAL: 0x0a010001 is heir and executing on CPU 0 task_suspend SELF -cpus +cpus IDLE # GOAL: 0x09010001 is heir and executing on CPU 0 -cpus +cpus IDLE diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_pick_older.expected b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_pick_older.expected index 77ebf02..c561252 100644 --- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_pick_older.expected +++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_pick_older.expected @@ -38,7 +38,7 @@ Task (smp4) starting: id=0x0a010004, priority=8 CPU 0: Thread Executing: 0x0a010004 priority=8 ==> 9: # GOAL: Tasks 0x0a010001 - 0x0a010004 as heir and executing ==> 10: # GOAL: on CPUs 3 - 0 respectively -==> 11: cpus +==> 11: cpus smp4 smp3 smp2 smp1 === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x0a010004 @ 8 / 0x0a010004 @ 8 false @@ -57,7 +57,7 @@ Task (smp5) starting: id=0x0a010005, priority=5 ClockTick (1) ... ==> 15: # GOAL: Tasks 0x0a010001, 0x0a010002, 0x0a010003, and 0x0a010005 are ==> 16: # GOAL: heir and executing on CPUs 3 - 0 respectively -==> 17: cpus +==> 17: cpus smp5 smp3 smp2 smp1 === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x0a010005 @ 5 / 0x0a010005 @ 5 false @@ -76,7 +76,7 @@ Task (smp6) starting: id=0x0a010006, priority=5 ClockTick (1) ... ==> 21: # GOAL: Tasks 0x0a010001, 0x0a010002, 0x0a010006, and 0x0a010005 are ==> 22: # GOAL: heir and executing on CPUs 3 - 0 respectively -==> 23: cpus +==> 23: cpus smp5 smp6 smp2 smp1 === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x0a010005 @ 5 / 0x0a010005 @ 5 false @@ -95,7 +95,7 @@ Task (smp7) starting: id=0x0a010007, priority=5 ClockTick (1) ... ==> 27: # GOAL: Tasks 0x0a010001, 0x0a010007, 0x0a010006, and 0x0a010005 are ==> 28: # GOAL: heir and executing on CPUs 3 - 0 respectively -==> 29: cpus +==> 29: cpus smp5 smp6 smp7 smp1 === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x0a010005 @ 5 / 0x0a010005 @ 5 false @@ -111,9 +111,9 @@ Task (smp8) created: id=0x0a010008, priority=4 Task (smp8) starting: id=0x0a010008, priority=4 CPU 2: Thread Heir: 0x0a010008 priority=4 CPU 2: Thread Executing: 0x0a010008 priority=4 -==> 33: # GOAL: Tasks 0x0a010001, 0x0a010007, 0x0a010006, and 0x0a010008 are +==> 33: # GOAL: Tasks 0x0a010001, 0x0a010008, 0x0a010006, and 0x0a010005 are ==> 34: # GOAL: heir and executing on CPUs 3 - 0 respectively -==> 35: cpus +==> 35: cpus smp5 smp6 smp8 smp1 === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x0a010005 @ 5 / 0x0a010005 @ 5 false diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_pick_older.scen b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_pick_older.scen index d838516..b069e66 100644 --- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_pick_older.scen +++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_pick_older.scen @@ -8,28 +8,28 @@ task_create smp3 7 task_create smp4 8 # GOAL: Tasks 0x0a010001 - 0x0a010004 as heir and executing # GOAL: on CPUs 3 - 0 respectively -cpus +cpus smp4 smp3 smp2 smp1 task_create smp5 5 clock_tick 1 # GOAL: Tasks 0x0a010001, 0x0a010002, 0x0a010003, and 0x0a010005 are # GOAL: heir and executing on CPUs 3 - 0 respectively -cpus +cpus smp5 smp3 smp2 smp1 task_create smp6 5 clock_tick 1 # GOAL: Tasks 0x0a010001, 0x0a010002, 0x0a010006, and 0x0a010005 are # GOAL: heir and executing on CPUs 3 - 0 respectively -cpus +cpus smp5 smp6 smp2 smp1 task_create smp7 5 clock_tick 1 # GOAL: Tasks 0x0a010001, 0x0a010007, 0x0a010006, and 0x0a010005 are # GOAL: heir and executing on CPUs 3 - 0 respectively -cpus +cpus smp5 smp6 smp7 smp1 # We should pick task smp5 (0x0a010005) on CPU 0 task_create smp8 4 -# GOAL: Tasks 0x0a010001, 0x0a010007, 0x0a010006, and 0x0a010008 are +# GOAL: Tasks 0x0a010001, 0x0a010008, 0x0a010006, and 0x0a010005 are # GOAL: heir and executing on CPUs 3 - 0 respectively -cpus +cpus smp5 smp6 smp8 smp1 diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_priority.expected b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_priority.expected index 50a17d8..e015f92 100644 --- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_priority.expected +++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_priority.expected @@ -42,7 +42,7 @@ Task (smp5) created: id=0x0a010005, priority=8 Task (smp5) starting: id=0x0a010005, priority=8 ==> 10: # GOAL: 0x0a010001 - 0x0a010004 are heir and executing ==> 11: # GOAL: on CPUs 3 - 0 respectively -==> 12: cpus +==> 12: cpus smp4 smp3 smp2 smp1 === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x0a010004 @ 8 / 0x0a010004 @ 8 false @@ -55,7 +55,7 @@ Task (smp5) starting: id=0x0a010005, priority=8 Task (0x0a010001) Change Priority from 5 to 4 ==> 15: # GOAL: 0x0a010001 - 0x0a010004 are heir and executing ==> 16: # GOAL: on CPUs 3 - 0 respectively (no change) -==> 17: cpus +==> 17: cpus smp4 smp3 smp2 smp1 === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x0a010004 @ 8 / 0x0a010004 @ 8 false @@ -68,7 +68,7 @@ Task (0x0a010001) Change Priority from 5 to 4 Task (0x0a010001) Change Priority from 4 to 7 ==> 20: # GOAL: 0x0a010001 - 0x0a010004 are heir and executing ==> 21: # GOAL: on CPUs 3 - 0 respectively (no change) -==> 22: cpus +==> 22: cpus smp4 smp3 smp2 smp1 === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x0a010004 @ 8 / 0x0a010004 @ 8 false @@ -83,7 +83,7 @@ Task (0x0a010001) Change Priority from 4 to 7 Task (0x0a010001) Change Priority from 7 to 8 ==> 25: # GOAL: 0x0a010005, 0x0a010002 - 0x0a010004 are heir and executing ==> 26: # GOAL: on CPUs 3 - 0 respectively -==> 27: cpus +==> 27: cpus smp4 smp3 smp2 smp5 === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x0a010004 @ 8 / 0x0a010004 @ 8 false @@ -98,7 +98,7 @@ Task (0x0a010001) Change Priority from 7 to 8 Task (0x0a010001) Change Priority from 8 to 5 ==> 30: # GOAL: 0x0a010001 - 0x0a010004 are heir and executing ==> 31: # GOAL: on CPUs 3 - 0 respectively -==> 32: cpus +==> 32: cpus smp4 smp3 smp2 smp1 === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x0a010004 @ 8 / 0x0a010004 @ 8 false diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_priority.scen b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_priority.scen index ed58588..c3ecc3f 100644 --- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_priority.scen +++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_priority.scen @@ -9,24 +9,24 @@ task_create smp4 8 task_create smp5 8 # GOAL: 0x0a010001 - 0x0a010004 are heir and executing # GOAL: on CPUs 3 - 0 respectively -cpus +cpus smp4 smp3 smp2 smp1 task_priority smp1 4 # GOAL: 0x0a010001 - 0x0a010004 are heir and executing # GOAL: on CPUs 3 - 0 respectively (no change) -cpus +cpus smp4 smp3 smp2 smp1 task_priority smp1 7 # GOAL: 0x0a010001 - 0x0a010004 are heir and executing # GOAL: on CPUs 3 - 0 respectively (no change) -cpus +cpus smp4 smp3 smp2 smp1 task_priority smp1 8 # GOAL: 0x0a010005, 0x0a010002 - 0x0a010004 are heir and executing # GOAL: on CPUs 3 - 0 respectively -cpus +cpus smp4 smp3 smp2 smp5 task_priority smp1 5 # GOAL: 0x0a010001 - 0x0a010004 are heir and executing # GOAL: on CPUs 3 - 0 respectively -cpus +cpus smp4 smp3 smp2 smp1 diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_simple_preemption.expected b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_simple_preemption.expected index 39a54ad..953127d 100644 --- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_simple_preemption.expected +++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_simple_preemption.expected @@ -38,7 +38,7 @@ Task (smp4) starting: id=0x0a010004, priority=6 CPU 0: Thread Executing: 0x0a010004 priority=6 ==> 9: # GOAL: want 0x0a010001 - 0x0a010004 as heir and executings ==> 10: # GOAL: on CPUs 3-0 respectively -==> 11: cpus +==> 11: cpus smp4 smp3 smp2 smp1 === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x0a010004 @ 6 / 0x0a010004 @ 6 false @@ -54,7 +54,7 @@ Task (smp5) starting: id=0x0a010005, priority=1 CPU 2: Thread Heir: 0x0a010005 priority=1 CPU 2: Thread Executing: 0x0a010005 priority=1 ==> 14: # GOAL: want 0x0a010005 to be heir on CPU 2 -==> 15: cpus +==> 15: cpus smp4 smp3 smp5 smp1 === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x0a010004 @ 6 / 0x0a010004 @ 6 false @@ -63,7 +63,7 @@ Task (smp5) starting: id=0x0a010005, priority=1 CPU 3: 0x0a010001 @ 7 / 0x0a010001 @ 7 false === End of Ready Set of Threads ==> 16: # GOAL: want 0x0a010005 to be heir AND executing on CPU 2 -==> 17: cpus +==> 17: cpus smp4 smp3 smp5 smp1 === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x0a010004 @ 6 / 0x0a010004 @ 6 false diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_simple_preemption.scen b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_simple_preemption.scen index 27c77c2..81598fb 100644 --- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_simple_preemption.scen +++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_simple_preemption.scen @@ -8,10 +8,10 @@ task_create smp3 5 task_create smp4 6 # GOAL: want 0x0a010001 - 0x0a010004 as heir and executings # GOAL: on CPUs 3-0 respectively -cpus +cpus smp4 smp3 smp2 smp1 # Tasks are created and distributed across CPUs task_create smp5 1 # GOAL: want 0x0a010005 to be heir on CPU 2 -cpus +cpus smp4 smp3 smp5 smp1 # GOAL: want 0x0a010005 to be heir AND executing on CPU 2 -cpus +cpus smp4 smp3 smp5 smp1 diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_all.expected b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_all.expected index b33af07..a2cb7ff 100644 --- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_all.expected +++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_all.expected @@ -38,7 +38,7 @@ Task (smp4) starting: id=0x0a010004, priority=8 CPU 0: Thread Executing: 0x0a010004 priority=8 ==> 9: # GOAL: want 0x0a010001 - 0x0a010004 as heir and executings ==> 10: # GOAL: on CPUs 0 - 3 respectively -==> 11: cpus +==> 11: cpus smp4 smp3 smp2 smp1 === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x0a010004 @ 8 / 0x0a010004 @ 8 false @@ -64,7 +64,7 @@ Suspending task (0x0a010004) CPU 0: Thread Executing: 0x09010004 priority=255 ==> 16: # GOAL: want IDLE 0x09010001 - 0x09010004 as heir and executings ==> 17: # GOAL: on CPUs 0 - 3 respectively -==> 18: cpus +==> 18: cpus IDLE IDLE IDLE IDLE === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x09010004 @255 / 0x09010004 @255 false diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_all.scen b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_all.scen index f1fac9f..85cc3ff 100644 --- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_all.scen +++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_all.scen @@ -8,11 +8,11 @@ task_create smp3 7 task_create smp4 8 # GOAL: want 0x0a010001 - 0x0a010004 as heir and executings # GOAL: on CPUs 0 - 3 respectively -cpus +cpus smp4 smp3 smp2 smp1 task_suspend smp1 task_suspend smp2 task_suspend smp3 task_suspend smp4 # GOAL: want IDLE 0x09010001 - 0x09010004 as heir and executings # GOAL: on CPUs 0 - 3 respectively -cpus +cpus IDLE IDLE IDLE IDLE diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_primary.expected b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_primary.expected index 0289360..9027555 100644 --- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_primary.expected +++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_primary.expected @@ -38,7 +38,7 @@ Task (smp4) starting: id=0x0a010004, priority=5 CPU 0: Thread Executing: 0x0a010004 priority=5 ==> 9: # GOAL: want 0x0a010001 - 0x0a010004 as heir and executings ==> 10: # GOAL: on CPUs 3-0 respectively -==> 11: cpus +==> 11: cpus smp4 smp3 smp2 smp1 === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x0a010004 @ 5 / 0x0a010004 @ 5 false @@ -51,7 +51,7 @@ Suspending task (0x0a010004) CPU 0: Thread Heir: 0x09010001 priority=255 CPU 0: Thread Executing: 0x09010001 priority=255 ==> 13: # GOAL: want 0x09010001 as heir and executing on CPU 0 -==> 14: cpus +==> 14: cpus IDLE smp3 smp2 smp1 === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x09010001 @255 / 0x09010001 @255 false @@ -60,7 +60,7 @@ Suspending task (0x0a010004) CPU 3: 0x0a010001 @ 8 / 0x0a010001 @ 8 false === End of Ready Set of Threads ==> 15: # GOAL: want 0x09010001 as heir and executing on CPU 0 -==> 16: cpus +==> 16: cpus IDLE smp3 smp2 smp1 === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x09010001 @255 / 0x09010001 @255 false diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_primary.scen b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_primary.scen index 7de3d6e..27eb8f7 100644 --- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_primary.scen +++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_primary.scen @@ -8,9 +8,9 @@ task_create smp3 6 task_create smp4 5 # GOAL: want 0x0a010001 - 0x0a010004 as heir and executings # GOAL: on CPUs 3-0 respectively -cpus +cpus smp4 smp3 smp2 smp1 task_suspend SELF # GOAL: want 0x09010001 as heir and executing on CPU 0 -cpus +cpus IDLE smp3 smp2 smp1 # GOAL: want 0x09010001 as heir and executing on CPU 0 -cpus +cpus IDLE smp3 smp2 smp1 diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_secondary.expected b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_secondary.expected index af96d67..be13e29 100644 --- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_secondary.expected +++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_secondary.expected @@ -38,7 +38,7 @@ Task (smp4) starting: id=0x0a010004, priority=5 CPU 0: Thread Executing: 0x0a010004 priority=5 ==> 9: # GOAL: want 0x0a010001 - 0x0a010004 as heir and executings ==> 10: # GOAL: on CPUs 3-0 respectively -==> 11: cpus +==> 11: cpus smp4 smp3 smp2 smp1 === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x0a010004 @ 5 / 0x0a010004 @ 5 false @@ -53,7 +53,7 @@ Suspending task (0x0a010002) CPU 2: Thread Heir: 0x09010001 priority=255 CPU 2: Thread Executing: 0x09010001 priority=255 ==> 14: # GOAL: Want IDLE 0x09010001 as heir and executing on CPU 2 -==> 15: cpus +==> 15: cpus smp4 smp3 IDLE smp1 === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x0a010004 @ 5 / 0x0a010004 @ 5 false @@ -62,7 +62,7 @@ Suspending task (0x0a010002) CPU 3: 0x0a010001 @ 8 / 0x0a010001 @ 8 false === End of Ready Set of Threads ==> 16: # GOAL: Want IDLE 0x09010001 as heir and executing on CPU 2 -==> 17: cpus +==> 17: cpus smp4 smp3 IDLE smp1 === CPU Status EXECUTING / HEIR / SWITCH NEEDED CPU 0: 0x0a010004 @ 5 / 0x0a010004 @ 5 false diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_secondary.scen b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_secondary.scen index bd34551..346249f 100644 --- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_secondary.scen +++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_secondary.scen @@ -8,10 +8,10 @@ task_create smp3 6 task_create smp4 5 # GOAL: want 0x0a010001 - 0x0a010004 as heir and executings # GOAL: on CPUs 3-0 respectively -cpus +cpus smp4 smp3 smp2 smp1 current_cpu 2 task_suspend SELF # GOAL: Want IDLE 0x09010001 as heir and executing on CPU 2 -cpus +cpus smp4 smp3 IDLE smp1 # GOAL: Want IDLE 0x09010001 as heir and executing on CPU 2 -cpus +cpus smp4 smp3 IDLE smp1 -- cgit v1.2.3