Unify printing of heir and executing

11 files changed, 144 insertions, 178 deletions

diff --git a/schedsim/shell/schedsim_smpsimple/Makefile.am b/schedsim/shell/schedsim_smpsimple/Makefile.am
index b0f9bb1..e57037a 100644
--- a/schedsim/shell/schedsim_smpsimple/Makefile.am
+++ b/schedsim/shell/schedsim_smpsimple/Makefile.am
@@ -3,7 +3,6 @@ schedsim_smpsimple_SOURCES =
 schedsim_smpsimple_SOURCES += add_commands.c
 schedsim_smpsimple_SOURCES += config.c
 schedsim_smpsimple_SOURCES += main_dump_ready_tasks.c
-schedsim_smpsimple_SOURCES += printheir_executing.c
 schedsim_smpsimple_SOURCES += wrap_thread_dispatch.c
 
 cpukitdir=@rtems_srcdir@/cpukit
diff --git a/schedsim/shell/schedsim_smpsimple/printheir_executing.c b/schedsim/shell/schedsim_smpsimple/printheir_executing.c
deleted file mode 100644
index fe4d580..0000000
--- a/schedsim/shell/schedsim_smpsimple/printheir_executing.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *  printheir_executing
- *
- *  COPYRIGHT (c) 1989-2013.
- *  On-Line Applications Research Corporation (OAR).
- *
- *  The license and distribution terms for this file may be
- *  found in the file LICENSE in this distribution or at
- *  http://www.rtems.com/license/LICENSE.
- */
-
-#include <stdio.h>
-#include <rtems.h>
-
-extern uint32_t Schedsim_Current_cpu;
-
-void PRINT_EXECUTING() {
-  printf(
-    "  CPU %d: Thread Executing 0x%08x priority=%ld\n",
-     Schedsim_Current_cpu,
-    _Thread_Executing->Object.id,
-    (long) _Thread_Executing->current_priority
-  );
-}
-
-void PRINT_HEIR() {
-  printf(
-    "  CPU %d: Thread Heir 0x%08x priority=%ld\n",
-    Schedsim_Current_cpu,
-    _Thread_Heir->Object.id,
-    (long) _Thread_Heir->current_priority
-  );
-}
diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_priority.expected b/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_priority.expected
index a7a07f0..ced6b03 100644
--- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_priority.expected
+++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_priority.expected
@@ -4,14 +4,14 @@ verbose                   : 1
 ==> 2: #  Check increasing and decrease priority self with no change
 ==> 3: #
 ==> 4: rtems_init 1
-  CPU 0: Thread Heir 0x09010001 priority=255
-  CPU 0: Thread Executing 0x09010001 priority=255
+  CPU 0: Thread Heir: 0x09010001 priority=255
+  CPU 0: Thread Executing: 0x09010001 priority=255
 ==> 5: task_create smp1 5
 Creating task with:  Preemption: yes Timeslicing: no
 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
+  CPU 0: Thread Heir: 0x0a010001 priority=5
+  CPU 0: Thread Executing: 0x0a010001 priority=5
 ==> 6: task_create smp2 8
 Creating task with:  Preemption: yes Timeslicing: no
 Task (smp2) created: id=0x0a010002, priority=8
@@ -43,8 +43,8 @@ Task (0x0a010001) Change Priority from 4 to 7
 === End of Ready Set of Threads
 ==> 18: 
 ==> 19: task_priority smp1 8
-  CPU 0: Thread Heir 0x0a010002 priority=8
-  CPU 0: Thread Executing 0x0a010002 priority=8
+  CPU 0: Thread Heir: 0x0a010002 priority=8
+  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
@@ -54,8 +54,8 @@ Task (0x0a010001) Change Priority from 7 to 8
 === End of Ready Set of Threads
 ==> 22: 
 ==> 23: task_priority smp1 5
