Ignore:
Timestamp:
Nov 24, 2021, 9:47:56 PM (2 years ago)
Author:
Michael Brooks <mlbrooks@…>
Branches:
ADT, ast-experimental, enum, master, pthread-emulation, qualifiedEnum
Children:
5235d49
Parents:
94647b0 (diff), 3cc1111 (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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/concurrency/kernel/startup.cfa

    r94647b0 r7770cc8  
    100100// Other Forward Declarations
    101101extern void __wake_proc(processor *);
     102extern int cfa_main_returned;                                                   // from interpose.cfa
    102103
    103104//-----------------------------------------------------------------------------
     
    268269
    269270static void __kernel_shutdown(void) {
     271        if(!cfa_main_returned) return;
    270272        /* paranoid */ verify( __preemption_enabled() );
    271273        disable_interrupts();
     
    525527        this.local_data = 0p;
    526528
    527         this.idle = eventfd(0, 0);
    528         if (idle < 0) {
     529        this.idle_fd = eventfd(0, 0);
     530        if (idle_fd < 0) {
    529531                abort("KERNEL ERROR: PROCESSOR EVENTFD - %s\n", strerror(errno));
    530532        }
     
    540542// Not a ctor, it just preps the destruction but should not destroy members
    541543static void deinit(processor & this) {
    542         close(this.idle);
     544        close(this.idle_fd);
    543545}
    544546
     
    582584// Cluster
    583585static void ?{}(__cluster_proc_list & this) {
    584         this.lock  = 0;
     586        this.fd    = 0;
    585587        this.idle  = 0;
    586588        this.total = 0;
Note: See TracChangeset for help on using the changeset viewer.