Changeset 1dec8f3 for tests/concurrency

Timestamp:

Sep 22, 2025, 2:33:42 PM (5 months ago)

Author:

Michael Brooks <mlbrooks@…>

Branches:

master, stuck-waitfor-destruct

Children:

bb5b866

Parents:

7ca6bf1 (diff), 295ed2d1 (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 remote-tracking branch 'refs/remotes/origin/master'

Location:

tests/concurrency

Files:

• futures/.expect/select_future.txt.off (moved) (moved from tests/concurrency/futures/.expect/select_future.txt )
• unified_locking/locks.cfa (modified) (1 diff)
• unified_locking/pthread_locks.cfa (modified) (1 diff)
• unified_locking/timeout_lock.cfa (modified) (2 diffs)

tests/concurrency/unified_locking/locks.cfa

@@ -7 +7 @@
 
 multiple_acquisition_lock m;
-condition_variable( multiple_acquisition_lock ) c_m;
+cond_lock( multiple_acquisition_lock ) c_m;
 
 single_acquisition_lock s;
-condition_variable( single_acquisition_lock ) c_s;
+cond_lock( single_acquisition_lock ) c_s;
 
 owner_lock o;
-condition_variable( owner_lock ) c_o;
+cond_lock( owner_lock ) c_o;
 
 exp_backoff_then_block_lock l;
-condition_variable( exp_backoff_then_block_lock ) c_l;
+cond_lock( exp_backoff_then_block_lock ) c_l;
 
 fast_block_lock f;

tests/concurrency/unified_locking/pthread_locks.cfa

@@ -12 +12 @@
 
 owner_lock l2;
-condition_variable( owner_lock ) c2;
+cond_lock( owner_lock ) c2;
 
 volatile int counter = 0;

tests/concurrency/unified_locking/timeout_lock.cfa

@@ -7 +7 @@
 
 multiple_acquisition_lock m, n;
-condition_variable( multiple_acquisition_lock ) c_m, c_n;
+cond_lock( multiple_acquisition_lock ) c_m, c_n;
 
 const unsigned int NoOfTimes = 20;
@@ -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, 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 );
-        lock(m); wait( c_m, m, 10, 1`ns ); unlock(m);                                                   // bool wait( condition_variable(L) & this, L & l, uintptr_t info, Duration duration );
+        wait( c_m, 1`ns );                                                                                                              // bool wait( cond_lock(L) & this, Duration duration );
+        wait( c_m, 10, 1`ns );                                                                                                  // bool wait( cond_lock(L) & this, uintptr_t info, Duration duration );
+        lock(m); wait( c_m, m, 1`ns ); unlock(m);                                                               // bool wait( cond_lock(L) & this, L & l, Duration duration );
+        lock(m); wait( c_m, m, 10, 1`ns ); unlock(m);                                                   // bool wait( cond_lock(L) & this, L & l, uintptr_t info, Duration duration );
         printf("Done Test 1\n");