-  CPU 0: Thread Heir 0x0a010001 priority=5
-  CPU 0: Thread Executing 0x0a010001 priority=5
+  CPU 0: Thread Heir: 0x0a010001 priority=5
+  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
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 5c4a54f..a366359 100644
--- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_resume_on_primary.expected
+++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_resume_on_primary.expected
@@ -4,14 +4,14 @@ verbose                   : 1
 ==> 2: #  Check suspending self, then resuming on primary CPU
 ==> 3: #
 ==> 4: rtems_init 1
-  CPU 0: Thread Heir 0x09010001 priority=255
-  CPU 0: Thread Executing 0x09010001 priority=255
+  CPU 0: Thread Heir: 0x09010001 priority=255
+  CPU 0: Thread Executing: 0x09010001 priority=255
 ==> 5: task_create smp1 5
 Creating task with:  Preemption: yes Timeslicing: no
 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
+  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
 === CPU Status
@@ -21,8 +21,8 @@ Task (smp1) starting: id=0x0a010001, priority=5
 ==> 8: # suspend running task
 ==> 9: task_suspend smp1
 Suspending task (0x0a010001)
-  CPU 0: Thread Heir 0x09010001 priority=255
-  CPU 0: Thread Executing 0x09010001 priority=255
+  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
 === CPU Status
@@ -38,8 +38,8 @@ Suspending task (0x0a010001)
 ==> 14: # resume suspended task
 ==> 15: task_resume smp1
 Resuming task (0x0a010001)
-  CPU 0: Thread Heir 0x0a010001 priority=5
-  CPU 0: Thread Executing 0x0a010001 priority=5
+  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
 === CPU Status
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 2870c95..5a408d9 100644
--- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_suspend_on_primary.expected
+++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus1_suspend_on_primary.expected
@@ -4,14 +4,14 @@ verbose                   : 1
 ==> 2: #  Check blocking self on primary CPU
 ==> 3: #
 ==> 4: rtems_init 1
-  CPU 0: Thread Heir 0x09010001 priority=255
-  CPU 0: Thread Executing 0x09010001 priority=255
+  CPU 0: Thread Heir: 0x09010001 priority=255
+  CPU 0: Thread Executing: 0x09010001 priority=255
 ==> 5: task_create smp1 5
 Creating task with:  Preemption: yes Timeslicing: no
 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
+  CPU 0: Thread Heir: 0x0a010001 priority=5
+  CPU 0: Thread Executing: 0x0a010001 priority=5
 ==> 6: cpus
 === CPU Status
           EXECUTING      /   HEIR             / SWITCH NEEDED
@@ -20,8 +20,8 @@ Task (smp1) starting: id=0x0a010001, priority=5
 ==> 7: # GOAL: 0x0a010001 is heir and executing on CPU 0
 ==> 8: task_suspend SELF
 Suspending task (0x0a010001)
-  CPU 0: Thread Heir 0x09010001 priority=255
-  CPU 0: Thread Executing 0x09010001 priority=255
+  CPU 0: Thread Heir: 0x09010001 priority=255
+  CPU 0: Thread Executing: 0x09010001 priority=255
 ==> 9: cpus
 === CPU Status
           EXECUTING      /   HEIR             / SWITCH NEEDED
diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_pick_older.expected b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_pick_older.expected
index 81578af..e93952b 100644
--- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_pick_older.expected
+++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_pick_older.expected
@@ -4,38 +4,38 @@ verbose                   : 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
+  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 3
 Creating task with:  Preemption: yes Timeslicing: no
 Task (smp1) created: id=0x0a010001, priority=3
 Task (smp1) starting: id=0x0a010001, priority=3
-  CPU 3: Thread Heir 0x0a010001 priority=3
-  CPU 3: Thread Executing 0x0a010001 priority=3
+  CPU 3: Thread Heir: 0x0a010001 priority=3
+  CPU 3: Thread Executing: 0x0a010001 priority=3
 ==> 6: task_create smp2 6
 Creating task with:  Preemption: yes Timeslicing: no
 Task (smp2) created: id=0x0a010002, priority=6
 Task (smp2) starting: id=0x0a010002, priority=6
