Unify printing of heir and executing

6 files changed, 64 insertions, 64 deletions

diff --git a/schedsim/shell/schedsim_priority/scenarios/script01.expected b/schedsim/shell/schedsim_priority/scenarios/script01.expected
index 8a18f29..23338de 100644
--- a/schedsim/shell/schedsim_priority/scenarios/script01.expected
+++ b/schedsim/shell/schedsim_priority/scenarios/script01.expected
@@ -1,22 +1,22 @@
 *** TEST 01 ***
-  Thread Heir: 0x09010001 priority=255
-  Thread Executing: 0x09010001 priority=255
+  CPU 0: Thread Heir: 0x09010001 priority=255
+  CPU 0: Thread Executing: 0x09010001 priority=255
 === Create and delete 0x0a010001 ===
 Creating task with:  Preemption: yes Timeslicing: no
 Task (TA1) created: id=0x0a010001, priority=3
 Task (TA1) starting: id=0x0a010001, priority=3
-  Thread Heir: 0x0a010001 priority=3
-  Thread Executing: 0x0a010001 priority=3
-  Thread Heir: 0x09010001 priority=255
-  Thread Executing: 0x09010001 priority=255
+  CPU 0: Thread Heir: 0x0a010001 priority=3
+  CPU 0: Thread Executing: 0x0a010001 priority=3
+  CPU 0: Thread Heir: 0x09010001 priority=255
+  CPU 0: Thread Executing: 0x09010001 priority=255
 Task (0x0a010001) deleted
 === Create and delete 0x0a010002 ===
 Creating task with:  Preemption: yes Timeslicing: no
 Task (TA1) created: id=0x0a010002, priority=3
 Task (TA1) starting: id=0x0a010002, priority=3
-  Thread Heir: 0x0a010002 priority=3
-  Thread Executing: 0x0a010002 priority=3
-  Thread Heir: 0x09010001 priority=255
-  Thread Executing: 0x09010001 priority=255
+  CPU 0: Thread Heir: 0x0a010002 priority=3
+  CPU 0: Thread Executing: 0x0a010002 priority=3
+  CPU 0: Thread Heir: 0x09010001 priority=255
+  CPU 0: Thread Executing: 0x09010001 priority=255
 Task (0x0a010002) deleted
 *** END OF TEST 01 ***
diff --git a/schedsim/shell/schedsim_priority/scenarios/script02.expected b/schedsim/shell/schedsim_priority/scenarios/script02.expected
index 49abf04..4f0c14e 100644
--- a/schedsim/shell/schedsim_priority/scenarios/script02.expected
+++ b/schedsim/shell/schedsim_priority/scenarios/script02.expected
@@ -1,22 +1,22 @@
 *** TEST 02 ***
-  Thread Heir: 0x09010001 priority=255
-  Thread Executing: 0x09010001 priority=255
+  CPU 0: Thread Heir: 0x09010001 priority=255
+  CPU 0: Thread Executing: 0x09010001 priority=255
 === Create 0x0a010001 ===
 Creating task with:  Preemption: yes Timeslicing: no
 Task (TA1) created: id=0x0a010001, priority=1
 Task (TA1) starting: id=0x0a010001, priority=1
-  Thread Heir: 0x0a010001 priority=1
-  Thread Executing: 0x0a010001 priority=1
+  CPU 0: Thread Heir: 0x0a010001 priority=1
+  CPU 0: Thread Executing: 0x0a010001 priority=1
 Task (0x0a010001) sleeping for 5 ticks
-  Thread Heir: 0x09010001 priority=255
-  Thread Executing: 0x09010001 priority=255
+  CPU 0: Thread Heir: 0x09010001 priority=255
+  CPU 0: Thread Executing: 0x09010001 priority=255
 ClockTick (1) ...
 ClockTick (2) ...
 ClockTick (3) ...
 ClockTick (4) ...
 ClockTick (5) ...
-  Thread Heir: 0x0a010001 priority=1
-  Thread Executing: 0x0a010001 priority=1
+  CPU 0: Thread Heir: 0x0a010001 priority=1
+  CPU 0: Thread Executing: 0x0a010001 priority=1
 ClockTick (6) ...
 ClockTick (7) ...
 *** END OF TEST 2 ***
diff --git a/schedsim/shell/schedsim_priority/scenarios/script03.expected b/schedsim/shell/schedsim_priority/scenarios/script03.expected
index dd3c96d..4ccc8e8 100644
--- a/schedsim/shell/schedsim_priority/scenarios/script03.expected
+++ b/schedsim/shell/schedsim_priority/scenarios/script03.expected
@@ -1,12 +1,12 @@
 *** TEST 03 ***
