Changeset a77f25b for tests

Timestamp:

Jan 17, 2022, 4:44:58 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

e57de69, f55f110

Parents:

0c51f9ad (diff), 0fc447c (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:

• concurrent/.expect/semaphore.txt (deleted)
• concurrent/.expect/spinaphore.txt (deleted)
• concurrent/semaphore.cfa (deleted)
• concurrent/spinaphore.cfa (deleted)
• device/cpu.cfa (modified) (3 diffs)
• unified_locking/.expect/locks.txt (modified) (1 diff)
• unified_locking/locks.cfa (modified) (3 diffs)
• zombies/fastlock.cfa (deleted)

tests/device/cpu.cfa

@@ -15 +15 @@
 
 
+#include <device/cpu.hfa>
+#include <limits.hfa>
 #include <fstream.hfa>
-#include <device/cpu.hfa>
 #include <stdlib.hfa>
 
@@ -118 +119 @@
 
         unsigned found_level = 0;
-        unsigned found = -1u;
+        unsigned found = MAX;
         for(i; idxs) {
                 unsigned idx = idxs - 1 - i;
@@ -136 +137 @@
         }
 
-        /* paranoid */ verify(found != -1u);
+        /* paranoid */ verify(found != MAX);
         return found;
 }

tests/unified_locking/.expect/locks.txt

@@ -11 +11 @@
 Start Test 6: owner lock and condition variable 3 wait/notify all
 Done Test 6
-Start Test 7: fast lock and condition variable single wait/notify
+Start Test 7: linear backoff lock and condition variable single wait/notify
 Done Test 7
-Start Test 8: fast lock and condition variable 3 wait/notify all
+Start Test 8: linear backoff lock and condition variable 3 wait/notify all
 Done Test 8
-Start Test 9: linear backoff lock and condition variable single wait/notify
+Start Test 9: multi acquisiton lock and condition variable multiple acquire and wait/notify
 Done Test 9
-Start Test 10: linear backoff lock and condition variable 3 wait/notify all
+Start Test 10: owner lock and condition variable multiple acquire and wait/notify
 Done Test 10
-Start Test 11: multi acquisiton lock and condition variable multiple acquire and wait/notify
+Start Test 11: no lock condition variable wait/notify
 Done Test 11
-Start Test 12: owner lock and condition variable multiple acquire and wait/notify
+Start Test 12: locked condition variable wait/notify with front()
 Done Test 12
-Start Test 13: no lock condition variable wait/notify
-Done Test 13
-Start Test 14: locked condition variable wait/notify with front()
-Done Test 14

tests/unified_locking/locks.cfa

@@ -15 +15 @@
 condition_variable( owner_lock ) c_o;
 
-fast_lock f;
-condition_variable( fast_lock ) c_f;
-
 linear_backoff_then_block_lock l;
 condition_variable( linear_backoff_then_block_lock ) c_l;
@@ -74 +71 @@
                 }
                 unlock(s);
-        }
-}
-
-thread T_C_F_WS1 {};
-
-void main( T_C_F_WS1 & this ) {
-        for (unsigned int i = 0; i < num_times; i++) {
-                lock(f);
-                if(empty(c_f) && i != num_times - 1) {
-                        wait(c_f,f);
-                }else{
-                        notify_one(c_f);
-                }
-                unlock(f);
-        }
-}
-
-thread T_C_F_WB1 {};
-
-void main( T_C_F_WB1 & this ) {
-        for (unsigned int i = 0; i < num_times; i++) {
-                lock(f);
-                if(counter(c_f) == 3 || i == num_times - 1) {
-                        notify_all(c_f);
-                }else{
-                        wait(c_f,f);
-                }
-                unlock(f);
         }
 }
@@ -317 +286 @@
         printf("Done Test 6\n");
 
-        printf("Start Test 7: fast lock and condition variable single wait/notify\n");
-        {
-                T_C_F_WS1 t1[2];
+        printf("Start Test 7: linear backoff lock and condition variable single wait/notify\n");
+        {
+                T_C_L_WS1 t1[2];
         }
         printf("Done Test 7\n");
 
-        printf("Start Test 8: fast lock and condition variable 3 wait/notify all\n");
-        {
-                T_C_F_WB1 t1[4];
+        printf("Start Test 8: linear backoff lock and condition variable 3 wait/notify all\n");
+        {
+                T_C_L_WB1 t1[4];
         }
         printf("Done Test 8\n");
 
-        printf("Start Test 9: linear backoff lock and condition variable single wait/notify\n");
-        {
-                T_C_L_WS1 t1[2];
+        printf("Start Test 9: multi acquisiton lock and condition variable multiple acquire and wait/notify\n");
+        {
+                T_C_M_WS2 t1[2];
         }
         printf("Done Test 9\n");
 
-        printf("Start Test 10: linear backoff lock and condition variable 3 wait/notify all\n");
-        {
-                T_C_L_WB1 t1[4];
+        printf("Start Test 10: owner lock and condition variable multiple acquire and wait/notify\n");
+        {
+                T_C_O_WS2 t1[2];
         }
         printf("Done Test 10\n");
 
-        printf("Start Test 11: multi acquisiton lock and condition variable multiple acquire and wait/notify\n");
-        {
-                T_C_M_WS2 t1[2];
-        }
-        printf("Done Test 11\n");
-
-        printf("Start Test 12: owner lock and condition variable multiple acquire and wait/notify\n");
-        {
-                T_C_O_WS2 t1[2];
-        }
-        printf("Done Test 12\n");
-
-        printf("Start Test 13: no lock condition variable wait/notify\n");
+        printf("Start Test 11: no lock condition variable wait/notify\n");
         {
                 T_C_NLW t1;
                 T_C_NLS t2;
         }
-        printf("Done Test 13\n");
-
-        printf("Start Test 14: locked condition variable wait/notify with front()\n");
+        printf("Done Test 11\n");
+
+        printf("Start Test 12: locked condition variable wait/notify with front()\n");
         {
                 T_C_S_WNF t1[2];
         }
-        printf("Done Test 14\n");
-}
+        printf("Done Test 12\n");
+}