Ignore:
Timestamp:
Apr 28, 2021, 1:06:13 PM (4 years ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
b7fd2db6
Parents:
e9c0b4c (diff), c7015e6b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:
libcfa/src/concurrency
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • libcfa/src/concurrency/coroutine.cfa

    re9c0b4c radaee12  
    6161forall(T & | is_coroutine(T))
    6262void __cfaehm_cancelled_coroutine(
    63                 T & cor, $coroutine * desc, _EHM_VTABLE_TYPE(CoroutineCancelled)(T) & const _default_vtable ) {
     63                T & cor, $coroutine * desc, EHM_DEFAULT_VTABLE(CoroutineCancelled, (T)) ) {
    6464        verify( desc->cancellation );
    6565        desc->state = Cancelled;
    … …  
    145145// Part of the Public API
    146146// Not inline since only ever called once per coroutine
    147 forall(T & | is_coroutine(T) | { _EHM_VTABLE_TYPE(CoroutineCancelled)(T) & const _default_vtable; })
     147forall(T & | is_coroutine(T) | { EHM_DEFAULT_VTABLE(CoroutineCancelled, (T)); })
    148148void prime(T& cor) {
    149149        $coroutine* this = get_coroutine(cor);

  • libcfa/src/concurrency/coroutine.hfa

    re9c0b4c radaee12  
    6060//-----------------------------------------------------------------------------
    6161// Public coroutine API
    62 forall(T & | is_coroutine(T) | { _EHM_VTABLE_TYPE(CoroutineCancelled)(T) & const _default_vtable; })
     62forall(T & | is_coroutine(T) | { EHM_DEFAULT_VTABLE(CoroutineCancelled, (T)); })
    6363void prime(T & cor);
    6464
    … …  
    131131forall(T & | is_coroutine(T))
    132132void __cfaehm_cancelled_coroutine(
    133         T & cor, $coroutine * desc, _EHM_VTABLE_TYPE(CoroutineCancelled)(T) & const _default_vtable );
     133        T & cor, $coroutine * desc, EHM_DEFAULT_VTABLE(CoroutineCancelled, (T)) );
    134134
    135135// Resume implementation inlined for performance
    136 forall(T & | is_coroutine(T) | { _EHM_VTABLE_TYPE(CoroutineCancelled)(T) & const _default_vtable; })
     136forall(T & | is_coroutine(T) | { EHM_DEFAULT_VTABLE(CoroutineCancelled, (T)); })
    137137static inline T & resume(T & cor) {
    138138        // optimization : read TLS once and reuse it

  • libcfa/src/concurrency/stats.cfa

    re9c0b4c radaee12  
    126126
    127127                char buf[1024];
    128                 strstream sstr = { buf, 1024 };
     128                ostrstream sstr = { buf, 1024 };
    129129
    130130                if( flags & CFA_STATS_READY_Q ) {

  • libcfa/src/concurrency/thread.cfa

    re9c0b4c radaee12  
    8282
    8383forall(T & | is_thread(T) | IS_EXCEPTION(ThreadCancelled, (T))
    84     | { _EHM_VTABLE_TYPE(ThreadCancelled)(T) & const _default_vtable; })
     84    | { EHM_DEFAULT_VTABLE(ThreadCancelled, (T)); })
    8585void ?{}( thread_dtor_guard_t & this,
    8686                T & thrd, void(*cancelHandler)(ThreadCancelled(T) &)) {
    … …  
    161161//-----------------------------------------------------------------------------
    162162forall(T & | is_thread(T) | IS_RESUMPTION_EXCEPTION(ThreadCancelled, (T))
    163     | { _EHM_VTABLE_TYPE(ThreadCancelled)(T) & const _default_vtable; })
     163    | { EHM_DEFAULT_VTABLE(ThreadCancelled, (T)); })
    164164T & join( T & this ) {
    165165        thread_dtor_guard_t guard = { this, defaultResumptionHandler };

  • libcfa/src/concurrency/thread.hfa

    re9c0b4c radaee12  
    8080
    8181forall( T & | is_thread(T) | IS_EXCEPTION(ThreadCancelled, (T))
    82     | { _EHM_VTABLE_TYPE(ThreadCancelled)(T) & const _default_vtable; } )
     82    | { EHM_DEFAULT_VTABLE(ThreadCancelled, (T)); })
    8383void ?{}( thread_dtor_guard_t & this, T & thrd, void(*)(ThreadCancelled(T) &) );
    8484void ^?{}( thread_dtor_guard_t & this );
    … …  
    127127// join
    128128forall( T & | is_thread(T) | IS_RESUMPTION_EXCEPTION(ThreadCancelled, (T))
    129     | { _EHM_VTABLE_TYPE(ThreadCancelled)(T) & const _default_vtable; } )
     129    | { EHM_DEFAULT_VTABLE(ThreadCancelled, (T)); })
    130130T & join( T & this );
    131131
Note: See TracChangeset for help on using the changeset viewer.