-  CPU 2: Thread Heir 0x0a010002 priority=6
-  CPU 2: Thread Executing 0x0a010002 priority=6
+  CPU 2: Thread Heir: 0x0a010002 priority=6
+  CPU 2: Thread Executing: 0x0a010002 priority=6
 ==> 7: task_create smp3 7
 Creating task with:  Preemption: yes Timeslicing: no
 Task (smp3) created: id=0x0a010003, priority=7
 Task (smp3) starting: id=0x0a010003, priority=7
-  CPU 1: Thread Heir 0x0a010003 priority=7
-  CPU 1: Thread Executing 0x0a010003 priority=7
+  CPU 1: Thread Heir: 0x0a010003 priority=7
+  CPU 1: Thread Executing: 0x0a010003 priority=7
 ==> 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
+  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
@@ -51,8 +51,8 @@ Task (smp4) starting: id=0x0a010004, priority=8
 Creating task with:  Preemption: yes Timeslicing: no
 Task (smp5) created: id=0x0a010005, priority=5
 Task (smp5) starting: id=0x0a010005, priority=5
-  CPU 0: Thread Heir 0x0a010005 priority=5
-  CPU 0: Thread Executing 0x0a010005 priority=5
+  CPU 0: Thread Heir: 0x0a010005 priority=5
+  CPU 0: Thread Executing: 0x0a010005 priority=5
 ==> 14: clock_tick 1
 ClockTick (1) ...
 ==> 15: # GOAL: Tasks 0x0a010001, 0x0a010002, 0x0a010003, and 0x0a010005 are
@@ -70,8 +70,8 @@ ClockTick (1) ...
 Creating task with:  Preemption: yes Timeslicing: no
 Task (smp6) created: id=0x0a010006, priority=5
 Task (smp6) starting: id=0x0a010006, priority=5
-  CPU 1: Thread Heir 0x0a010006 priority=5
-  CPU 1: Thread Executing 0x0a010006 priority=5
+  CPU 1: Thread Heir: 0x0a010006 priority=5
+  CPU 1: Thread Executing: 0x0a010006 priority=5
 ==> 20: clock_tick 1
 ClockTick (1) ...
 ==> 21: # GOAL: Tasks 0x0a010001, 0x0a010002, 0x0a010006, and 0x0a010005 are
@@ -89,8 +89,8 @@ ClockTick (1) ...
 Creating task with:  Preemption: yes Timeslicing: no
 Task (smp7) created: id=0x0a010007, priority=5
 Task (smp7) starting: id=0x0a010007, priority=5
-  CPU 2: Thread Heir 0x0a010007 priority=5
-  CPU 2: Thread Executing 0x0a010007 priority=5
+  CPU 2: Thread Heir: 0x0a010007 priority=5
+  CPU 2: Thread Executing: 0x0a010007 priority=5
 ==> 26: clock_tick 1
 ClockTick (1) ...
 ==> 27: # GOAL: Tasks 0x0a010001, 0x0a010007, 0x0a010006, and 0x0a010005 are
@@ -109,8 +109,8 @@ ClockTick (1) ...
 Creating task with:  Preemption: yes Timeslicing: no
 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
+  CPU 2: Thread Heir: 0x0a010008 priority=4
+  CPU 2: Thread Executing: 0x0a010008 priority=4
 ==> 33: # GOAL: Tasks 0x0a010001, 0x0a010007, 0x0a010006, and 0x0a010008 are
 ==> 34: # GOAL:    heir and executing on CPUs 3 - 0 respectively
 ==> 35: cpus
diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_priority.expected b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_priority.expected
index de7fcb7..4be845d 100644
--- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_priority.expected
+++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_priority.expected
@@ -4,38 +4,38 @@ verbose                   : 1
 ==> 2: #  Check increasing and decrease 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
+  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 5
 Creating task with:  Preemption: yes Timeslicing: no
 Task (smp1) created: id=0x0a010001, priority=5
 Task (smp1) starting: id=0x0a010001, priority=5
