Changeset 5a46e09 for tests

Timestamp:

Jun 29, 2021, 5:33:38 PM (3 years ago)

Author:

caparsons <caparson@…>

Branches:

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

Children:

660665f

Parents:

bae0d35

Message:

Added Martins SpinCondLock? as linear_backoff_then_block lock

Location:

tests/unified_locking

Files:

• .expect/locks.txt (modified) (1 diff)
• locks.cfa (modified) (3 diffs)

tests/unified_locking/.expect/locks.txt

@@ -15 +15 @@
 Start Test 8: fast lock and condition variable 3 wait/notify all
 Done Test 8
-Start Test 9: multi acquisiton lock and condition variable multiple acquire and wait/notify
+Start Test 9: linear backoff lock and condition variable single wait/notify
 Done Test 9
-Start Test 10: owner lock and condition variable multiple acquire and wait/notify
+Start Test 10: linear backoff lock and condition variable 3 wait/notify all
 Done Test 10
-Start Test 11: no lock condition variable wait/notify
+Start Test 11: multi acquisiton lock and condition variable multiple acquire and wait/notify
 Done Test 11
-Start Test 12: locked condition variable wait/notify with front()
+Start Test 12: owner lock and condition variable multiple acquire and wait/notify
 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

@@ -18 +18 @@
 condition_variable( fast_lock ) c_f;
 
+linear_backoff_then_block_lock l;
+condition_variable( linear_backoff_then_block_lock ) c_l;
+
 thread T_C_M_WS1 {};
 
@@ -99 +102 @@
                 }
                 unlock(f);
+        }
+}
+
+thread T_C_L_WS1 {};
+
+void main( T_C_L_WS1 & this ) {
+        for (unsigned int i = 0; i < num_times; i++) {
+                lock(l);
+                if(empty(c_l) && i != num_times - 1) {
+                        wait(c_l,l);
+                }else{
+                        notify_one(c_l);
+                }
+                unlock(l);
+        }
+}
+
+thread T_C_L_WB1 {};
+
+void main( T_C_L_WB1 & this ) {
+        for (unsigned int i = 0; i < num_times; i++) {
+                lock(l);
+                if(counter(c_l) == 3 || i == num_times - 1) {
+                        notify_all(c_l);
+                }else{
+                        wait(c_l,l);
+                }
+                unlock(l);
         }
 }
@@ -298 +329 @@
         printf("Done Test 8\n");
 
-        printf("Start Test 9: multi acquisiton lock and condition variable multiple acquire and wait/notify\n");
+        printf("Start Test 9: linear backoff lock and condition variable single wait/notify\n");
+        {
+                T_C_L_WS1 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("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 9\n");
-
-        printf("Start Test 10: owner lock and condition variable multiple acquire and wait/notify\n");
+        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 10\n");
-
-        printf("Start Test 11: no lock condition variable wait/notify\n");
+        printf("Done Test 12\n");
+
+        printf("Start Test 13: no lock condition variable wait/notify\n");
         {
                 T_C_NLW t1;
                 T_C_NLS t2;
         }
-        printf("Done Test 11\n");
-
-        printf("Start Test 12: locked condition variable wait/notify with front()\n");
+        printf("Done Test 13\n");
+
+        printf("Start Test 14: locked condition variable wait/notify with front()\n");
         {
                 T_C_S_WNF t1[2];
         }
-        printf("Done Test 12\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");
-}
+        printf("Done Test 14\n");
+}