From 968d2b26c7ca5bb61d82254c3d1340b72e35e6b5 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 26 May 2014 13:15:13 -0500 Subject: Unify printing of heir and executing --- schedsim/shell/schedsim_priority/Makefile.am | 1 - .../shell/schedsim_priority/printheir_executing.c | 29 ----------- .../schedsim_priority/scenarios/script01.expected | 20 ++++---- .../schedsim_priority/scenarios/script02.expected | 16 +++---- .../schedsim_priority/scenarios/script03.expected | 8 ++-- .../schedsim_priority/scenarios/script04.expected | 20 ++++---- .../schedsim_priority/scenarios/script05.expected | 44 ++++++++--------- .../schedsim_priority/scenarios/script06.expected | 20 ++++---- schedsim/shell/schedsim_smppriority/Makefile.am | 1 - .../schedsim_smppriority_affinity/Makefile.am | 1 - .../scenarios/cpus1_exercise_affinity_api.expected | 8 ++-- .../scenarios/cpus2_affinity_case1.expected | 16 +++---- .../scenarios/cpus2_affinity_case2.expected | 16 +++---- .../cpus2_affinity_migrate_case1.expected | 20 ++++---- .../cpus2_affinity_migrate_case2.expected | 12 ++--- .../scenarios/cpus4_affinity_api_case1.expected | 32 ++++++------- .../scenarios/cpus4_affinity_api_case2.expected | 40 ++++++++-------- .../scenarios/cpus4_affinity_block_case1.expected | 36 +++++++------- .../cpus4_affinity_migrate_case1.expected | 36 +++++++------- .../cpus4_affinity_migrate_case2.expected | 36 +++++++------- .../cpus4_affinity_migrate_case3.expected | 48 +++++++++---------- .../cpus4_affinity_overlap_case1.expected | 56 +++++++++++----------- .../cpus4_affinity_priority_case1.expected | 40 ++++++++-------- .../cpus4_affinity_priority_case2.expected | 32 ++++++------- .../cpus4_affinity_priority_case3.expected | 40 ++++++++-------- schedsim/shell/schedsim_smpsimple/Makefile.am | 1 - .../shell/schedsim_smpsimple/printheir_executing.c | 33 ------------- .../scenarios/cpus1_priority.expected | 16 +++---- .../scenarios/cpus1_resume_on_primary.expected | 16 +++---- .../scenarios/cpus1_suspend_on_primary.expected | 12 ++--- .../scenarios/cpus4_pick_older.expected | 48 +++++++++---------- .../scenarios/cpus4_priority.expected | 40 ++++++++-------- .../scenarios/cpus4_simple_preemption.expected | 36 +++++++------- .../scenarios/cpus4_suspend_on_all.expected | 48 +++++++++---------- .../scenarios/cpus4_suspend_on_primary.expected | 36 +++++++------- .../scenarios/cpus4_suspend_on_secondary.expected | 36 +++++++------- schedsim/shell/shared/Makefile.am | 1 + schedsim/shell/shared/printheir_executing.c | 41 ++++++++++++++++ 38 files changed, 484 insertions(+), 508 deletions(-) delete mode 100644 schedsim/shell/schedsim_priority/printheir_executing.c delete mode 100644 schedsim/shell/schedsim_smpsimple/printheir_executing.c create mode 100644 schedsim/shell/shared/printheir_executing.c diff --git a/schedsim/shell/schedsim_priority/Makefile.am b/schedsim/shell/schedsim_priority/Makefile.am index ba584bf..7f35bfd 100644 --- a/schedsim/shell/schedsim_priority/Makefile.am +++ b/schedsim/shell/schedsim_priority/Makefile.am @@ -1,7 +1,6 @@ bin_PROGRAMS = schedsim_priority schedsim_priority_SOURCES = config.c schedsim_priority_SOURCES += wrap_thread_dispatch.c -schedsim_priority_SOURCES += printheir_executing.c schedsim_priority_SOURCES += $(srcdir)/../shared/add_commands_stub.c cpukitdir=@rtems_srcdir@/cpukit diff --git a/schedsim/shell/schedsim_priority/printheir_executing.c b/schedsim/shell/schedsim_priority/printheir_executing.c deleted file mode 100644 index 62b64af..0000000 --- a/schedsim/shell/schedsim_priority/printheir_executing.c +++ /dev/null @@ -1,29 +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 -#include - -void PRINT_EXECUTING() { - printf( - " Thread Executing: 0x%08x priority=%ld\n", - _Thread_Executing->Object.id, - (long) _Thread_Executing->current_priority - ); -} - -void PRINT_HEIR() { - printf( - " Thread Heir: 0x%08x priority=%ld\n", - _Thread_Heir->Object.id, - (long) _Thread_Heir->current_priority - ); -} 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 *** diff --git a/schedsim/shell/schedsim_smppriority/Makefile.am b/schedsim/shell/schedsim_smppriority/Makefile.am index d4197a4..5411537 100644 --- a/schedsim/shell/schedsim_smppriority/Makefile.am +++ b/schedsim/shell/schedsim_smppriority/Makefile.am @@ -3,7 +3,6 @@ bin_PROGRAMS = schedsim_smppriority SOURCES = config.c SOURCES += $(srcdir)/../schedsim_smpsimple/add_commands.c SOURCES += $(srcdir)/../schedsim_smpsimple/main_dump_ready_tasks.c -SOURCES += $(srcdir)/../schedsim_smpsimple/printheir_executing.c SOURCES += $(srcdir)/../schedsim_smpsimple/wrap_thread_dispatch.c schedsim_smppriority_SOURCES = $(SOURCES) diff --git a/schedsim/shell/schedsim_smppriority_affinity/Makefile.am b/schedsim/shell/schedsim_smppriority_affinity/Makefile.am index 2a9a2b3..641f7ef 100644 --- a/schedsim/shell/schedsim_smppriority_affinity/Makefile.am +++ b/schedsim/shell/schedsim_smppriority_affinity/Makefile.am @@ -3,7 +3,6 @@ bin_PROGRAMS = schedsim_smppriority_affinity SOURCES = config.c SOURCES += $(srcdir)/../schedsim_smpsimple/add_commands.c SOURCES += $(srcdir)/../schedsim_smpsimple/main_dump_ready_tasks.c -SOURCES += $(srcdir)/../schedsim_smpsimple/printheir_executing.c SOURCES += $(srcdir)/../schedsim_smpsimple/wrap_thread_dispatch.c schedsim_smppriority_affinity_SOURCES = $(SOURCES) diff --git a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus1_exercise_affinity_api.expected b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus1_exercise_affinity_api.expected index 4b5ccb4..32f5010 100644 --- a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus1_exercise_affinity_api.expected +++ b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus1_exercise_affinity_api.expected @@ -4,8 +4,8 @@ verbose : 1 ==> 2: # Verify that affinity on 1 core ==> 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: ==> 6: # GOAL: 0x0a010001 with affinity ==> 7: echo "=== Create and start 0x0a010001 ===" @@ -15,8 +15,8 @@ Creating task with: Preemption: yes Timeslicing: no Task (TA01) created: id=0x0a010001, priority=3 Task (0x0a010001) Set affinity=0x00000001 Task (TA01) starting: id=0x0a010001, priority=3 - CPU 0: Thread Heir 0x0a010001 priority=3 - CPU 0: Thread Executing 0x0a010001 priority=3 + CPU 0: Thread Heir: 0x0a010001 priority=3 + CPU 0: Thread Executing: 0x0a010001 priority=3 ==> 9: ==> 10: # GOAL: 0x0a010001 is now heir and executing on CPU 0 ==> 11: cpus TA01 diff --git a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus2_affinity_case1.expected b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus2_affinity_case1.expected index 125c7b4..e91baf8 100644 --- a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus2_affinity_case1.expected +++ b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus2_affinity_case1.expected @@ -5,24 +5,24 @@ verbose : 1 ==> 3: # is on CPU 0 and the second is on CPU 1. ==> 4: # ==> 5: rtems_init 2 - 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 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 ==> 6: task_create smp1 3 -a 1 Creating task with: Preemption: yes Timeslicing: no Task (smp1) created: id=0x0a010001, priority=3 Task (0x0a010001) Set affinity=0x00000001 Task (smp1) starting: id=0x0a010001, priority=3 - CPU 0: Thread Heir 0x0a010001 priority=3 - CPU 0: Thread Executing 0x0a010001 priority=3 + CPU 0: Thread Heir: 0x0a010001 priority=3 + CPU 0: Thread Executing: 0x0a010001 priority=3 ==> 7: task_create smp2 2 -a 2 Creating task with: Preemption: yes Timeslicing: no Task (smp2) created: id=0x0a010002, priority=2 Task (0x0a010002) Set affinity=0x00000002 Task (smp2) starting: id=0x0a010002, priority=2 - CPU 1: Thread Heir 0x0a010002 priority=2 - CPU 1: Thread Executing 0x0a010002 priority=2 + CPU 1: Thread Heir: 0x0a010002 priority=2 + CPU 1: Thread Executing: 0x0a010002 priority=2 ==> 8: ==> 9: # GOAL: want 0x0a010001 - 0x0a010002 as heir and executings ==> 10: # GOAL: on CPUs 0 -1 respectively diff --git a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus2_affinity_case2.expected b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus2_affinity_case2.expected index 951f836..993cc0d 100644 --- a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus2_affinity_case2.expected +++ b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus2_affinity_case2.expected @@ -5,24 +5,24 @@ verbose : 1 ==> 3: # is on CPU 1 and the second is on CPU 0. ==> 4: # ==> 5: rtems_init 2 - 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 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 ==> 6: task_create smp1 3 -a 2 Creating task with: Preemption: yes Timeslicing: no Task (smp1) created: id=0x0a010001, priority=3 Task (0x0a010001) Set affinity=0x00000002 Task (smp1) starting: id=0x0a010001, priority=3 - CPU 1: Thread Heir 0x0a010001 priority=3 - CPU 1: Thread Executing 0x0a010001 priority=3 + CPU 1: Thread Heir: 0x0a010001 priority=3 + CPU 1: Thread Executing: 0x0a010001 priority=3 ==> 7: task_create smp2 2 -a 1 Creating task with: Preemption: yes Timeslicing: no Task (smp2) created: id=0x0a010002, priority=2 Task (0x0a010002) Set affinity=0x00000001 Task (smp2) starting: id=0x0a010002, priority=2 - CPU 0: Thread Heir 0x0a010002 priority=2 - CPU 0: Thread Executing 0x0a010002 priority=2 + CPU 0: Thread Heir: 0x0a010002 priority=2 + CPU 0: Thread Executing: 0x0a010002 priority=2 ==> 8: ==> 9: # GOAL: want 0x0a010002 - 0x0a010001 as heir and executings ==> 10: # GOAL: on CPUs 0 -1 respectively diff --git a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus2_affinity_migrate_case1.expected b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus2_affinity_migrate_case1.expected index f7387d5..77f50b8 100644 --- a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus2_affinity_migrate_case1.expected +++ b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus2_affinity_migrate_case1.expected @@ -5,16 +5,16 @@ verbose : 1 ==> 3: # task to migrate CPUs at start. ==> 4: # ==> 5: rtems_init 2 - 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 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 ==> 6: 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 1: Thread Heir 0x0a010001 priority=3 - CPU 1: Thread Executing 0x0a010001 priority=3 + CPU 1: Thread Heir: 0x0a010001 priority=3 + CPU 1: Thread Executing: 0x0a010001 priority=3 ==> 7: # GOAL: 0x09010001, 0x0a010001 ==> 8: # GOAL: on CPUs 0-1 respectively ==> 9: cpus IDLE smp1 @@ -29,10 +29,10 @@ Creating task with: Preemption: yes Timeslicing: no Task (smp2) created: id=0x0a010002, priority=2 Task (0x0a010002) Set affinity=0x00000002 Task (smp2) starting: id=0x0a010002, priority=2 - CPU 0: Thread Heir 0x0a010001 priority=3 - CPU 0: Thread Executing 0x0a010001 priority=3 - CPU 1: Thread Heir 0x0a010002 priority=2 - CPU 1: Thread Executing 0x0a010002 priority=2 + CPU 0: Thread Heir: 0x0a010001 priority=3 + CPU 0: Thread Executing: 0x0a010001 priority=3 + CPU 1: Thread Heir: 0x0a010002 priority=2 + CPU 1: Thread Executing: 0x0a010002 priority=2 ==> 12: # GOAL: want 0x09010001, 0x0a010002 as heir and executings ==> 13: # GOAL: on CPUs 0 -1 respectively ==> 14: cpus smp1 smp2 diff --git a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus2_affinity_migrate_case2.expected b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus2_affinity_migrate_case2.expected index d1cb8f5..7aa4200 100644 --- a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus2_affinity_migrate_case2.expected +++ b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus2_affinity_migrate_case2.expected @@ -6,16 +6,16 @@ verbose : 1 ==> 4: # task was assigned to. ==> 5: # ==> 6: rtems_init 2 - 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 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 ==> 7: 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 1: Thread Heir 0x0a010001 priority=3 - CPU 1: Thread Executing 0x0a010001 priority=3 + CPU 1: Thread Heir: 0x0a010001 priority=3 + CPU 1: Thread Executing: 0x0a010001 priority=3 ==> 8: # GOAL: 0x09010001, 0x0a010001 ==> 9: # GOAL: on CPUs 0-1 respectively ==> 10: cpus IDLE smp1 diff --git a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_api_case1.expected b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_api_case1.expected index f5f86d6..ff0b6ae 100644 --- a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_api_case1.expected +++ b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_api_case1.expected @@ -7,38 +7,38 @@ verbose : 1 ==> 5: # which ever executes. ==> 6: # ==> 7: 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 ==> 8: 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 ==> 9: 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 ==> 10: 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 ==> 11: 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 ==> 12: task_create smp5 10 Creating task with: Preemption: yes Timeslicing: no Task (smp5) created: id=0x0a010005, priority=10 diff --git a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_api_case2.expected b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_api_case2.expected index 4609369..54aa750 100644 --- a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_api_case2.expected +++ b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_api_case2.expected @@ -7,38 +7,38 @@ verbose : 1 ==> 5: # which ever executes. ==> 6: # ==> 7: 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 ==> 8: 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 ==> 9: 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 ==> 10: 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 ==> 11: 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 ==> 12: task_create smp5 6 Creating task with: Preemption: yes Timeslicing: no Task (smp5) created: id=0x0a010005, priority=6 @@ -64,10 +64,10 @@ Task (smp5) starting: id=0x0a010005, priority=6 ==> 24: task_get_affinity smp1 Task (0x0a010001) Get affinity=0x0000000f ==> 25: task_set_affinity smp1 0x02 - CPU 1: Thread Heir 0x0a010001 priority=5 - CPU 1: Thread Executing 0x0a010001 priority=5 - CPU 3: Thread Heir 0x0a010005 priority=6 - CPU 3: Thread Executing 0x0a010005 priority=6 + CPU 1: Thread Heir: 0x0a010001 priority=5 + CPU 1: Thread Executing: 0x0a010001 priority=5 + CPU 3: Thread Heir: 0x0a010005 priority=6 + CPU 3: Thread Executing: 0x0a010005 priority=6 Task (0x0a010001) Set affinity=0x00000002 ==> 26: task_get_affinity smp1 Task (0x0a010001) Get affinity=0x00000002 diff --git a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_block_case1.expected b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_block_case1.expected index 80f56b8..b5cd598 100644 --- a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_block_case1.expected +++ b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_block_case1.expected @@ -10,35 +10,35 @@ verbose : 1 ==> 8: # - More threads than core at high priority, affinity for all but core 0 ==> 9: # ==> 10: 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 ==> 11: task_create smp1 -a 0xe 10 Creating task with: Preemption: yes Timeslicing: no Task (smp1) created: id=0x0a010001, priority=10 Task (0x0a010001) Set affinity=0x0000000e Task (smp1) starting: id=0x0a010001, priority=10 - CPU 3: Thread Heir 0x0a010001 priority=10 - CPU 3: Thread Executing 0x0a010001 priority=10 + CPU 3: Thread Heir: 0x0a010001 priority=10 + CPU 3: Thread Executing: 0x0a010001 priority=10 ==> 12: task_create smp2 -a 0xe 10 Creating task with: Preemption: yes Timeslicing: no Task (smp2) created: id=0x0a010002, priority=10 Task (0x0a010002) Set affinity=0x0000000e Task (smp2) starting: id=0x0a010002, priority=10 - CPU 2: Thread Heir 0x0a010002 priority=10 - CPU 2: Thread Executing 0x0a010002 priority=10 + CPU 2: Thread Heir: 0x0a010002 priority=10 + CPU 2: Thread Executing: 0x0a010002 priority=10 ==> 13: task_create smp3 -a 0xe 10 Creating task with: Preemption: yes Timeslicing: no Task (smp3) created: id=0x0a010003, priority=10 Task (0x0a010003) Set affinity=0x0000000e Task (smp3) starting: id=0x0a010003, priority=10 - CPU 1: Thread Heir 0x0a010003 priority=10 - CPU 1: Thread Executing 0x0a010003 priority=10 + CPU 1: Thread Heir: 0x0a010003 priority=10 + CPU 1: Thread Executing: 0x0a010003 priority=10 ==> 14: task_create smp4 -a 0xe 10 Creating task with: Preemption: yes Timeslicing: no Task (smp4) created: id=0x0a010004, priority=10 @@ -63,8 +63,8 @@ Creating task with: Preemption: yes Timeslicing: no Task (aff1) created: id=0x0a010005, priority=11 Task (0x0a010005) Set affinity=0x00000001 Task (aff1) starting: id=0x0a010005, priority=11 - CPU 0: Thread Heir 0x0a010005 priority=11 - CPU 0: Thread Executing 0x0a010005 priority=11 + CPU 0: Thread Heir: 0x0a010005 priority=11 + CPU 0: Thread Executing: 0x0a010005 priority=11 ==> 23: cpus aff1 smp3 smp2 smp1 === CPU Status EXECUTING / HEIR / SWITCH NEEDED @@ -90,8 +90,8 @@ Task (aff2) starting: id=0x0a010006, priority=11 === End of Ready Set of Threads ==> 28: task_suspend aff1 Suspending task (0x0a010005) - CPU 0: Thread Heir 0x0a010006 priority=11 - CPU 0: Thread Executing 0x0a010006 priority=11 + CPU 0: Thread Heir: 0x0a010006 priority=11 + CPU 0: Thread Executing: 0x0a010006 priority=11 ==> 29: cpus aff2 smp3 smp2 smp1 === CPU Status EXECUTING / HEIR / SWITCH NEEDED diff --git a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_migrate_case1.expected b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_migrate_case1.expected index a82d073..51876b8 100644 --- a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_migrate_case1.expected +++ b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_migrate_case1.expected @@ -6,38 +6,38 @@ verbose : 1 ==> 4: # task that is on the ready queue. ==> 5: # ==> 6: 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 ==> 7: task_create smp1 4 Creating task with: Preemption: yes Timeslicing: no Task (smp1) created: id=0x0a010001, priority=4 Task (smp1) starting: id=0x0a010001, priority=4 - CPU 3: Thread Heir 0x0a010001 priority=4 - CPU 3: Thread Executing 0x0a010001 priority=4 + CPU 3: Thread Heir: 0x0a010001 priority=4 + CPU 3: Thread Executing: 0x0a010001 priority=4 ==> 8: task_create smp2 4 Creating task with: Preemption: yes Timeslicing: no Task (smp2) created: id=0x0a010002, priority=4 Task (smp2) starting: id=0x0a010002, priority=4 - CPU 2: Thread Heir 0x0a010002 priority=4 - CPU 2: Thread Executing 0x0a010002 priority=4 + CPU 2: Thread Heir: 0x0a010002 priority=4 + CPU 2: Thread Executing: 0x0a010002 priority=4 ==> 9: task_create smp3 4 Creating task with: Preemption: yes Timeslicing: no Task (smp3) created: id=0x0a010003, priority=4 Task (smp3) starting: id=0x0a010003, priority=4 - CPU 1: Thread Heir 0x0a010003 priority=4 - CPU 1: Thread Executing 0x0a010003 priority=4 + CPU 1: Thread Heir: 0x0a010003 priority=4 + CPU 1: Thread Executing: 0x0a010003 priority=4 ==> 10: task_create smp4 4 Creating task with: Preemption: yes Timeslicing: no Task (smp4) created: id=0x0a010004, priority=4 Task (smp4) starting: id=0x0a010004, priority=4 - CPU 0: Thread Heir 0x0a010004 priority=4 - CPU 0: Thread Executing 0x0a010004 priority=4 + CPU 0: Thread Heir: 0x0a010004 priority=4 + CPU 0: Thread Executing: 0x0a010004 priority=4 ==> 11: task_create smp5 4 Creating task with: Preemption: yes Timeslicing: no Task (smp5) created: id=0x0a010005, priority=4 @@ -57,8 +57,8 @@ Task (smp5) starting: id=0x0a010005, priority=4 ==> 17: task_set_affinity smp5 0x03 Task (0x0a010005) Set affinity=0x00000003 ==> 18: task_priority smp5 3 - CPU 0: Thread Heir 0x0a010005 priority=3 - CPU 0: Thread Executing 0x0a010005 priority=3 + CPU 0: Thread Heir: 0x0a010005 priority=3 + CPU 0: Thread Executing: 0x0a010005 priority=3 Task (0x0a010005) Change Priority from 4 to 3 ==> 19: ==> 20: # GOAL: want 0x0a010005, 0x0a010003, 0x0a010002,0x0a010001 diff --git a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_migrate_case2.expected b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_migrate_case2.expected index 467fa6e..d145e79 100644 --- a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_migrate_case2.expected +++ b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_migrate_case2.expected @@ -8,42 +8,42 @@ verbose : 1 ==> 6: # to move to the ready chain and quit running. ==> 7: # ==> 8: 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 ==> 9: task_create smp1 4 -a 0x2 Creating task with: Preemption: yes Timeslicing: no Task (smp1) created: id=0x0a010001, priority=4 Task (0x0a010001) Set affinity=0x00000002 Task (smp1) starting: id=0x0a010001, priority=4 - CPU 1: Thread Heir 0x0a010001 priority=4 - CPU 1: Thread Executing 0x0a010001 priority=4 + CPU 1: Thread Heir: 0x0a010001 priority=4 + CPU 1: Thread Executing: 0x0a010001 priority=4 ==> 10: task_create smp2 4 -a 0x1 Creating task with: Preemption: yes Timeslicing: no Task (smp2) created: id=0x0a010002, priority=4 Task (0x0a010002) Set affinity=0x00000001 Task (smp2) starting: id=0x0a010002, priority=4 - CPU 0: Thread Heir 0x0a010002 priority=4 - CPU 0: Thread Executing 0x0a010002 priority=4 + CPU 0: Thread Heir: 0x0a010002 priority=4 + CPU 0: Thread Executing: 0x0a010002 priority=4 ==> 11: task_create smp3 4 -a 0x8 Creating task with: Preemption: yes Timeslicing: no Task (smp3) created: id=0x0a010003, priority=4 Task (0x0a010003) Set affinity=0x00000008 Task (smp3) starting: id=0x0a010003, priority=4 - CPU 3: Thread Heir 0x0a010003 priority=4 - CPU 3: Thread Executing 0x0a010003 priority=4 + CPU 3: Thread Heir: 0x0a010003 priority=4 + CPU 3: Thread Executing: 0x0a010003 priority=4 ==> 12: task_create smp4 4 -a 0x4 Creating task with: Preemption: yes Timeslicing: no Task (smp4) created: id=0x0a010004, priority=4 Task (0x0a010004) Set affinity=0x00000004 Task (smp4) starting: id=0x0a010004, priority=4 - CPU 2: Thread Heir 0x0a010004 priority=4 - CPU 2: Thread Executing 0x0a010004 priority=4 + CPU 2: Thread Heir: 0x0a010004 priority=4 + CPU 2: Thread Executing: 0x0a010004 priority=4 ==> 13: task_create smp5 4 Creating task with: Preemption: yes Timeslicing: no Task (smp5) created: id=0x0a010005, priority=4 @@ -62,8 +62,8 @@ Task (smp5) starting: id=0x0a010005, priority=4 ==> 18: ==> 19: ==> 20: task_set_affinity smp1 0x0e - CPU 1: Thread Heir 0x0a010005 priority=4 - CPU 1: Thread Executing 0x0a010005 priority=4 + CPU 1: Thread Heir: 0x0a010005 priority=4 + CPU 1: Thread Executing: 0x0a010005 priority=4 Task (0x0a010001) Set affinity=0x0000000e ==> 21: # GOAL: want 0x0a010002, 0x0a010005, 0x0a010004, 0x0a010003 ==> 22: # GOAL: as heir and executings on CPUs 0-3 respectively diff --git a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_migrate_case3.expected b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_migrate_case3.expected index f3941a1..cfc508d 100644 --- a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_migrate_case3.expected +++ b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_migrate_case3.expected @@ -5,38 +5,38 @@ verbose : 1 ==> 3: # thread affinity. ==> 4: # ==> 5: 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 ==> 6: 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 ==> 7: 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 ==> 8: 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 ==> 9: 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 ==> 10: task_create smp5 9 Creating task with: Preemption: yes Timeslicing: no Task (smp5) created: id=0x0a010005, priority=9 @@ -111,14 +111,14 @@ Task (0x0a010001) Set affinity=0x0000000c === End of Ready Set of Threads ==> 40: ==> 41: task_priority smp5 4 - CPU 0: Thread Heir 0x0a010003 priority=5 - CPU 0: Thread Executing 0x0a010003 priority=5 - CPU 1: Thread Heir 0x0a010005 priority=4 - CPU 1: Thread Executing 0x0a010005 priority=4 - CPU 2: Thread Heir 0x0a010001 priority=7 - CPU 2: Thread Executing 0x0a010001 priority=7 - CPU 3: Thread Heir 0x0a010004 priority=6 - CPU 3: Thread Executing 0x0a010004 priority=6 + CPU 0: Thread Heir: 0x0a010003 priority=5 + CPU 0: Thread Executing: 0x0a010003 priority=5 + CPU 1: Thread Heir: 0x0a010005 priority=4 + CPU 1: Thread Executing: 0x0a010005 priority=4 + CPU 2: Thread Heir: 0x0a010001 priority=7 + CPU 2: Thread Executing: 0x0a010001 priority=7 + CPU 3: Thread Heir: 0x0a010004 priority=6 + CPU 3: Thread Executing: 0x0a010004 priority=6 Task (0x0a010005) Change Priority from 9 to 4 ==> 42: ==> 43: # GOAL: want 0x0a010005, 0x0a010003, 0x0a010004, 0x0a010001 diff --git a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_overlap_case1.expected b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_overlap_case1.expected index c6f76e4..97e723f 100644 --- a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_overlap_case1.expected +++ b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_overlap_case1.expected @@ -6,42 +6,42 @@ verbose : 1 ==> 4: # swap the affinity of the two sets ==> 5: # ==> 6: 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 ==> 7: task_create smp1 4 -a 0x0e Creating task with: Preemption: yes Timeslicing: no Task (smp1) created: id=0x0a010001, priority=4 Task (0x0a010001) Set affinity=0x0000000e Task (smp1) starting: id=0x0a010001, priority=4 - CPU 3: Thread Heir 0x0a010001 priority=4 - CPU 3: Thread Executing 0x0a010001 priority=4 + CPU 3: Thread Heir: 0x0a010001 priority=4 + CPU 3: Thread Executing: 0x0a010001 priority=4 ==> 8: task_create smp2 4 -a 0x0e Creating task with: Preemption: yes Timeslicing: no Task (smp2) created: id=0x0a010002, priority=4 Task (0x0a010002) Set affinity=0x0000000e Task (smp2) starting: id=0x0a010002, priority=4 - CPU 2: Thread Heir 0x0a010002 priority=4 - CPU 2: Thread Executing 0x0a010002 priority=4 + CPU 2: Thread Heir: 0x0a010002 priority=4 + CPU 2: Thread Executing: 0x0a010002 priority=4 ==> 9: task_create smp3 4 -a 0x03 Creating task with: Preemption: yes Timeslicing: no Task (smp3) created: id=0x0a010003, priority=4 Task (0x0a010003) Set affinity=0x00000003 Task (smp3) starting: id=0x0a010003, priority=4 - CPU 1: Thread Heir 0x0a010003 priority=4 - CPU 1: Thread Executing 0x0a010003 priority=4 + CPU 1: Thread Heir: 0x0a010003 priority=4 + CPU 1: Thread Executing: 0x0a010003 priority=4 ==> 10: task_create smp4 4 -a 0x03 Creating task with: Preemption: yes Timeslicing: no Task (smp4) created: id=0x0a010004, priority=4 Task (0x0a010004) Set affinity=0x00000003 Task (smp4) starting: id=0x0a010004, priority=4 - CPU 0: Thread Heir 0x0a010004 priority=4 - CPU 0: Thread Executing 0x0a010004 priority=4 + CPU 0: Thread Heir: 0x0a010004 priority=4 + CPU 0: Thread Executing: 0x0a010004 priority=4 ==> 11: ==> 12: # EXECUTING: {smp1 smp2 smp3 smp4} ==> 13: # READY: {IDLE IDLE IDLE IDLE} @@ -57,8 +57,8 @@ Task (smp4) starting: id=0x0a010004, priority=4 === End of Ready Set of Threads ==> 17: ==> 18: task_set_affinity smp1 0x03 - 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 Task (0x0a010001) Set affinity=0x00000003 ==> 19: # EXECUTING: {smp2 smp3 smp4 IDLE} ==> 20: # READY: {smp1 IDLE IDLE IDLE} @@ -74,8 +74,8 @@ Task (0x0a010001) Set affinity=0x00000003 === End of Ready Set of Threads ==> 24: ==> 25: task_set_affinity smp2 0x03 - 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 Task (0x0a010002) Set affinity=0x00000003 ==> 26: # EXECUTING: {smp3 smp4 IDLE IDLE} ==> 27: # READY: {smp1 smp2 IDLE IDLE} @@ -91,10 +91,10 @@ Task (0x0a010002) Set affinity=0x00000003 === End of Ready Set of Threads ==> 31: ==> 32: task_set_affinity smp3 0x0e - CPU 1: Thread Heir 0x0a010002 priority=4 - CPU 1: Thread Executing 0x0a010002 priority=4 - CPU 2: Thread Heir 0x0a010003 priority=4 - CPU 2: Thread Executing 0x0a010003 priority=4 + CPU 1: Thread Heir: 0x0a010002 priority=4 + CPU 1: Thread Executing: 0x0a010002 priority=4 + CPU 2: Thread Heir: 0x0a010003 priority=4 + CPU 2: Thread Executing: 0x0a010003 priority=4 Task (0x0a010003) Set affinity=0x0000000e ==> 33: # EXECUTING: {smp4 smp2 smp3 IDLE} ==> 34: # READY: {smp1 smp2 IDLE IDLE} @@ -110,10 +110,10 @@ Task (0x0a010003) Set affinity=0x0000000e === End of Ready Set of Threads ==> 38: ==> 39: task_set_affinity smp4 0x0e - CPU 0: Thread Heir 0x0a010001 priority=4 - CPU 0: Thread Executing 0x0a010001 priority=4 - CPU 3: Thread Heir 0x0a010004 priority=4 - CPU 3: Thread Executing 0x0a010004 priority=4 + CPU 0: Thread Heir: 0x0a010001 priority=4 + CPU 0: Thread Executing: 0x0a010001 priority=4 + CPU 3: Thread Heir: 0x0a010004 priority=4 + CPU 3: Thread Executing: 0x0a010004 priority=4 Task (0x0a010004) Set affinity=0x0000000e ==> 40: # EXECUTING: {smp4 smp2 smp3 smp1} ==> 41: # READY: {IDLE IDLE IDLE IDLE} diff --git a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_priority_case1.expected b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_priority_case1.expected index 0cd6706..562d291 100644 --- a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_priority_case1.expected +++ b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_priority_case1.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: task_create smp5 9 Creating task with: Preemption: yes Timeslicing: no Task (smp5) created: id=0x0a010005, priority=9 @@ -68,10 +68,10 @@ Task (0x0a010005) Set affinity=0x00000001 === End of Ready Set of Threads ==> 21: ==> 22: task_priority smp5 5 - CPU 0: Thread Heir 0x0a010005 priority=5 - CPU 0: Thread Executing 0x0a010005 priority=5 - CPU 2: Thread Heir 0x0a010004 priority=6 - CPU 2: Thread Executing 0x0a010004 priority=6 + CPU 0: Thread Heir: 0x0a010005 priority=5 + CPU 0: Thread Executing: 0x0a010005 priority=5 + CPU 2: Thread Heir: 0x0a010004 priority=6 + CPU 2: Thread Executing: 0x0a010004 priority=6 Task (0x0a010005) Change Priority from 9 to 5 ==> 23: # GOAL: want 0x0a010005, 0x0a010003, 0x0a010004, 0x0a010001 ==> 24: # GOAL: to be heir AND executing on CPU 0-3 respectively diff --git a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_priority_case2.expected b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_priority_case2.expected index add30ab..e069da4 100644 --- a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_priority_case2.expected +++ b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_priority_case2.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: task_create smp5 9 Creating task with: Preemption: yes Timeslicing: no Task (smp5) created: id=0x0a010005, priority=9 diff --git a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_priority_case3.expected b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_priority_case3.expected index a9e24c6..9cbb4dd 100644 --- a/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_priority_case3.expected +++ b/schedsim/shell/schedsim_smppriority_affinity/scenarios/cpus4_affinity_priority_case3.expected @@ -6,44 +6,44 @@ verbose : 1 ==> 4: # ready set of threads. ==> 5: # ==> 6: 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 ==> 7: task_create smp1 10 Creating task with: Preemption: yes Timeslicing: no Task (smp1) created: id=0x0a010001, priority=10 Task (smp1) starting: id=0x0a010001, priority=10 - CPU 3: Thread Heir 0x0a010001 priority=10 - CPU 3: Thread Executing 0x0a010001 priority=10 + CPU 3: Thread Heir: 0x0a010001 priority=10 + CPU 3: Thread Executing: 0x0a010001 priority=10 ==> 8: task_create smp2 10 Creating task with: Preemption: yes Timeslicing: no Task (smp2) created: id=0x0a010002, priority=10 Task (smp2) starting: id=0x0a010002, priority=10 - CPU 2: Thread Heir 0x0a010002 priority=10 - CPU 2: Thread Executing 0x0a010002 priority=10 + CPU 2: Thread Heir: 0x0a010002 priority=10 + CPU 2: Thread Executing: 0x0a010002 priority=10 ==> 9: task_create smp3 10 Creating task with: Preemption: yes Timeslicing: no Task (smp3) created: id=0x0a010003, priority=10 Task (smp3) starting: id=0x0a010003, priority=10 - CPU 1: Thread Heir 0x0a010003 priority=10 - CPU 1: Thread Executing 0x0a010003 priority=10 + CPU 1: Thread Heir: 0x0a010003 priority=10 + CPU 1: Thread Executing: 0x0a010003 priority=10 ==> 10: task_create smp4 12 Creating task with: Preemption: yes Timeslicing: no Task (smp4) created: id=0x0a010004, priority=12 Task (smp4) starting: id=0x0a010004, priority=12 - CPU 0: Thread Heir 0x0a010004 priority=12 - CPU 0: Thread Executing 0x0a010004 priority=12 + CPU 0: Thread Heir: 0x0a010004 priority=12 + CPU 0: Thread Executing: 0x0a010004 priority=12 ==> 11: task_create smp5 10 Creating task with: Preemption: yes Timeslicing: no Task (smp5) created: id=0x0a010005, priority=10 Task (smp5) starting: id=0x0a010005, priority=10 - CPU 0: Thread Heir 0x0a010005 priority=10 - CPU 0: Thread Executing 0x0a010005 priority=10 + CPU 0: Thread Heir: 0x0a010005 priority=10 + CPU 0: Thread Executing: 0x0a010005 priority=10 ==> 12: # GOAL: Cores 0-3 should be 0x0a01000[5321] respectively ==> 13: cpus smp5 smp3 smp2 smp1 === CPU Status @@ -72,8 +72,8 @@ Task (pri1) starting: id=0x0a010006, priority=11 ==> 19: # GOAL: pri1 should preempt smp3 on core 1 ==> 20: # GOAL: Cores 0-3 should be 0x0a01000[5621] respectively ==> 21: task_priority pri1 9 - CPU 1: Thread Heir 0x0a010006 priority=9 - CPU 1: Thread Executing 0x0a010006 priority=9 + CPU 1: Thread Heir: 0x0a010006 priority=9 + CPU 1: Thread Executing: 0x0a010006 priority=9 Task (0x0a010006) Change Priority from 11 to 9 ==> 22: cpus smp5 pri1 smp2 smp1 === CPU Status 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 -#include - -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 diff --git a/schedsim/shell/shared/Makefile.am b/schedsim/shell/shared/Makefile.am index 6940f41..af5b282 100644 --- a/schedsim/shell/shared/Makefile.am +++ b/schedsim/shell/shared/Makefile.am @@ -48,6 +48,7 @@ libschedsim_a_SOURCES += main_taskpriority.c libschedsim_a_SOURCES += main_taskresume.c libschedsim_a_SOURCES += main_tasksuspend.c libschedsim_a_SOURCES += main_taskwakeafter.c +libschedsim_a_SOURCES += printheir_executing.c libschedsim_a_SOURCES += schedsim_disable_dispatch.c libschedsim_a_SOURCES += shell_cmdset.c libschedsim_a_SOURCES += shell_makeargs.c diff --git a/schedsim/shell/shared/printheir_executing.c b/schedsim/shell/shared/printheir_executing.c new file mode 100644 index 0000000..604b434 --- /dev/null +++ b/schedsim/shell/shared/printheir_executing.c @@ -0,0 +1,41 @@ +/** + * @file + * @brief print heir and executing support + */ + +/* + * 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 +#include + +#if RTEMS_SMP + extern uint32_t Schedsim_Current_cpu; + #define MY_CPU Schedsim_Current_cpu +#else + #define MY_CPU 0 +#endif + +void PRINT_EXECUTING() { + printf( + " CPU %d: Thread Executing: 0x%08x priority=%ld\n", + MY_CPU, + _Thread_Executing->Object.id, + (long) _Thread_Executing->current_priority + ); +} + +void PRINT_HEIR() { + printf( + " CPU %d: Thread Heir: 0x%08x priority=%ld\n", + MY_CPU, + _Thread_Heir->Object.id, + (long) _Thread_Heir->current_priority + ); +} -- cgit v1.2.3