-  CPU 3: Thread Heir 0x0a010001 priority=5
-  CPU 3: Thread Executing 0x0a010001 priority=5
+  CPU 3: Thread Heir: 0x0a010001 priority=5
+  CPU 3: Thread Executing: 0x0a010001 priority=5
 ==> 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
+  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
+  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
+  CPU 0: Thread Heir: 0x0a010004 priority=8
+  CPU 0: Thread Executing: 0x0a010004 priority=8
 ==> 9: task_create smp5 8
 Creating task with:  Preemption: yes Timeslicing: no
 Task (smp5) created: id=0x0a010005, priority=8
@@ -78,8 +78,8 @@ Task (0x0a010001) Change Priority from 4 to 7
 === End of Ready Set of Threads
 ==> 23: 
 ==> 24: task_priority smp1 8
-  CPU 3: Thread Heir 0x0a010005 priority=8
-  CPU 3: Thread Executing 0x0a010005 priority=8
+  CPU 3: Thread Heir: 0x0a010005 priority=8
+  CPU 3: Thread Executing: 0x0a010005 priority=8
 Task (0x0a010001) Change Priority from 7 to 8
 ==> 25: # GOAL: 0x0a010005, 0x0a010002 - 0x0a010004 are heir and executing
 ==> 26: # GOAL:   on CPUs 3 - 0 respectively
@@ -93,8 +93,8 @@ Task (0x0a010001) Change Priority from 7 to 8
 === End of Ready Set of Threads
 ==> 28: 
 ==> 29: task_priority smp1 5
-  CPU 3: Thread Heir 0x0a010001 priority=5
-  CPU 3: Thread Executing 0x0a010001 priority=5
+  CPU 3: Thread Heir: 0x0a010001 priority=5
+  CPU 3: Thread Executing: 0x0a010001 priority=5
 Task (0x0a010001) Change Priority from 8 to 5
 ==> 30: # GOAL: 0x0a010001 - 0x0a010004 are heir and executing
 ==> 31: # GOAL:   on CPUs 3 - 0 respectively
diff --git a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_simple_preemption.expected b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_simple_preemption.expected
index 19d4753..a219aee 100644
--- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_simple_preemption.expected
+++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_simple_preemption.expected
@@ -4,38 +4,38 @@ verbose                   : 1
 ==> 2: #  Ensure lowest priority is preempted
 ==> 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
+  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 7
 Creating task with:  Preemption: yes Timeslicing: no
 Task (smp1) created: id=0x0a010001, priority=7
 Task (smp1) starting: id=0x0a010001, priority=7
-  CPU 3: Thread Heir 0x0a010001 priority=7
-  CPU 3: Thread Executing 0x0a010001 priority=7
+  CPU 3: Thread Heir: 0x0a010001 priority=7
+  CPU 3: Thread Executing: 0x0a010001 priority=7
 ==> 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
+  CPU 2: Thread Heir: 0x0a010002 priority=8
+  CPU 2: Thread Executing: 0x0a010002 priority=8
 ==> 7: task_create smp3 5
 Creating task with:  Preemption: yes Timeslicing: no
 Task (smp3) created: id=0x0a010003, priority=5
 Task (smp3) starting: id=0x0a010003, priority=5
-  CPU 1: Thread Heir 0x0a010003 priority=5
-  CPU 1: Thread Executing 0x0a010003 priority=5
+  CPU 1: Thread Heir: 0x0a010003 priority=5
+  CPU 1: Thread Executing: 0x0a010003 priority=5
 ==> 8: task_create smp4 6
 Creating task with:  Preemption: yes Timeslicing: no
 Task (smp4) created: id=0x0a010004, priority=6
 Task (smp4) starting: id=0x0a010004, priority=6
-  CPU 0: Thread Heir 0x0a010004 priority=6
-  CPU 0: Thread Executing 0x0a010004 priority=6
+  CPU 0: Thread Heir: 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
@@ -51,8 +51,8 @@ Task (smp4) starting: id=0x0a010004, priority=6
 Creating task with:  Preemption: yes Timeslicing: no
 Task (smp5) created: id=0x0a010005, priority=1
 Task (smp5) starting: id=0x0a010005, priority=1
