Ignore:
Timestamp:
May 13, 2014, 2:30:12 PM (5 years ago)
Author:
Jennifer Averett <jennifer.averett@…>
Branches:
master
Children:
9f8d56e
Parents:
30aa792
git-author:
Jennifer Averett <jennifer.averett@…> (05/13/14 14:30:12)
git-committer:
Jennifer Averett <jennifer.averett@…> (05/13/14 15:04:53)
Message:

schedsim_smpsimple: Clean up scenarios to match changes.

Dispatch commands were removed since a dispatch of all cpu's was
added to the dispatch wrapper. Scenarios wich only use preemptable
tasks were modified to account for changes in scheduling and
changes in expected output format.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • schedsim/shell/schedsim_smpsimple/scenarios/cpus4_pick_older.expected

    r30aa792 r3ad6235  
    55==> 3: #
    66==> 4: rtems_init 4
    7   Thread Heir: 0x09010001 priority=255
    8   Thread Executing: 0x09010001 priority=255
     7  CPU 0: Thread Heir 0x09010001 priority=255
     8  CPU 0: Thread Executing 0x09010001 priority=255
     9  CPU 1: Thread Heir 0x09010002 priority=255
     10  CPU 1: Thread Executing 0x09010002 priority=255
     11  CPU 2: Thread Heir 0x09010003 priority=255
     12  CPU 2: Thread Executing 0x09010003 priority=255
     13  CPU 3: Thread Heir 0x09010004 priority=255
     14  CPU 3: Thread Executing 0x09010004 priority=255
    915==> 5: task_create smp1 3
    1016Creating task with:  Preemption: yes Timeslicing: no
    1117Task (smp1) created: id=0x0a010001, priority=3
    1218Task (smp1) starting: id=0x0a010001, priority=3
    13   Thread Heir: 0x0a010001 priority=3
    14   Thread Executing: 0x0a010001 priority=3
     19  CPU 3: Thread Heir 0x0a010001 priority=3
     20  CPU 3: Thread Executing 0x0a010001 priority=3
    1521==> 6: task_create smp2 6
    1622Creating task with:  Preemption: yes Timeslicing: no
    1723Task (smp2) created: id=0x0a010002, priority=6
    1824Task (smp2) starting: id=0x0a010002, priority=6
     25  CPU 2: Thread Heir 0x0a010002 priority=6
     26  CPU 2: Thread Executing 0x0a010002 priority=6
    1927==> 7: task_create smp3 7
    2028Creating task with:  Preemption: yes Timeslicing: no
    2129Task (smp3) created: id=0x0a010003, priority=7
    2230Task (smp3) starting: id=0x0a010003, priority=7
     31  CPU 1: Thread Heir 0x0a010003 priority=7
     32  CPU 1: Thread Executing 0x0a010003 priority=7
    2333==> 8: task_create smp4 8
    2434Creating task with:  Preemption: yes Timeslicing: no
    2535Task (smp4) created: id=0x0a010004, priority=8
    2636Task (smp4) starting: id=0x0a010004, priority=8
    27 ==> 9: dispatch
    28 === Invoke Thread Dispatch on CPU 1
    29   Thread Heir: 0x0a010002 priority=6
    30   Thread Executing: 0x09010002 priority=255
    31   Thread Executing: 0x0a010002 priority=6
    32 === Invoke Thread Dispatch on CPU 2
    33   Thread Heir: 0x0a010003 priority=7
    34   Thread Executing: 0x09010003 priority=255
    35   Thread Executing: 0x0a010003 priority=7
    36 === Invoke Thread Dispatch on CPU 3
    37   Thread Heir: 0x0a010004 priority=8
    38   Thread Executing: 0x09010004 priority=255
    39   Thread Executing: 0x0a010004 priority=8
    40 ==> 10: # GOAL: Tasks 0x0a010001 - 0x0a010004 as heir and executing
    41 ==> 11: # GOAL:    on CPUs 1 - 4 respectively
    42 ==> 12: cpus
     37  CPU 0: Thread Heir 0x0a010004 priority=8
     38  CPU 0: Thread Executing 0x0a010004 priority=8
     39==> 9: # GOAL: Tasks 0x0a010001 - 0x0a010004 as heir and executing
     40==> 10: # GOAL:    on CPUs 3 - 0 respectively
     41==> 11: cpus
    4342=== CPU Status
    44             EXECUTING    /     HEIR         /    IDLE        / SWITCH NEEDED
    45   CPU 0: 0x0a010001 @  3 / 0x0a010001 @  3 / 0x09010001 @255         false
    46   CPU 1: 0x0a010002 @  6 / 0x0a010002 @  6 / 0x09010002 @255         false
    47   CPU 2: 0x0a010003 @  7 / 0x0a010003 @  7 / 0x09010003 @255         false
    48   CPU 3: 0x0a010004 @  8 / 0x0a010004 @  8 / 0x09010004 @255         false
     43          EXECUTING      /   HEIR             / SWITCH NEEDED
     44  CPU 0: 0x0a010004 @  8 / 0x0a010004 @  8          false
     45  CPU 1: 0x0a010003 @  7 / 0x0a010003 @  7          false
     46  CPU 2: 0x0a010002 @  6 / 0x0a010002 @  6          false
     47  CPU 3: 0x0a010001 @  3 / 0x0a010001 @  3          false
    4948=== End of Ready Set of Threads
    50 ==> 13:
    51 ==> 14: task_create smp5 5
     49==> 12:
     50==> 13: task_create smp5 5
    5251Creating task with:  Preemption: yes Timeslicing: no
    53   Thread Heir: 0x0a010001 priority=3
    54   Thread Executing: 0x0a010001 priority=3
    5552Task (smp5) created: id=0x0a010005, priority=5
    5653Task (smp5) starting: id=0x0a010005, priority=5
    57 ==> 15: clock_tick 1
     54  CPU 0: Thread Heir 0x0a010005 priority=5
     55  CPU 0: Thread Executing 0x0a010005 priority=5
     56==> 14: clock_tick 1
    5857ClockTick (1) ...
    59 ==> 16: dispatch
    60 === Invoke Thread Dispatch on CPU 3
    61   Thread Heir: 0x0a010005 priority=5
    62   Thread Executing: 0x0a010004 priority=8
    63   Thread Executing: 0x0a010005 priority=5
    64 ==> 17: # GOAL: Tasks 0x0a010001, 0x0a010002, 0x0a010003, and 0x0a010005 are
    65 ==> 18: # GOAL:    heir and executing on CPUs 1 - 4 respectively
    66 ==> 19: cpus
     58==> 15: # GOAL: Tasks 0x0a010001, 0x0a010002, 0x0a010003, and 0x0a010005 are
     59==> 16: # GOAL:    heir and executing on CPUs 3 - 0 respectively
     60==> 17: cpus
    6761=== CPU Status
    68             EXECUTING    /     HEIR         /    IDLE        / SWITCH NEEDED
    69   CPU 0: 0x0a010001 @  3 / 0x0a010001 @  3 / 0x09010001 @255         false
    70   CPU 1: 0x0a010002 @  6 / 0x0a010002 @  6 / 0x09010002 @255         false
    71   CPU 2: 0x0a010003 @  7 / 0x0a010003 @  7 / 0x09010003 @255         false
    72   CPU 3: 0x0a010005 @  5 / 0x0a010005 @  5 / 0x09010004 @255         false
     62          EXECUTING      /   HEIR             / SWITCH NEEDED
     63  CPU 0: 0x0a010005 @  5 / 0x0a010005 @  5          false
     64  CPU 1: 0x0a010003 @  7 / 0x0a010003 @  7          false
     65  CPU 2: 0x0a010002 @  6 / 0x0a010002 @  6          false
     66  CPU 3: 0x0a010001 @  3 / 0x0a010001 @  3          false
    7367=== End of Ready Set of Threads
    74 ==> 20:
    75 ==> 21: task_create smp6 5
     68==> 18:
     69==> 19: task_create smp6 5
    7670Creating task with:  Preemption: yes Timeslicing: no
    77   Thread Heir: 0x0a010001 priority=3
    78   Thread Executing: 0x0a010001 priority=3
    7971Task (smp6) created: id=0x0a010006, priority=5
    8072Task (smp6) starting: id=0x0a010006, priority=5
    81 ==> 22: clock_tick 1
     73  CPU 1: Thread Heir 0x0a010006 priority=5
     74  CPU 1: Thread Executing 0x0a010006 priority=5
     75==> 20: clock_tick 1
    8276ClockTick (1) ...
    83 ==> 23: dispatch
    84 === Invoke Thread Dispatch on CPU 2
    85   Thread Heir: 0x0a010006 priority=5
    86   Thread Executing: 0x0a010003 priority=7
    87   Thread Executing: 0x0a010006 priority=5
    88 ==> 24: # GOAL: Tasks 0x0a010001, 0x0a010002, 0x0a010006, and 0x0a010005 are
    89 ==> 25: # GOAL:    heir and executing on CPUs 1 - 4 respectively
    90 ==> 26: cpus
     77==> 21: # GOAL: Tasks 0x0a010001, 0x0a010002, 0x0a010006, and 0x0a010005 are
     78==> 22: # GOAL:    heir and executing on CPUs 3 - 0 respectively
     79==> 23: cpus
    9180=== CPU Status
    92             EXECUTING    /     HEIR         /    IDLE        / SWITCH NEEDED
    93   CPU 0: 0x0a010001 @  3 / 0x0a010001 @  3 / 0x09010001 @255         false
    94   CPU 1: 0x0a010002 @  6 / 0x0a010002 @  6 / 0x09010002 @255         false
    95   CPU 2: 0x0a010006 @  5 / 0x0a010006 @  5 / 0x09010003 @255         false
    96   CPU 3: 0x0a010005 @  5 / 0x0a010005 @  5 / 0x09010004 @255         false
     81          EXECUTING      /   HEIR             / SWITCH NEEDED
     82  CPU 0: 0x0a010005 @  5 / 0x0a010005 @  5          false
     83  CPU 1: 0x0a010006 @  5 / 0x0a010006 @  5          false
     84  CPU 2: 0x0a010002 @  6 / 0x0a010002 @  6          false
     85  CPU 3: 0x0a010001 @  3 / 0x0a010001 @  3          false
    9786=== End of Ready Set of Threads
    98 ==> 27:
    99 ==> 28: task_create smp7 5
     87==> 24:
     88==> 25: task_create smp7 5
    10089Creating task with:  Preemption: yes Timeslicing: no
    101   Thread Heir: 0x0a010001 priority=3
    102   Thread Executing: 0x0a010001 priority=3
    10390Task (smp7) created: id=0x0a010007, priority=5
    10491Task (smp7) starting: id=0x0a010007, priority=5
    105 ==> 29: clock_tick 1
     92  CPU 2: Thread Heir 0x0a010007 priority=5
     93  CPU 2: Thread Executing 0x0a010007 priority=5
     94==> 26: clock_tick 1
    10695ClockTick (1) ...
    107 ==> 30: dispatch
    108 === Invoke Thread Dispatch on CPU 1
    109   Thread Heir: 0x0a010007 priority=5
    110   Thread Executing: 0x0a010002 priority=6
    111   Thread Executing: 0x0a010007 priority=5
    112 ==> 31: # GOAL: Tasks 0x0a010001, 0x0a010007, 0x0a010006, and 0x0a010005 are
    113 ==> 32: # GOAL:    heir and executing on CPUs 1 - 4 respectively
    114 ==> 33: cpus
     96==> 27: # GOAL: Tasks 0x0a010001, 0x0a010007, 0x0a010006, and 0x0a010005 are
     97==> 28: # GOAL:    heir and executing on CPUs 3 - 0 respectively
     98==> 29: cpus
    11599=== CPU Status
    116             EXECUTING    /     HEIR         /    IDLE        / SWITCH NEEDED
    117   CPU 0: 0x0a010001 @  3 / 0x0a010001 @  3 / 0x09010001 @255         false
    118   CPU 1: 0x0a010007 @  5 / 0x0a010007 @  5 / 0x09010002 @255         false
    119   CPU 2: 0x0a010006 @  5 / 0x0a010006 @  5 / 0x09010003 @255         false
    120   CPU 3: 0x0a010005 @  5 / 0x0a010005 @  5 / 0x09010004 @255         false
     100          EXECUTING      /   HEIR             / SWITCH NEEDED
     101  CPU 0: 0x0a010005 @  5 / 0x0a010005 @  5          false
     102  CPU 1: 0x0a010006 @  5 / 0x0a010006 @  5          false
     103  CPU 2: 0x0a010007 @  5 / 0x0a010007 @  5          false
     104  CPU 3: 0x0a010001 @  3 / 0x0a010001 @  3          false
    121105=== End of Ready Set of Threads
    122 ==> 34:
    123 ==> 35: # We should pick task smp4 on the 4th core
    124 ==> 36: task_create smp8 4
     106==> 30:
     107==> 31: # We should pick task smp5 (0x0a010005) on CPU 0
     108==> 32: task_create smp8 4
    125109Creating task with:  Preemption: yes Timeslicing: no
    126   Thread Heir: 0x0a010001 priority=3
    127   Thread Executing: 0x0a010001 priority=3
    128110Task (smp8) created: id=0x0a010008, priority=4
    129111Task (smp8) starting: id=0x0a010008, priority=4
    130 ==> 37: # GOAL: Tasks 0x0a010001, 0x0a010007, and 0x0a010006
    131 ==> 38: # GOAL:    heir and executing on CPUs 1 - 3 respectively
    132 ==> 39: # GOAL: Task 0x0a010005 is executing on CPU 4
    133 ==> 40: # GOAL: Task 0x0a010008 is heir on CPU 4
    134 ==> 41: cpus
     112  CPU 2: Thread Heir 0x0a010008 priority=4
     113  CPU 2: Thread Executing 0x0a010008 priority=4
     114==> 33: # GOAL: Tasks 0x0a010001, 0x0a010007, 0x0a010006, and 0x0a010008 are
     115==> 34: # GOAL:    heir and executing on CPUs 3 - 0 respectively
     116==> 35: cpus
    135117=== CPU Status
    136             EXECUTING    /     HEIR         /    IDLE        / SWITCH NEEDED
    137   CPU 0: 0x0a010001 @  3 / 0x0a010001 @  3 / 0x09010001 @255         false
    138   CPU 1: 0x0a010007 @  5 / 0x0a010007 @  5 / 0x09010002 @255         false
    139   CPU 2: 0x0a010006 @  5 / 0x0a010006 @  5 / 0x09010003 @255         false
    140   CPU 3: 0x0a010005 @  5 / 0x0a010008 @  4 / 0x09010004 @255         true
     118          EXECUTING      /   HEIR             / SWITCH NEEDED
     119  CPU 0: 0x0a010008 @  4 / 0x0a010008 @  4          false
     120  CPU 1: 0x0a010006 @  5 / 0x0a010006 @  5          false
     121  CPU 2: 0x0a010007 @  5 / 0x0a010007 @  5          false
     122  CPU 3: 0x0a010001 @  3 / 0x0a010001 @  3          false
    141123=== End of Ready Set of Threads
    142 ==> 42: dispatch
    143 === Invoke Thread Dispatch on CPU 3
    144   Thread Heir: 0x0a010008 priority=4
    145   Thread Executing: 0x0a010005 priority=5
    146   Thread Executing: 0x0a010008 priority=4
    147 ==> 43: # GOAL: Tasks 0x0a010001, 0x0a010007, 0x0a010006, and 0x0a010008 are
    148 ==> 44: # GOAL:    heir and executing on CPUs 1 - 4 respectively
    149 ==> 45: cpus
    150 === CPU Status
    151             EXECUTING    /     HEIR         /    IDLE        /  SWITCH NEEDED
    152   CPU 0: 0x0a010001 @  3 / 0x0a010001 @  3 / 0x09010001 @255         false
    153   CPU 1: 0x0a010007 @  5 / 0x0a010007 @  5 / 0x09010002 @255         false
    154   CPU 2: 0x0a010006 @  5 / 0x0a010006 @  5 / 0x09010003 @255         false
    155   CPU 3: 0x0a010008 @  4 / 0x0a010008 @  4 / 0x09010004 @255         false
    156 === End of Ready Set of Threads
Note: See TracChangeset for help on using the changeset viewer.