Changeset 3b8acfb for libcfa/src


Ignore:
Timestamp:
Aug 13, 2021, 5:29:44 PM (5 years ago)
Author:
Andrew Beach <ajbeach@…>
Branches:
ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct
Children:
e3984a68
Parents:
be497c6 (diff), c9f9d4f (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' into 'andrew-mmath'. Mostly discarded changes to my thesis, I'll fold them in myself.

Location:
libcfa/src
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    rbe497c6 r3b8acfb  
    235235
    236236        register_tls( mainProcessor );
     237        mainThread->last_cpu = __kernel_getcpu();
    237238
    238239        //initialize the global state variables
    … …  
    478479        state = Start;
    479480        self_cor{ info };
    480         last_cpu = __kernel_getcpu();
    481481        curr_cor = &self_cor;
    482482        curr_cluster = mainCluster;

  • libcfa/src/concurrency/thread.cfa

    rbe497c6 r3b8acfb  
    3434        preempted = __NO_PREEMPTION;
    3535        corctx_flag = false;
     36        disable_interrupts();
    3637        last_cpu = __kernel_getcpu();
     38        enable_interrupts();
    3739        curr_cor = &self_cor;
    3840        self_mon.owner = &this;

  • libcfa/src/heap.cfa

    rbe497c6 r3b8acfb  
    1010// Created On       : Tue Dec 19 21:58:35 2017
    1111// Last Modified By : Peter A. Buhr
    12 // Last Modified On : Sat May 22 08:46:39 2021
    13 // Update Count     : 1036
     12// Last Modified On : Mon Aug  9 19:03:02 2021
     13// Update Count     : 1040
    1414//
    1515
    … …  
    102102} // prtUnfreed
    103103
     104extern int cfa_main_returned;                                                   // from bootloader.cf
    104105extern "C" {
    105106        void heapAppStart() {                                                           // called by __cfaabi_appready_startup
    … …  
    109110        void heapAppStop() {                                                            // called by __cfaabi_appready_startdown
    110111                fclose( stdin ); fclose( stdout );
    111                 prtUnfreed();
     112                if ( cfa_main_returned ) prtUnfreed();                  // do not check unfreed storage if exit called
    112113        } // heapAppStop
    113114} // extern "C"
Note: See TracChangeset for help on using the changeset viewer.