Changeset c76bd34 for tests/concurrent/park

Timestamp:

Oct 7, 2020, 4:31:43 PM (5 years ago)

Author:

Colby Alexander Parsons <caparsons@…>

Branches:

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

Children:

848439f

Parents:

ae2c27a (diff), 597c5d18 (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 into master

Location:

tests/concurrent/park

Files:

• .expect/force_preempt.txt (modified) (1 diff)
• .expect/start_parked.txt (modified) (1 diff)
• contention.cfa (modified) (2 diffs)
• force_preempt.cfa (modified) (3 diffs)
• start_parked.cfa (modified) (1 diff)

tests/concurrent/park/.expect/force_preempt.txt

@@ +1 @@
+done

tests/concurrent/park/.expect/start_parked.txt

@@ +1 @@
+done

tests/concurrent/park/contention.cfa

@@ -21 +21 @@
                 if(blocked[idx]) {
                         Thread * thrd = __atomic_exchange_n(&blocked[idx], 0p, __ATOMIC_SEQ_CST);
-                        unpark( *thrd __cfaabi_dbg_ctx2 );
+                        unpark( *thrd );
                 } else {
                         Thread * thrd = __atomic_exchange_n(&blocked[idx], &this, __ATOMIC_SEQ_CST);
-                        unpark( *thrd __cfaabi_dbg_ctx2 );
-                        park( __cfaabi_dbg_ctx );
+                        unpark( *thrd );
+                        park();
                 }
         }
@@ -41 +41 @@
                         int idx = myrand() % blocked_size;
                         Thread * thrd = __atomic_exchange_n(&blocked[idx], 0p, __ATOMIC_SEQ_CST);
-                        unpark( *thrd __cfaabi_dbg_ctx2 );
+                        unpark( *thrd );
                         yield( myrand() % 20 );
                 }

tests/concurrent/park/force_preempt.cfa

@@ -30 +30 @@
 
                 // Unpark this thread, don't force a yield
-                unpark( this __cfaabi_dbg_ctx2 );
+                unpark( this );
                 assert(mask == 0xCAFEBABA);
 
@@ -43 +43 @@
                 // Park this thread,
                 assert(mask == (id_hash ^ 0xCAFEBABA));
-                park( __cfaabi_dbg_ctx );
+                park();
                 assert(mask == (id_hash ^ 0xCAFEBABA));
 
@@ -57 +57 @@
                 Waiter waiters[5];
         }
+        printf( "done\n" );                             // non-empty .expect file
 }

tests/concurrent/park/start_parked.cfa

@@ -3 +3 @@
 thread Parker {};
 void main( Parker & ) {
-      park( __cfaabi_dbg_ctx );
+        park();
 }
 
 int main() {
-      for(1000) {
-            Parker parker;
-            unpark( parker __cfaabi_dbg_ctx2 );
-      }
+        for(1000) {
+                Parker parker;
+                unpark( parker );
+        }
+        printf( "done\n" );                                                                     // non-empty .expect file
 }