-  CPU 2: Thread Heir 0x0a010005 priority=1
-  CPU 2: Thread Executing 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
 === CPU Status
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 b94ab9d..19a6459 100644
--- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_all.expected
+++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_all.expected
@@ -4,38 +4,38 @@ verbose                   : 1
 ==> 2: #  Check blocking self on secondary CPU
 ==> 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
+  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 5
 Creating task with:  Preemption: yes Timeslicing: no
 Task (smp1) created: id=0x0a010001, priority=5
 Task (smp1) starting: id=0x0a010001, priority=5
-  CPU 3: Thread Heir 0x0a010001 priority=5
-  CPU 3: Thread Executing 0x0a010001 priority=5
+  CPU 3: Thread Heir: 0x0a010001 priority=5
+  CPU 3: Thread Executing: 0x0a010001 priority=5
 ==> 6: task_create smp2 6
 Creating task with:  Preemption: yes Timeslicing: no
 Task (smp2) created: id=0x0a010002, priority=6
 Task (smp2) starting: id=0x0a010002, priority=6
-  CPU 2: Thread Heir 0x0a010002 priority=6
-  CPU 2: Thread Executing 0x0a010002 priority=6
+  CPU 2: Thread Heir: 0x0a010002 priority=6
+  CPU 2: Thread Executing: 0x0a010002 priority=6
 ==> 7: task_create smp3 7
 Creating task with:  Preemption: yes Timeslicing: no
 Task (smp3) created: id=0x0a010003, priority=7
 Task (smp3) starting: id=0x0a010003, priority=7
-  CPU 1: Thread Heir 0x0a010003 priority=7
-  CPU 1: Thread Executing 0x0a010003 priority=7
+  CPU 1: Thread Heir: 0x0a010003 priority=7
+  CPU 1: Thread Executing: 0x0a010003 priority=7
 ==> 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
+  CPU 0: Thread Heir: 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
@@ -48,20 +48,20 @@ Task (smp4) starting: id=0x0a010004, priority=8
 === End of Ready Set of Threads
 ==> 12: task_suspend smp1
 Suspending task (0x0a010001)
-  CPU 3: Thread Heir 0x09010001 priority=255
-  CPU 3: Thread Executing 0x09010001 priority=255
+  CPU 3: Thread Heir: 0x09010001 priority=255
+  CPU 3: Thread Executing: 0x09010001 priority=255
 ==> 13: task_suspend smp2
 Suspending task (0x0a010002)
-  CPU 2: Thread Heir 0x09010002 priority=255
-  CPU 2: Thread Executing 0x09010002 priority=255
+  CPU 2: Thread Heir: 0x09010002 priority=255
+  CPU 2: Thread Executing: 0x09010002 priority=255
 ==> 14: task_suspend smp3
 Suspending task (0x0a010003)
-  CPU 1: Thread Heir 0x09010003 priority=255
-  CPU 1: Thread Executing 0x09010003 priority=255
+  CPU 1: Thread Heir: 0x09010003 priority=255
+  CPU 1: Thread Executing: 0x09010003 priority=255
 ==> 15: task_suspend smp4
 Suspending task (0x0a010004)
-  CPU 0: Thread Heir 0x09010004 priority=255
-  CPU 0: Thread Executing 0x09010004 priority=255
+  CPU 0: Thread Heir: 0x09010004 priority=255
+  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
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 3a40a2f..9014803 100644
--- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_primary.expected
+++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_primary.expected
@@ -4,38 +4,38 @@ verbose                   : 1
 ==> 2: #  Check blocking self on primary CPU
 ==> 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
+  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
+  CPU 3: Thread Heir: 0x0a010001 priority=8
+  CPU 3: Thread Executing: 0x0a010001 priority=8
 ==> 6: task_create smp2 7
 Creating task with:  Preemption: yes Timeslicing: no
 Task (smp2) created: id=0x0a010002, priority=7
 Task (smp2) starting: id=0x0a010002, priority=7
