Changeset 3d5701e for tests/concurrent/preempt.cfa

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (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:

resolve conflict

File:

• tests/concurrent/preempt.cfa (modified) (1 diff)

tests/concurrent/preempt.cfa

@@ -36 +36 @@
                 if( (counter % 7) == this.value ) {
                         __cfaabi_check_preemption();
-                        int next = __atomic_add_fetch_4(&counter, 1, __ATOMIC_SEQ_CST);
+                        int next = __atomic_add_fetch( &counter, 1, __ATOMIC_SEQ_CST );
                         __cfaabi_check_preemption();
                         if( (next % 100) == 0 ) printf("%d\n", (int)next);