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/unified_locking
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • 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.