Changeset 8728104


Ignore:
Timestamp:
Jan 30, 2023, 8:59:28 PM (14 months ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
ADT, ast-experimental, master
Children:
ce691d2
Parents:
0f15e3b (diff), 1c75ef8 (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

Files:
9 added
4 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/Makefile.am

    r0f15e3b r8728104  
    115115        concurrency/mutex_stmt.hfa \
    116116    concurrency/select.hfa \
    117     concurrency/channel.hfa
     117    concurrency/channel.hfa \
     118    concurrency/actor.hfa
    118119
    119120inst_thread_headers_src = \
  • libcfa/src/concurrency/locks.hfa

    r0f15e3b r8728104  
    511511        // flag showing if lock is held
    512512        volatile bool held;
    513 
    514         #ifdef __CFA_DEBUG__
    515         // for deadlock detection
    516         struct thread$ * owner;
    517         #endif
    518513};
    519514
     
    526521static inline void ?=?( spin_queue_lock & this, spin_queue_lock this2 ) = void;
    527522
    528 // if this is called recursively IT WILL DEADLOCK!!!!!
     523// if this is called recursively IT WILL DEADLOCK!
    529524static inline void lock(spin_queue_lock & this) with(this) {
    530525        mcs_spin_node node;
  • src/Concurrency/module.mk

    r0f15e3b r8728104  
    1616
    1717SRC += \
     18        Concurrency/Actors.cpp \
     19        Concurrency/Actors.hpp \
    1820        Concurrency/KeywordsNew.cpp \
    1921        Concurrency/Keywords.cc \
     
    2123        Concurrency/WaitforNew.cpp \
    2224        Concurrency/Waitfor.cc \
    23         Concurrency/Waitfor.h
     25        Concurrency/Waitfor.h 
  • src/main.cc

    r0f15e3b r8728104  
    4646#include "Common/UnimplementedError.h"      // for UnimplementedError
    4747#include "Common/utility.h"                 // for deleteAll, filter, printAll
     48#include "Concurrency/Actors.hpp"           // for implementActors
    4849#include "Concurrency/Keywords.h"           // for implementMutex, implement...
    4950#include "Concurrency/Waitfor.h"            // for generateWaitfor
     
    341342                PASS( "Generate Autogen Routines", Validate::autogenerateRoutines( transUnit ) );
    342343
     344        PASS( "Implement Actors", Concurrency::implementActors( transUnit ) );
     345
    343346                PASS( "Implement Mutex", Concurrency::implementMutex( transUnit ) );
    344347                PASS( "Implement Thread Start", Concurrency::implementThreadStarter( transUnit ) );
Note: See TracChangeset for help on using the changeset viewer.