Changeset b0c7419


Ignore:
Timestamp:
Feb 14, 2020, 3:28:17 PM (3 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
8c50aed
Parents:
50b8885
Message:

Yield now uses force_yield instead of park/unpark.
Final ctxswitch of a thread now uses ad-hoc mechanism instead of park/unpark.

Files:
8 edited

Legend:

Unmodified
Added
Removed

  • libcfa/src/concurrency/invoke.h

    r50b8885 rb0c7419  
    9292        };
    9393
    94         enum coroutine_state { Halted, Start, Primed, Inactive, Active, Rerun, Reschedule };
    95         enum __Preemption_Reason { __NO_PREEMPTION, __ALARM_PREEMPTION, __POLL_PREEMPTION };
     94        enum coroutine_state { Halted, Start, Primed, Inactive, Active, Rerun };
     95        enum __Preemption_Reason { __NO_PREEMPTION, __ALARM_PREEMPTION, __POLL_PREEMPTION, __MANUAL_PREEMPTION };
    9696
    9797        struct coroutine_desc {

  • libcfa/src/concurrency/kernel.cfa

    r50b8885 rb0c7419  
    213213        this.cltr = &cltr;
    214214        terminated{ 0 };
     215        destroyer = 0p;
    215216        do_terminate = false;
    216217        preemption_alarm = 0p;
    … …  
    320321        coroutine_desc * proc_cor = get_coroutine(this->runner);
    321322
    322         // Reset the terminating actions here
    323         this->finish.action_code = No_Action;
    324 
    325323        // Update global state
    326324        kernelTLS.this_thread = thrd_dst;
    … …  
    334332                if(unlikely(thrd_dst->preempted)) {
    335333                        thrd_dst->preempted = __NO_PREEMPTION;
    336                         verify(thrd_dst->state == Active || thrd_dst->state == Rerun || thrd_dst->state == Reschedule);
     334                        verify(thrd_dst->state == Active || thrd_dst->state == Rerun);
    337335                } else {
    338336                        verify(thrd_dst->state == Start || thrd_dst->state == Primed || thrd_dst->state == Inactive);
    … …  
    372370                                // The thread has halted, it should never be scheduled/run again, leave it back to Halted and move on
    373371                                thrd_dst->state = Halted;
     372
     373                                // We may need to wake someone up here since
     374                                unpark( this->destroyer );
     375                                this->destroyer = 0p;
    374376                                break RUNNING;
    375377                        case Active:
    … …  
    380382                                // In this case, just run it again.
    381383                                continue RUNNING;
    382                         case Reschedule:
    383                                 // This is case 3, someone tried to run this before it finished blocking
    384                                 // but it must go through the ready-queue
    385                                 thrd_dst->state = Inactive;  /*restore invariant */
    386                                 ScheduleThread( thrd_dst );
    387                                 break RUNNING;
    388384                        default:
    389385                                // This makes no sense, something is wrong abort
    … …  
    397393
    398394// KERNEL_ONLY
    399 static void returnToKernel() {
     395void returnToKernel() {
    400396        /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
    401397        coroutine_desc * proc_cor = get_coroutine(kernelTLS.this_processor->runner);
    … …  
    553549        /* paranoid */ if( thrd->state == Inactive || thrd->state == Start ) assertf( thrd->preempted == __NO_PREEMPTION,
    554550                          "Error inactive thread marked as preempted, state %d, preemption %d\n", thrd->state, thrd->preempted );
    555         /* paranoid */ if( thrd->preempted != __NO_PREEMPTION ) assertf(thrd->state == Active || thrd->state == Rerun || thrd->state == Reschedule,
     551        /* paranoid */ if( thrd->preempted != __NO_PREEMPTION ) assertf(thrd->state == Active || thrd->state == Rerun,
    556552                          "Error preempted thread marked as not currently running, state %d, preemption %d\n", thrd->state, thrd->preempted );
    557553        /* paranoid */ #endif
    … …  
    589585}
    590586
    591 void unpark( thread_desc * thrd, bool must_yield ) {
     587void unpark( thread_desc * thrd ) {
    592588        if( !thrd ) return;
    593 
    594         enum coroutine_state new_state = must_yield ? Reschedule : Rerun;
    595589
    596590        disable_interrupts();
    597591        static_assert(sizeof(thrd->state) == sizeof(int));
    598         enum coroutine_state old_state = __atomic_exchange_n(&thrd->state, new_state, __ATOMIC_SEQ_CST);
     592        enum coroutine_state old_state = __atomic_exchange_n(&thrd->state, Rerun, __ATOMIC_SEQ_CST);
    599593        switch(old_state) {
    600594                case Active:
    … …  
    609603                        break;
    610604                case Rerun:
    611                 case Reschedule:
    612605                        abort("More than one thread attempted to schedule thread %p\n", thrd);
    613606                        break;
    … …  
    637630
    638631// KERNEL ONLY
    639 void LeaveThread() {
     632void __leave_thread() {
    640633        /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
    641634        returnToKernel();
     635        abort();
    642636}
    643637
    … …  
    649643
    650644        thread_desc * thrd = kernelTLS.this_thread;
    651         /* paranoid */ verify(thrd->state == Active || thrd->state == Rerun || thrd->state == Reschedule);
     645        /* paranoid */ verify(thrd->state == Active || thrd->state == Rerun);
    652646
    653647        // SKULLDUGGERY: It is possible that we are preempting this thread just before

  • libcfa/src/concurrency/kernel.hfa

    r50b8885 rb0c7419  
    4545extern struct cluster * mainCluster;
    4646
    47 enum FinishOpCode { No_Action, Release, Schedule, Release_Schedule, Release_Multi, Release_Multi_Schedule, Callback };
    48 
    49 typedef void (*__finish_callback_fptr_t)(void);
    50 
    51 //TODO use union, many of these fields are mutually exclusive (i.e. MULTI vs NOMULTI)
    52 struct FinishAction {
    53         FinishOpCode action_code;
    54         /*
    55         // Union of possible actions
    56         union {
    57                 // Option 1 : locks and threads
    58                 struct {
    59                         // 1 thread or N thread
    60                         union {
    61                                 thread_desc * thrd;
    62                                 struct {
    63                                         thread_desc ** thrds;
    64                                         unsigned short thrd_count;
    65                                 };
    66                         };
    67                         // 1 lock or N lock
    68                         union {
    69                                 __spinlock_t * lock;
    70                                 struct {
    71                                         __spinlock_t ** locks;
    72                                         unsigned short lock_count;
    73                                 };
    74                         };
    75                 };
    76                 // Option 2 : action pointer
    77                 __finish_callback_fptr_t callback;
    78         };
    79         /*/
    80         thread_desc * thrd;
    81         thread_desc ** thrds;
    82         unsigned short thrd_count;
    83         __spinlock_t * lock;
    84         __spinlock_t ** locks;
    85         unsigned short lock_count;
    86         __finish_callback_fptr_t callback;
    87         //*/
    88 };
    89 static inline void ?{}(FinishAction & this) {
    90         this.action_code = No_Action;
    91         this.thrd = 0p;
    92         this.lock = 0p;
    93 }
    94 static inline void ^?{}(FinishAction &) {}
    95 
    9647// Processor
    9748coroutine processorCtx_t {
    … …  
    11667        // RunThread data
    11768        // Action to do after a thread is ran
    118         struct FinishAction finish;
     69        thread_desc * destroyer;
    11970
    12071        // Preemption data

  • libcfa/src/concurrency/kernel_private.hfa

    r50b8885 rb0c7419  
    3434
    3535//Block current thread and release/wake-up the following resources
    36 void LeaveThread();
    37 
    38 bool force_yield( enum __Preemption_Reason );
     36void __leave_thread() __attribute__((noreturn));
    3937
    4038//-----------------------------------------------------------------------------

  • libcfa/src/concurrency/monitor.cfa

    r50b8885 rb0c7419  
    277277                disable_interrupts();
    278278
    279                 thrd->self_cor.state = Halted;
     279                thrd->state = Halted;
    280280
    281281                /* paranoid */ verifyf( thrd == this->owner, "Expected owner to be %p, got %p (r: %i, m: %p)", thrd, this->owner, this->recursion, this );
    … …  
    296296                // Unpark the next owner if needed
    297297                /* paranoid */ verifyf( !new_owner || new_owner == this->owner, "Expected owner to be %p, got %p (m: %p)", new_owner, this->owner, this );
    298                 unpark( new_owner );
    299 
    300                 // Leave the thread, this will unlock the spinlock
    301                 // Use leave thread instead of park which is
    302                 // specialized for this case
    303                 LeaveThread();
     298                /* paranoid */ verify( ! kernelTLS.preemption_state.enabled );
     299                /* paranoid */ verify( ! kernelTLS.this_processor->destroyer );
     300                /* paranoid */ verify( thrd->state == Halted );
     301
     302                kernelTLS.this_processor->destroyer = new_owner;
     303
     304                // Leave the thread
     305                __leave_thread();
    304306
    305307                // Control flow should never reach here!

  • libcfa/src/concurrency/thread.hfa

    r50b8885 rb0c7419  
    101101//----------
    102102// Unpark a thread, if the thread is already blocked, schedule it
    103 //                  if the thread is not yet block, signal that it should rerun immediately or reschedule itself
    104 void unpark( thread_desc * this, bool must_yield );
    105 
    106 static inline void unpark( thread_desc * this ) { unpark( this, false ); }
     103//                  if the thread is not yet block, signal that it should rerun immediately
     104void unpark( thread_desc * this );
    107105
    108106forall( dtype T | is_thread(T) )
    109 static inline void unpark( T & this ) { if(!&this) return; unpark( get_thread( this ), false );}
    110 
    111 forall( dtype T | is_thread(T) )
    112 static inline void unpark( T & this, bool must_yield ) { if(!&this) return; unpark( get_thread( this ), must_yield );}
     107static inline void unpark( T & this ) { if(!&this) return; unpark( get_thread( this ) );}
    113108
    114109//----------
    115110// Yield: force thread to block and be rescheduled
     111bool force_yield( enum __Preemption_Reason );
     112
    116113static inline void yield() {
    117         unpark( active_thread(), true );
    118         park();
     114        force_yield(__MANUAL_PREEMPTION);
    119115}
    120116

  • tests/concurrent/park/.expect/force_preempt.txt

    r50b8885 rb0c7419  
    1 0 Calling unpark (No Force) 0
    2 1 Calling unpark (No Force) 0
    3 2 Calling unpark (No Force) 0
    4 3 Calling unpark (No Force) 0
    5 4 Calling unpark (No Force) 0
    6 0 Parking (No Force) 0
    7 0 Unparked (No Force) 0
    8 0 Calling unpark (No Force) 1
    9 1 Parking (No Force) 0
    10 1 Unparked (No Force) 0
    11 1 Calling unpark (No Force) 1
    12 2 Parking (No Force) 0
    13 2 Unparked (No Force) 0
    14 2 Calling unpark (No Force) 1
    15 3 Parking (No Force) 0
    16 3 Unparked (No Force) 0
    17 3 Calling unpark (No Force) 1
    18 4 Parking (No Force) 0
    19 4 Unparked (No Force) 0
    20 4 Calling unpark (No Force) 1
    21 0 Parking (No Force) 1
    22 0 Unparked (No Force) 1
    23 0 Calling unpark (No Force) 2
    24 1 Parking (No Force) 1
    25 1 Unparked (No Force) 1
    26 1 Calling unpark (No Force) 2
    27 2 Parking (No Force) 1
    28 2 Unparked (No Force) 1
    29 2 Calling unpark (No Force) 2
    30 3 Parking (No Force) 1
    31 3 Unparked (No Force) 1
    32 3 Calling unpark (No Force) 2
    33 4 Parking (No Force) 1
    34 4 Unparked (No Force) 1
    35 4 Calling unpark (No Force) 2
    36 0 Parking (No Force) 2
    37 0 Unparked (No Force) 2
    38 0 Calling unpark (No Force) 3
    39 1 Parking (No Force) 2
    40 1 Unparked (No Force) 2
    41 1 Calling unpark (No Force) 3
    42 2 Parking (No Force) 2
    43 2 Unparked (No Force) 2
    44 2 Calling unpark (No Force) 3
    45 3 Parking (No Force) 2
    46 3 Unparked (No Force) 2
    47 3 Calling unpark (No Force) 3
    48 4 Parking (No Force) 2
    49 4 Unparked (No Force) 2
    50 4 Calling unpark (No Force) 3
    51 0 Parking (No Force) 3
    52 0 Unparked (No Force) 3
    53 0 Calling unpark (No Force) 4
    54 1 Parking (No Force) 3
    55 1 Unparked (No Force) 3
    56 1 Calling unpark (No Force) 4
    57 2 Parking (No Force) 3
    58 2 Unparked (No Force) 3
    59 2 Calling unpark (No Force) 4
    60 3 Parking (No Force) 3
    61 3 Unparked (No Force) 3
    62 3 Calling unpark (No Force) 4
    63 4 Parking (No Force) 3
    64 4 Unparked (No Force) 3
    65 4 Calling unpark (No Force) 4
    66 0 Parking (No Force) 4
    67 0 Unparked (No Force) 4
    68 0 Calling unpark (Force) 0
    69 1 Parking (No Force) 4
    70 1 Unparked (No Force) 4
    71 1 Calling unpark (Force) 0
    72 2 Parking (No Force) 4
    73 2 Unparked (No Force) 4
    74 2 Calling unpark (Force) 0
    75 3 Parking (No Force) 4
    76 3 Unparked (No Force) 4
    77 3 Calling unpark (Force) 0
    78 4 Parking (No Force) 4
    79 4 Unparked (No Force) 4
    80 4 Calling unpark (Force) 0
    81 0 Parking (Force) 0
    82 1 Parking (Force) 0
    83 2 Parking (Force) 0
    84 3 Parking (Force) 0
    85 4 Parking (Force) 0
    86 0 Unparked (Force) 0
    87 0 Calling unpark (Force) 1
    88 1 Unparked (Force) 0
    89 1 Calling unpark (Force) 1
    90 2 Unparked (Force) 0
    91 2 Calling unpark (Force) 1
    92 3 Unparked (Force) 0
    93 3 Calling unpark (Force) 1
    94 4 Unparked (Force) 0
    95 4 Calling unpark (Force) 1
    96 0 Parking (Force) 1
    97 1 Parking (Force) 1
    98 2 Parking (Force) 1
    99 3 Parking (Force) 1
    100 4 Parking (Force) 1
    101 0 Unparked (Force) 1
    102 0 Calling unpark (Force) 2
    103 1 Unparked (Force) 1
    104 1 Calling unpark (Force) 2
    105 2 Unparked (Force) 1
    106 2 Calling unpark (Force) 2
    107 3 Unparked (Force) 1
    108 3 Calling unpark (Force) 2
    109 4 Unparked (Force) 1
    110 4 Calling unpark (Force) 2
    111 0 Parking (Force) 2
    112 1 Parking (Force) 2
    113 2 Parking (Force) 2
    114 3 Parking (Force) 2
    115 4 Parking (Force) 2
    116 0 Unparked (Force) 2
    117 0 Calling unpark (Force) 3
    118 1 Unparked (Force) 2
    119 1 Calling unpark (Force) 3
    120 2 Unparked (Force) 2
    121 2 Calling unpark (Force) 3
    122 3 Unparked (Force) 2
    123 3 Calling unpark (Force) 3
    124 4 Unparked (Force) 2
    125 4 Calling unpark (Force) 3
    126 0 Parking (Force) 3
    127 1 Parking (Force) 3
    128 2 Parking (Force) 3
    129 3 Parking (Force) 3
    130 4 Parking (Force) 3
    131 0 Unparked (Force) 3
    132 0 Calling unpark (Force) 4
    133 1 Unparked (Force) 3
    134 1 Calling unpark (Force) 4
    135 2 Unparked (Force) 3
    136 2 Calling unpark (Force) 4
    137 3 Unparked (Force) 3
    138 3 Calling unpark (Force) 4
    139 4 Unparked (Force) 3
    140 4 Calling unpark (Force) 4
    141 0 Parking (Force) 4
    142 1 Parking (Force) 4
    143 2 Parking (Force) 4
    144 3 Parking (Force) 4
    145 4 Parking (Force) 4
    146 0 Unparked (Force) 4
    147 1 Unparked (Force) 4
    148 2 Unparked (Force) 4
    149 3 Unparked (Force) 4
    150 4 Unparked (Force) 4
     10 Calling unpark 0
     21 Calling unpark 0
     32 Calling unpark 0
     43 Calling unpark 0
     54 Calling unpark 0
     60 Parking 0
     70 Unparked 0
     80 Calling unpark 1
     91 Parking 0
     101 Unparked 0
     111 Calling unpark 1
     122 Parking 0
     132 Unparked 0
     142 Calling unpark 1
     153 Parking 0
     163 Unparked 0
     173 Calling unpark 1
     184 Parking 0
     194 Unparked 0
     204 Calling unpark 1
     210 Parking 1
     220 Unparked 1
     230 Calling unpark 2
     241 Parking 1
     251 Unparked 1
     261 Calling unpark 2
     272 Parking 1
     282 Unparked 1
     292 Calling unpark 2
     303 Parking 1
     313 Unparked 1
     323 Calling unpark 2
     334 Parking 1
     344 Unparked 1
     354 Calling unpark 2
     360 Parking 2
     370 Unparked 2
     380 Calling unpark 3
     391 Parking 2
     401 Unparked 2
     411 Calling unpark 3
     422 Parking 2
     432 Unparked 2
     442 Calling unpark 3
     453 Parking 2
     463 Unparked 2
     473 Calling unpark 3
     484 Parking 2
     494 Unparked 2
     504 Calling unpark 3
     510 Parking 3
     520 Unparked 3
     530 Calling unpark 4
     541 Parking 3
     551 Unparked 3
     561 Calling unpark 4
     572 Parking 3
     582 Unparked 3
     592 Calling unpark 4
     603 Parking 3
     613 Unparked 3
     623 Calling unpark 4
     634 Parking 3
     644 Unparked 3
     654 Calling unpark 4
     660 Parking 4
     670 Unparked 4
     681 Parking 4
     691 Unparked 4
     702 Parking 4
     712 Unparked 4
     723 Parking 4
     733 Unparked 4
     744 Parking 4
     754 Unparked 4

  • tests/concurrent/park/force_preempt.cfa

    r50b8885 rb0c7419  
    2020
    2121
    22 void park_loop(Waiter & this, int id, bool force) {
     22volatile int count = 0;
     23
     24void main(Waiter & this) {
     25        // Get a unique id
     26        int id = __atomic_fetch_add(&count, 1, __ATOMIC_SEQ_CST);
    2327
    2428        for(int i = 0; i < 5; i++) {
    2529                // Unpark this thread, don't force a yield
    26                 sout | id | "Calling unpark" | (force ? "(Force)" : "(No Force)") | i;
    27                 unpark(this, force);
     30                sout | id | "Calling unpark" | i;
     31                unpark(this);
    2832
    2933                // Force a preemption before the call to park
    … …  
    3236
    3337                // Park this thread,
    34                 sout | id | "Parking"  | (force ? "(Force)" : "(No Force)") | i;
     38                sout | id | "Parking" | i;
    3539                park();
    36                 sout | id | "Unparked" | (force ? "(Force)" : "(No Force)") | i;
     40                sout | id | "Unparked" | i;
    3741        }
    38 }
    39 
    40 volatile int count = 0;
    41 
    42 void main(Waiter & this) {
    43         // Get a unique id
    44         int id = __atomic_fetch_add(&count, 1, __ATOMIC_SEQ_CST);
    45 
    46         // First without forcing yield
    47         park_loop( this, id, false );
    48 
    49         // First with forcing yield
    50         park_loop( this, id, true  );
    5142}
    5243
Note: See TracChangeset for help on using the changeset viewer.