Changeset bae0d35 for tests/unified_locking

Timestamp:

Jun 7, 2021, 2:09:12 PM (5 years ago)

Author:

caparsons <caparson@…>

Branches:

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

Children:

5a46e09

Parents:

82f4063 (diff), 53692b3 (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:

• fast.cfa (modified) (4 diffs)
• timeout_lock.cfa (modified) (3 diffs)

tests/unified_locking/fast.cfa

@@ -8 +8 @@
         fast_lock l;
         $thread * id;
-        size_t sum;
+        uint32_t sum;
 };
 
@@ -20 +20 @@
 }
 
-unsigned cs() {
+uint32_t cs() {
         $thread * me = active_thread();
-        unsigned value = (unsigned)me;
+        uint32_t value = (uint32_t)me;
         lock(mo.l);
         {
-                size_t tsum = mo.sum;
+                uint32_t tsum = mo.sum;
                 mo.id = me;
                 yield(random(5));
@@ -36 +36 @@
 
 thread LockCheck {
-        size_t sum;
+        uint32_t sum;
 };
 
@@ -50 +50 @@
 
 int main() {
-        size_t sum = -32;
+        uint32_t sum = -32;
         mo.sum = -32;
         processor p[2];

tests/unified_locking/timeout_lock.cfa

@@ -1 +1 @@
 #include <stdio.h>
-#include "locks.hfa"
-#include "alarm.hfa"
+#include <locks.hfa>
+#include <alarm.hfa>
 #include <stdlib.hfa>
 #include <thread.hfa>
-#include "kernel.cfa"
+#include <kernel.hfa>
 
 multiple_acquisition_lock m, n;
@@ -33 +33 @@
 
         for ( unsigned int i = 0; i < NoOfTimes + 3; i += 1 ) {
-            if ( wait( c_m, m, 1000000`ns ) ) { 
+            if ( wait( c_m, m, 1000000`ns ) ) {
                         // printf("Thread: %p signalled\n", active_thread()); // removed since can't expect non deterministic output
             } else {
@@ -73 +73 @@
         processor p[2];
         printf("Start Test 1: surface testing condition variable timeout routines\n");
-        wait( c_m, 1`ns );                                                                                                              // bool wait( condition_variable(L) & this, Duration duration );        
+        wait( c_m, 1`ns );                                                                                                              // bool wait( condition_variable(L) & this, Duration duration );
         wait( c_m, 10, 1`ns );                                                                                                  // bool wait( condition_variable(L) & this, uintptr_t info, Duration duration );
         lock(m); wait( c_m, m, 1`ns ); unlock(m);                                                               // bool wait( condition_variable(L) & this, L & l, Duration duration );