Changeset 2daea42

Timestamp:

Dec 22, 2020, 3:17:19 PM (4 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

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

Children:

bd144fd

Parents:

302ef2a (diff), c2409fd (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

Files:

• doc/working/unified_semaphores/semaphore.cfa (added)
• doc/working/unified_semaphores/semaphore.hfa (added)
• longrun_tests/Makefile.am (modified) (1 diff)
• longrun_tests/locks.cfa (added)
• tests/unified_locking/.expect/locks.txt (modified) (1 diff)
• tests/unified_locking/locks.cfa (modified) (2 diffs)

longrun_tests/Makefile.am

@@ -44 +44 @@
         -DTEST_$(shell cat .type | tr a-z A-Z)
 
-TESTS = block coroutine create disjoint enter enter3 processor stack wait yield
+TESTS = block coroutine create disjoint enter enter3 locks processor stack wait yield
 
 # .INTERMEDIATE: $(TESTS)

tests/unified_locking/.expect/locks.txt

@@ -19 +19 @@
 Start Test 10: locked condition variable wait/notify with front()
 Done Test 10
-Start Test 11: unlocked condition variable delay wait
-Iteration: 0
-Iteration: 1000
-Iteration: 2000
-Iteration: 3000
-Iteration: 4000
-Iteration: 5000
-Iteration: 6000
-Iteration: 7000
-Iteration: 8000
-Iteration: 9000
-Done Test 11
-Start Test 12: locked condition variable delay wait with unlocked signal
-Iteration: 0
-Iteration: 1000
-Iteration: 2000
-Iteration: 3000
-Iteration: 4000
-Iteration: 5000
-Iteration: 6000
-Iteration: 7000
-Iteration: 8000
-Iteration: 9000
-Done Test 12
-Start Test 13: locked condition variable delay wait with locked signal
-Iteration: 0
-Iteration: 1000
-Iteration: 2000
-Iteration: 3000
-Iteration: 4000
-Iteration: 5000
-Iteration: 6000
-Iteration: 7000
-Iteration: 8000
-Iteration: 9000
-Done Test 13

tests/unified_locking/locks.cfa

@@ -219 +219 @@
 int main() {
         processor p[2];
-        wait( c_s, 1`ns );
         printf("Start Test 1: multi acquisition lock and condition variable single wait/notify\n");
         {
@@ -281 +280 @@
         printf("Done Test 10\n");
 
-        printf("Start Test 11: unlocked condition variable delay wait\n");
-        {
-                T_C_NLWD t1;
-                T_C_WDS t2;
-        }
-        printf("Done Test 11\n");
-
-        printf("Start Test 12: locked condition variable delay wait with unlocked signal\n");
-        {
-                T_C_LWD t1;
-                T_C_WDS t2;
-        }
-        printf("Done Test 12\n");
-
-        printf("Start Test 13: locked condition variable delay wait with locked signal\n");
-        {
-                T_C_LWD t1;
-                T_C_LWDS t2;
-        }
-        printf("Done Test 13\n");
-}
+        // removed to limit test duration. Full test is in long run tests
+        // printf("Start Test 11: unlocked condition variable delay wait\n");
+        // {
+        //      T_C_NLWD t1;
+        //      T_C_WDS t2;
+        // }
+        // printf("Done Test 11\n");
+
+        // printf("Start Test 12: locked condition variable delay wait with unlocked signal\n");
+        // {
+        //      T_C_LWD t1;
+        //      T_C_WDS t2;
+        // }
+        // printf("Done Test 12\n");
+
+        // printf("Start Test 13: locked condition variable delay wait with locked signal\n");
+        // {
+        //      T_C_LWD t1;
+        //      T_C_LWDS t2;
+        // }
+        // printf("Done Test 13\n");
+}