Changeset 6ff08d8 for tests


Ignore:
Timestamp:
Jul 12, 2021, 1:44:35 PM (4 years ago)
Author:
caparsons <caparson@…>
Branches:
ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
605673f, 9345684
Parents:
cf444b6 (diff), a953c2e3 (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:
tests
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • tests/concurrent/semaphore.cfa

    rcf444b6 r6ff08d8  
    2222
    2323void main(Blocker & this) {
    24         $thread * me = active_thread();
     24        thread$ * me = active_thread();
    2525        this.sum = 0;
    2626        for(num_blocks) {
    … …  
    4545                or else {}
    4646
    47                 $thread * t = V(ben, false);
     47                thread$ * t = V(ben, false);
    4848                if(t) {
    4949                        this.sum += (unsigned)t;

  • tests/concurrent/signal/block.cfa

    rcf444b6 r6ff08d8  
    3333
    3434monitor global_data_t {
    35         $thread * last_thread;
    36         $thread * last_signaller;
     35        thread$ * last_thread;
     36        thread$ * last_signaller;
    3737};
    3838
    … …  
    8282        if( !is_empty( cond ) ) {
    8383
    84                 $thread * next = ( $thread * ) front( cond );
     84                thread$ * next = ( thread$ * ) front( cond );
    8585
    8686                if( ! signal_block( cond ) ) {

  • tests/concurrent/spinaphore.cfa

    rcf444b6 r6ff08d8  
    2121void main(Blocker & this);
    2222
    23 Blocker * from_thread($thread * t) {
     23Blocker * from_thread(thread$ * t) {
    2424        Blocker & nullb = *(Blocker*)0p;
    25         $thread & nullt = (thread&)nullb;
     25        thread$ & nullt = (thread&)nullb;
    2626        uintptr_t offset  = (uintptr_t)&nullt;
    2727        uintptr_t address = ((uintptr_t)t) - offset;
    … …  
    3030
    3131void main(Blocker & this) {
    32         $thread * me = active_thread();
     32        thread$ * me = active_thread();
    3333        Blocker * me1 = &this;
    3434        Blocker * me2 = from_thread(me);
    … …  
    5151        unsigned me = (unsigned)(uintptr_t)&this;
    5252        for(num_unblocks) {
    53                 $thread * t = V(sem, false);
     53                thread$ * t = V(sem, false);
    5454                Blocker * b = from_thread(t);
    5555                b->sum += me;

  • tests/unified_locking/mcs.cfa

    rcf444b6 r6ff08d8  
    77struct MutexObj {
    88        mcs_lock l;
    9         $thread * id;
     9        thread$ * id;
    1010        size_t sum;
    1111};
    … …  
    2121
    2222unsigned cs() {
    23         $thread * me = active_thread();
     23        thread$ * me = active_thread();
    2424        unsigned value = (unsigned)me;
    2525        mcs_node n;

  • tests/unified_locking/thread_test.cfa

    rcf444b6 r6ff08d8  
    6969            break;
    7070        default:
    71             break; 
     71            break;
    7272    }
    7373        processor p[threadCount];
Note: See TracChangeset for help on using the changeset viewer.