Changeset 8d66610 for tests/unified_locking/timeout_lock.cfa

Timestamp:

May 21, 2021, 4:48:10 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

f1bce515

Parents:

5407cdc (diff), 7404cdc (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

File:

• tests/unified_locking/timeout_lock.cfa (modified) (3 diffs)

tests/unified_locking/timeout_lock.cfa

@@ -33 +33 @@
 
         for ( unsigned int i = 0; i < NoOfTimes + 3; i += 1 ) {
-            if ( wait( c_m, m, 1`s ) ) { 
+            if ( wait( c_m, m, 1000000`ns ) ) { 
                         // printf("Thread: %p signalled\n", active_thread()); // removed since can't expect non deterministic output
             } else {
@@ -51 +51 @@
         // Test calls which occur increasingly close to timeout value.
 
-        sleep( 100000000`ns );
+        sleep( 100000`ns );
         notify_one(c_m);
         block();
 
-        sleep( 500000000`ns );
+        sleep( 500000`ns );
         notify_one(c_m);
         block();
 
-        sleep( 900000000`ns );
+        sleep( 900000`ns );
         notify_one(c_m);
         block();
 
         for ( unsigned int i = 0; i < NoOfTimes; i += 1 ) {
-            sleep( 999700000`ns );
+            sleep( 999700`ns );
                 notify_one(c_m);
             block();
@@ -75 +75 @@
         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 );
-        wait( c_m, __kernel_get_time() + 1`ns );                                                                // bool wait( condition_variable(L) & this, Time time );
-        wait( c_m, 10, __kernel_get_time() + 1`ns );                                                    // bool wait( condition_variable(L) & this, uintptr_t info, Time time );
         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 );
-        lock(m); wait( c_m, m, __kernel_get_time() + 1`ns ); unlock(m);                 // bool wait( condition_variable(L) & this, L & l, Time time );
-        lock(m); wait( c_m, m, 10, __kernel_get_time() + 1`ns ); unlock(m);             // bool wait( condition_variable(L) & this, L & l, uintptr_t info, Time time );
         printf("Done Test 1\n");