Ignore:
Timestamp:
Oct 18, 2022, 9:13:33 PM (3 years ago)
Author:
JiadaL <j82liang@…>
Branches:
ADT, ast-experimental, master, stuck-waitfor-destruct
Children:
9511841
Parents:
5408b59 (diff), ce7d197 (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/kernel
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • libcfa/src/concurrency/kernel/fwd.hfa

    r5408b59 rc2b3243  
    276276                        // intented to be use by wait, wait_any, waitfor, etc. rather than used directly
    277277                        bool retract( future_t & this, oneshot & wait_ctx ) {
    278                                 struct oneshot * expected = this.ptr;
     278                                struct oneshot * expected = &wait_ctx;
    279279
    280280                                // attempt to remove the context so it doesn't get consumed.

  • libcfa/src/concurrency/kernel/startup.cfa

    r5408b59 rc2b3243  
    184184
    185185
     186extern void heapManagerCtor();
     187extern void heapManagerDtor();
     188
    186189//=============================================================================================
    187190// Kernel Setup logic
    … …  
    365368        proc->local_data = &__cfaabi_tls;
    366369
     370        heapManagerCtor();                                                                      // initialize heap
     371
    367372        __cfa_io_start( proc );
    368373        register_tls( proc );
    … …  
    416421        unregister_tls( proc );
    417422        __cfa_io_stop( proc );
     423
     424        heapManagerDtor();                                                                      // de-initialize heap
    418425
    419426        return 0p;
Note: See TracChangeset for help on using the changeset viewer.