-  Thread Heir: 0x09010001 priority=255
-  Thread Executing: 0x09010001 priority=255
+  CPU 0: Thread Heir: 0x09010001 priority=255
+  CPU 0: Thread Executing: 0x09010001 priority=255
 === Create 0x0a010001 ===
 Creating task with:  Preemption: yes Timeslicing: no
 Task (TA1) created: id=0x0a010001, priority=1
 Task (TA1) starting: id=0x0a010001, priority=1
-  Thread Heir: 0x0a010001 priority=1
-  Thread Executing: 0x0a010001 priority=1
+  CPU 0: Thread Heir: 0x0a010001 priority=1
+  CPU 0: Thread Executing: 0x0a010001 priority=1
 ** Mode - query
 Previous Mode: Preemption: yes Timeslicing: no
 ** Mode - set no timeslicing
diff --git a/schedsim/shell/schedsim_priority/scenarios/script04.expected b/schedsim/shell/schedsim_priority/scenarios/script04.expected
index 664df89..9a82470 100644
--- a/schedsim/shell/schedsim_priority/scenarios/script04.expected
+++ b/schedsim/shell/schedsim_priority/scenarios/script04.expected
@@ -1,21 +1,21 @@
 *** TEST 04 ***
-  Thread Heir: 0x09010001 priority=255
-  Thread Executing: 0x09010001 priority=255
+  CPU 0: Thread Heir: 0x09010001 priority=255
+  CPU 0: Thread Executing: 0x09010001 priority=255
 Create 0x0a010001
 Creating task with:  Preemption: yes Timeslicing: no
 Task (TA1) created: id=0x0a010001, priority=1
 Task (TA1) starting: id=0x0a010001, priority=1
-  Thread Heir: 0x0a010001 priority=1
-  Thread Executing: 0x0a010001 priority=1
+  CPU 0: Thread Heir: 0x0a010001 priority=1
+  CPU 0: Thread Executing: 0x0a010001 priority=1
 Suspending task (0x0a010001)
-  Thread Heir: 0x09010001 priority=255
-  Thread Executing: 0x09010001 priority=255
+  CPU 0: Thread Heir: 0x09010001 priority=255
+  CPU 0: Thread Executing: 0x09010001 priority=255
 Creating task with:  Preemption: yes Timeslicing: no
 Task (TA1) created: id=0x0a010002, priority=2
 Task (TA1) starting: id=0x0a010002, priority=2
-  Thread Heir: 0x0a010002 priority=2
-  Thread Executing: 0x0a010002 priority=2
+  CPU 0: Thread Heir: 0x0a010002 priority=2
+  CPU 0: Thread Executing: 0x0a010002 priority=2
 Resuming task (0x0a010001)
-  Thread Heir: 0x0a010001 priority=1
-  Thread Executing: 0x0a010001 priority=1
+  CPU 0: Thread Heir: 0x0a010001 priority=1
+  CPU 0: Thread Executing: 0x0a010001 priority=1
 *** END OF TEST 04 ***
diff --git a/schedsim/shell/schedsim_priority/scenarios/script05.expected b/schedsim/shell/schedsim_priority/scenarios/script05.expected
index f51de95..da4bfdb 100644
--- a/schedsim/shell/schedsim_priority/scenarios/script05.expected
+++ b/schedsim/shell/schedsim_priority/scenarios/script05.expected
@@ -1,12 +1,12 @@
 *** TEST 05 ***
-  Thread Heir: 0x09010001 priority=255
-  Thread Executing: 0x09010001 priority=255
+  CPU 0: Thread Heir: 0x09010001 priority=255
+  CPU 0: Thread Executing: 0x09010001 priority=255
 Create 0x0a010001
 Creating task with:  Preemption: yes Timeslicing: no
 Task (TA1) created: id=0x0a010001, priority=1
 Task (TA1) starting: id=0x0a010001, priority=1
-  Thread Heir: 0x0a010001 priority=1
-  Thread Executing: 0x0a010001 priority=1
+  CPU 0: Thread Heir: 0x0a010001 priority=1
+  CPU 0: Thread Executing: 0x0a010001 priority=1
 Creating task with:  Preemption: yes Timeslicing: no
 Task (TA2) created: id=0x0a010002, priority=2
 Task (TA2) starting: id=0x0a010002, priority=2
@@ -15,31 +15,31 @@ Task (TA3) created: id=0x0a010003, priority=3
 Task (TA3) starting: id=0x0a010003, priority=3
 Semaphore (SEM1) created: id=0x1a010001
 Obtain semaphore (0x1a010001) with timeout 0
-  Thread Heir: 0x0a010002 priority=2
-  Thread Executing: 0x0a010002 priority=2
+  CPU 0: Thread Heir: 0x0a010002 priority=2
+  CPU 0: Thread Executing: 0x0a010002 priority=2
 Obtain semaphore (0x1a010001) with timeout 0
