schedsim_smpsimple: Change scenarios to expect verbose output.

10 files changed, 94 insertions, 9 deletions

diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_priority.expected b/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_priority.expected
index ced6b03..36994cb 100644
--- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_priority.expected
+++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_priority.expected
@@ -1,4 +1,4 @@
-Script File               : scenarios/cpus1_priority.scen
+Script File               : cpus1_priority.scen
 verbose                   : 1
 ==> 1: #
 ==> 2: #  Check increasing and decrease priority self with no change
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 a366359..598ecf0 100644
--- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_resume_on_primary.expected
+++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_resume_on_primary.expected
@@ -1,4 +1,4 @@
-Script File               : scenarios/cpus1_resume_on_primary.scen
+Script File               : cpus1_resume_on_primary.scen
 verbose                   : 1
 ==> 1: #
 ==> 2: #  Check suspending self, then resuming on primary CPU
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 5a408d9..8de9117 100644
--- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_suspend_on_primary.expected
+++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_suspend_on_primary.expected
@@ -1,4 +1,4 @@
-Script File               : scenarios/cpus1_suspend_on_primary.scen
+Script File               : cpus1_suspend_on_primary.scen
 verbose                   : 1
 ==> 1: #
 ==> 2: #  Check blocking self on primary CPU
diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_inherit_priority.expected b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_inherit_priority.expected
new file mode 100644
index 0000000..5210880
--- /dev/null
+++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_inherit_priority.expected
@@ -0,0 +1,85 @@
+Script File               : cpus4_inherit_priority.scen
+verbose                   : 1
+==> 1: #
+==> 2: #  Verify we select the oldest task at a priority
+==> 3: #
+==> 4: rtems_init 4
+  CPU 0: Thread Heir: 0x09010001 priority=255
+  CPU 0: Thread Executing: 0x09010001 priority=255
+  CPU 1: Thread Heir: 0x09010002 priority=255
+  CPU 1: Thread Executing: 0x09010002 priority=255
+  CPU 2: Thread Heir: 0x09010003 priority=255
+  CPU 2: Thread Executing: 0x09010003 priority=255
+  CPU 3: Thread Heir: 0x09010004 priority=255
+  CPU 3: Thread Executing: 0x09010004 priority=255
+==> 5: task_create smp1 8
+Creating task with:  Preemption: yes Timeslicing: no
+Task (smp1) created: id=0x0a010001, priority=8
+Task (smp1) starting: id=0x0a010001, priority=8
+  CPU 3: Thread Heir: 0x0a010001 priority=8
+  CPU 3: Thread Executing: 0x0a010001 priority=8
+==> 6: task_create smp2 8
+Creating task with:  Preemption: yes Timeslicing: no
+Task (smp2) created: id=0x0a010002, priority=8
+Task (smp2) starting: id=0x0a010002, priority=8
+  CPU 2: Thread Heir: 0x0a010002 priority=8
+  CPU 2: Thread Executing: 0x0a010002 priority=8
+==> 7: task_create smp3 8
+Creating task with:  Preemption: yes Timeslicing: no
+Task (smp3) created: id=0x0a010003, priority=8
+Task (smp3) starting: id=0x0a010003, priority=8
+  CPU 1: Thread Heir: 0x0a010003 priority=8
+  CPU 1: Thread Executing: 0x0a010003 priority=8
+==> 8: task_create smp4 8
+Creating task with:  Preemption: yes Timeslicing: no
+Task (smp4) created: id=0x0a010004, priority=8
+Task (smp4) starting: id=0x0a010004, priority=8
+  CPU 0: Thread Heir: 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 smp4 smp3 smp2 smp1
+=== CPU Status
+          EXECUTING      /   HEIR             / SWITCH NEEDED
+  CPU 0: 0x0a010004 @  8 / 0x0a010004 @  8          false
+  CPU 1: 0x0a010003 @  8 / 0x0a010003 @  8          false
+  CPU 2: 0x0a010002 @  8 / 0x0a010002 @  8          false
+  CPU 3: 0x0a010001 @  8 / 0x0a010001 @  8          false
+=== End of Ready Set of Threads
+==> 12: 
+==> 13: # sem1 is binary semaphore (e.g. mutex) with priority ceiling of 5 
+==> 14: semaphore_create -b -p -C 5 -V 1 sem1
+Semaphore (sem1) created: id=0x1a010001
+==> 15: cpus smp4 smp3 smp2 smp1
+=== CPU Status
+          EXECUTING      /   HEIR             / SWITCH NEEDED
+  CPU 0: 0x0a010004 @  8 / 0x0a010004 @  8          false
+  CPU 1: 0x0a010003 @  8 / 0x0a010003 @  8          false
+  CPU 2: 0x0a010002 @  8 / 0x0a010002 @  8          false
+  CPU 3: 0x0a010001 @  8 / 0x0a010001 @  8          false
+=== End of Ready Set of Threads
+==> 16: 
+==> 17: semaphore_obtain sem1 0
+Obtain semaphore (0x1a010001) with timeout 0
+==> 18: 
+==> 19: # This should show smp4 has inherited a priority of 5
+==> 20: cpus smp4 smp3 smp2 smp1
+=== CPU Status
+          EXECUTING      /   HEIR             / SWITCH NEEDED
+  CPU 0: 0x0a010004 @  5 / 0x0a010004 @  5          false
+  CPU 1: 0x0a010003 @  8 / 0x0a010003 @  8          false
+  CPU 2: 0x0a010002 @  8 / 0x0a010002 @  8          false
+  CPU 3: 0x0a010001 @  8 / 0x0a010001 @  8          false
+=== End of Ready Set of Threads
+==> 21: 
+==> 22: semaphore_release sem1
+Releasing semaphore (0x1a010001)
+==> 23: # This should show smp1 has its original priority of 8
+==> 24: cpus smp4 smp3 smp2 smp1
+=== CPU Status
+          EXECUTING      /   HEIR             / SWITCH NEEDED
+  CPU 0: 0x0a010004 @  8 / 0x0a010004 @  8          false
+  CPU 1: 0x0a010003 @  8 / 0x0a010003 @  8          false
+  CPU 2: 0x0a010002 @  8 / 0x0a010002 @  8          false
+  CPU 3: 0x0a010001 @  8 / 0x0a010001 @  8          false
+=== End of Ready Set of Threads
diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_pick_older.expected b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_pick_older.expected
index e93952b..77ebf02 100644
--- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_pick_older.expected
+++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_pick_older.expected
@@ -1,4 +1,4 @@
-Script File               : scenarios/cpus4_pick_older.scen
+Script File               : cpus4_pick_older.scen
 verbose                   : 1
 ==> 1: #
 ==> 2: #  Verify we select the oldest task at a priority
diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_priority.expected b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_priority.expected
index 4be845d..50a17d8 100644
--- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_priority.expected
+++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_priority.expected
@@ -1,4 +1,4 @@
-Script File               : scenarios/cpus4_priority.scen
+Script File               : cpus4_priority.scen
 verbose                   : 1
 ==> 1: #
 ==> 2: #  Check increasing and decrease priority
diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_simple_preemption.expected b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_simple_preemption.expected
index a219aee..39a54ad 100644
--- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_simple_preemption.expected
+++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_simple_preemption.expected
@@ -1,4 +1,4 @@
-Script File               : scenarios/cpus4_simple_preemption.scen
+Script File               : cpus4_simple_preemption.scen
 verbose                   : 1
 ==> 1: #
 ==> 2: #  Ensure lowest priority is preempted
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 19a6459..b33af07 100644
--- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_all.expected
+++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_all.expected
@@ -1,4 +1,4 @@
-Script File               : scenarios/cpus4_suspend_on_all.scen
+Script File               : cpus4_suspend_on_all.scen
 verbose                   : 1
 ==> 1: #
 ==> 2: #  Check blocking self on secondary CPU
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 9014803..0289360 100644
--- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_primary.expected
+++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_primary.expected
@@ -1,4 +1,4 @@
-Script File               : scenarios/cpus4_suspend_on_primary.scen
+Script File               : cpus4_suspend_on_primary.scen
 verbose                   : 1
 ==> 1: #
 ==> 2: #  Check blocking self on primary CPU
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 6b90bc1..af96d67 100644
--- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_secondary.expected
+++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_secondary.expected
@@ -1,4 +1,4 @@
-Script File               : scenarios/cpus4_suspend_on_secondary.scen
+Script File               : cpus4_suspend_on_secondary.scen
 verbose                   : 1
 ==> 1: #
 ==> 2: #  Check blocking self on secondary CPU