Changeset c76bd34 for tests/concurrent/park/contention.cfa

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

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

File:

• tests/concurrent/park/contention.cfa (modified) (2 diffs)

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 );
                 }