-  CPU 2: Thread Heir 0x0a010002 priority=7
-  CPU 2: Thread Executing 0x0a010002 priority=7
+  CPU 2: Thread Heir: 0x0a010002 priority=7
+  CPU 2: Thread Executing: 0x0a010002 priority=7
 ==> 7: task_create smp3 6
 Creating task with:  Preemption: yes Timeslicing: no
 Task (smp3) created: id=0x0a010003, priority=6
 Task (smp3) starting: id=0x0a010003, priority=6
-  CPU 1: Thread Heir 0x0a010003 priority=6
-  CPU 1: Thread Executing 0x0a010003 priority=6
+  CPU 1: Thread Heir: 0x0a010003 priority=6
+  CPU 1: Thread Executing: 0x0a010003 priority=6
 ==> 8: task_create smp4 5
 Creating task with:  Preemption: yes Timeslicing: no
 Task (smp4) created: id=0x0a010004, priority=5
 Task (smp4) starting: id=0x0a010004, priority=5
-  CPU 0: Thread Heir 0x0a010004 priority=5
-  CPU 0: Thread Executing 0x0a010004 priority=5
+  CPU 0: Thread Heir: 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
@@ -48,8 +48,8 @@ Task (smp4) starting: id=0x0a010004, priority=5
 === End of Ready Set of Threads
 ==> 12: task_suspend SELF
 Suspending task (0x0a010004)
-  CPU 0: Thread Heir 0x09010001 priority=255
-  CPU 0: Thread Executing 0x09010001 priority=255
+  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
 === CPU Status
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 6ade3c7..6b90bc1 100644
--- a/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_secondary.expected
+++ b/schedsim/shell/schedsim_smpsimple/scenarios/cpus4_suspend_on_secondary.expected
@@ -4,38 +4,38 @@ verbose                   : 1
 ==> 2: #  Check blocking self on secondary CPU
 ==> 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
+  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
+  CPU 3: Thread Heir: 0x0a010001 priority=8
+  CPU 3: Thread Executing: 0x0a010001 priority=8
 ==> 6: task_create smp2 7
 Creating task with:  Preemption: yes Timeslicing: no
 Task (smp2) created: id=0x0a010002, priority=7
 Task (smp2) starting: id=0x0a010002, priority=7
-  CPU 2: Thread Heir 0x0a010002 priority=7
-  CPU 2: Thread Executing 0x0a010002 priority=7
+  CPU 2: Thread Heir: 0x0a010002 priority=7
+  CPU 2: Thread Executing: 0x0a010002 priority=7
 ==> 7: task_create smp3 6
 Creating task with:  Preemption: yes Timeslicing: no
 Task (smp3) created: id=0x0a010003, priority=6
 Task (smp3) starting: id=0x0a010003, priority=6
-  CPU 1: Thread Heir 0x0a010003 priority=6
-  CPU 1: Thread Executing 0x0a010003 priority=6
+  CPU 1: Thread Heir: 0x0a010003 priority=6
+  CPU 1: Thread Executing: 0x0a010003 priority=6
 ==> 8: task_create smp4 5
 Creating task with:  Preemption: yes Timeslicing: no
 Task (smp4) created: id=0x0a010004, priority=5
 Task (smp4) starting: id=0x0a010004, priority=5
-  CPU 0: Thread Heir 0x0a010004 priority=5
-  CPU 0: Thread Executing 0x0a010004 priority=5
+  CPU 0: Thread Heir: 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
@@ -50,8 +50,8 @@ Task (smp4) starting: id=0x0a010004, priority=5
 Changing current CPU from 0 to 2
 ==> 13: task_suspend SELF
 Suspending task (0x0a010002)
-  CPU 2: Thread Heir 0x09010001 priority=255
-  CPU 2: Thread Executing 0x09010001 priority=255
+  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
 === CPU Status