-  Thread Heir: 0x0a010003 priority=3
-  Thread Executing: 0x0a010003 priority=3
+  CPU 0: Thread Heir: 0x0a010003 priority=3
+  CPU 0: Thread Executing: 0x0a010003 priority=3
 Obtain semaphore (0x1a010001) with timeout 0
-  Thread Heir: 0x09010001 priority=255
-  Thread Executing: 0x09010001 priority=255
+  CPU 0: Thread Heir: 0x09010001 priority=255
+  CPU 0: Thread Executing: 0x09010001 priority=255
 Flushing semaphore (0x1a010001)
-  Thread Heir: 0x0a010001 priority=1
-  Thread Executing: 0x0a010001 priority=1
+  CPU 0: Thread Heir: 0x0a010001 priority=1
+  CPU 0: Thread Executing: 0x0a010001 priority=1
 *** Now back to TA1 to do it differently
 Obtain semaphore (0x1a010001) with timeout 0
-  Thread Heir: 0x0a010002 priority=2
-  Thread Executing: 0x0a010002 priority=2
+  CPU 0: Thread Heir: 0x0a010002 priority=2
+  CPU 0: Thread Executing: 0x0a010002 priority=2
 Obtain semaphore (0x1a010001) with timeout 0
-  Thread Heir: 0x0a010003 priority=3
-  Thread Executing: 0x0a010003 priority=3
+  CPU 0: Thread Heir: 0x0a010003 priority=3
+  CPU 0: Thread Executing: 0x0a010003 priority=3
 Releasing semaphore (0x1a010001)
-  Thread Heir: 0x0a010001 priority=1
-  Thread Executing: 0x0a010001 priority=1
+  CPU 0: Thread Heir: 0x0a010001 priority=1
+  CPU 0: Thread Executing: 0x0a010001 priority=1
 Obtain semaphore (0x1a010001) with timeout 0
-  Thread Heir: 0x0a010003 priority=3
-  Thread Executing: 0x0a010003 priority=3
+  CPU 0: Thread Heir: 0x0a010003 priority=3
+  CPU 0: Thread Executing: 0x0a010003 priority=3
 Deleting semaphore (0x1a010001)
-  Thread Heir: 0x0a010001 priority=1
-  Thread Executing: 0x0a010001 priority=1
+  CPU 0: Thread Heir: 0x0a010001 priority=1
+  CPU 0: Thread Executing: 0x0a010001 priority=1
 *** END OF TEST 05 ***
diff --git a/schedsim/shell/schedsim_priority/scenarios/script06.expected b/schedsim/shell/schedsim_priority/scenarios/script06.expected
index 5a7fbb4..a9b5c48 100644
--- a/schedsim/shell/schedsim_priority/scenarios/script06.expected
+++ b/schedsim/shell/schedsim_priority/scenarios/script06.expected
@@ -1,12 +1,12 @@
 *** TEST 06 ***
-  Thread Heir: 0x09010001 priority=255
-  Thread Executing: 0x09010001 priority=255
+  CPU 0: Thread Heir: 0x09010001 priority=255
+  CPU 0: Thread Executing: 0x09010001 priority=255
 Create 0x0a010001
 Creating task with:  Preemption: yes Timeslicing: no
 Task (TA1) created: id=0x0a010001, priority=1
 Task (TA1) starting: id=0x0a010001, priority=1
-  Thread Heir: 0x0a010001 priority=1
-  Thread Executing: 0x0a010001 priority=1
+  CPU 0: Thread Heir: 0x0a010001 priority=1
+  CPU 0: Thread Executing: 0x0a010001 priority=1
 Creating task with:  Preemption: yes Timeslicing: no
 Task (TA2) created: id=0x0a010002, priority=2
 Task (TA2) starting: id=0x0a010002, priority=2
@@ -15,13 +15,13 @@ Task (TA3) created: id=0x0a010003, priority=3
 Task (TA3) starting: id=0x0a010003, priority=3
 Semaphore (SEM1) created: id=0x1a010001
 Obtain semaphore (0x1a010001) with timeout 0
-  Thread Heir: 0x0a010002 priority=2
-  Thread Executing: 0x0a010002 priority=2
+  CPU 0: Thread Heir: 0x0a010002 priority=2
+  CPU 0: Thread Executing: 0x0a010002 priority=2
 Obtain semaphore (0x1a010001) with timeout 0
-  Thread Heir: 0x0a010003 priority=3
-  Thread Executing: 0x0a010003 priority=3
+  CPU 0: Thread Heir: 0x0a010003 priority=3
+  CPU 0: Thread Executing: 0x0a010003 priority=3
 Releasing semaphore (0x1a010001)
-  Thread Heir: 0x0a010001 priority=1
-  Thread Executing: 0x0a010001 priority=1
+  CPU 0: Thread Heir: 0x0a010001 priority=1
+  CPU 0: Thread Executing: 0x0a010001 priority=1
 Deleting semaphore (0x1a010001)
 *** END OF TEST 06 ***