Changeset 349b2cb for src/tests

Timestamp:

Mar 22, 2017, 11:28:47 AM (9 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

9c14ae9

Parents:

597db97f (diff), a53e10a (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:/u/cforall/software/cfa/cfa-cc

Location:

src/tests

Files:

• monitor.c (modified) (1 diff)
• multi-monitor.c (modified) (1 diff)
• thread.c (modified) (1 diff)

src/tests/monitor.c

@@ -36 +36 @@
 
 void ?{}( MyThread * this ) {}
+void ^?{}( MyThread * mutex this ) {}
 
 void main( MyThread* this ) {
-        for(int i = 0; i < 1000000; i++) {
+        for(int i = 0; i < 1_000_000; i++) {
                 increment( &global );
         }

src/tests/multi-monitor.c

@@ -31 +31 @@
 }
 
+void ^?{}( MyThread * mutex this ) {}
+
 void main( MyThread* this ) {
         for(int i = 0; i < 1000000; i++) {

src/tests/thread.c

@@ -12 +12 @@
 void ?{}( First * this, signal_once* lock ) { this->lock = lock; }
 void ?{}( Second * this, signal_once* lock ) { this->lock = lock; }
+
+void ^?{}( First  * mutex this ) {}
+void ^?{}( Second * mutex this ) {}
 
 void main(First* this) {