Changeset 3d5701e for tests/concurrent/signal

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

Location:

tests/concurrent/signal

Files:

• block.cfa (modified) (2 diffs)
• wait.cfa (modified) (4 diffs)

tests/concurrent/signal/block.cfa

@@ -33 +33 @@
 
 monitor global_data_t {
-        thread_desc * last_thread;
-        thread_desc * last_signaller;
+        $thread * last_thread;
+        $thread * last_signaller;
 };
 
@@ -82 +82 @@
         if( !is_empty( cond ) ) {
 
-                thread_desc * next = front( cond );
+                $thread * next = front( cond );
 
                 if( ! signal_block( cond ) ) {

tests/concurrent/signal/wait.cfa

@@ -98 +98 @@
         }
 
-        __sync_fetch_and_sub_4( &waiter_left, 1);
+        __atomic_fetch_sub( &waiter_left, 1,  __ATOMIC_SEQ_CST );
 }
 
@@ -109 +109 @@
         }
 
-        __sync_fetch_and_sub_4( &waiter_left, 1);
+        __atomic_fetch_sub( &waiter_left, 1,  __ATOMIC_SEQ_CST );
 }
 
@@ -120 +120 @@
         }
 
-        __sync_fetch_and_sub_4( &waiter_left, 1);
+        __atomic_fetch_sub( &waiter_left, 1,  __ATOMIC_SEQ_CST );
 }
 
@@ -131 +131 @@
         }
 
-        __sync_fetch_and_sub_4( &waiter_left, 1);
+        __atomic_fetch_sub( &waiter_left, 1,  __ATOMIC_SEQ_CST );
 }