Changeset 6f8c46d for tests

Timestamp:

Jun 15, 2021, 11:34:45 AM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

4f1b8f3f

Parents:

b6749fd (diff), 07033ce (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:

• coroutine/fibonacci.cfa (modified) (1 diff)
• device/.expect/cpu.txt (added)
• device/cpu.cfa (added)
• unified_locking/fast.cfa (modified) (2 diffs)

tests/coroutine/fibonacci.cfa

@@ -31 +31 @@
 }
 
-int next( Fibonacci & fib ) with( fib ) {
-        resume( fib );                                                                          // restart last suspend
-        return fn;
-}
-
 int main() {
         Fibonacci f1, f2;
         for ( 10 ) {                                                                            // print N Fibonacci values
-                sout | next( f1 ) | next( f2 );
+                sout | resume( f1 ).fn | resume( f2 ).fn;
         } // for
 }

tests/unified_locking/fast.cfa

@@ -22 +22 @@
 uint32_t cs() {
         $thread * me = active_thread();
-        uint32_t value = (uint32_t)me;
+        uint32_t value;
         lock(mo.l);
         {
@@ -28 +28 @@
                 mo.id = me;
                 yield(random(5));
+                value = ((uint32_t)random()) ^ ((uint32_t)me);
                 if(mo.id != me) sout | "Intruder!";
                 mo.sum = tsum + value;