Changes in / [2daea42:302ef2a]

Files:

• doc/working/unified_semaphores/semaphore.cfa (deleted)
• doc/working/unified_semaphores/semaphore.hfa (deleted)
• longrun_tests/Makefile.am (modified) (1 diff)
• longrun_tests/locks.cfa (deleted)
• 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 locks processor stack wait yield
+TESTS = block coroutine create disjoint enter enter3 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");
         {
@@ -280 +281 @@
         printf("Done Test 10\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("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");
+}