Changeset 779a4a3 for src/tests

Timestamp:

May 3, 2018, 4:33:19 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

f3152ab

Parents:

f465f0e (diff), c9d5c4f (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' into fix-reference-overloading

Location:

src/tests/concurrent

Files:

• examples/boundedBufferEXT.c (modified) (2 diffs)
• examples/boundedBufferINT.c (modified) (2 diffs)
• preempt.c (modified) (2 diffs)

src/tests/concurrent/examples/boundedBufferEXT.c

@@ -8 +8 @@
 // Created On       : Wed Apr 18 22:52:12 2018
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Apr 20 22:25:14 2018
-// Update Count     : 6
+// Last Modified On : Wed May  2 16:12:58 2018
+// Update Count     : 7
 //
 
@@ -22 +22 @@
 enum { BufferSize = 50 };
 
-forall( otype T )
-monitor Buffer {
-        int front, back, count;
-        T elements[BufferSize];
-};
+forall( otype T ) {
+        monitor Buffer {
+                int front, back, count;
+                T elements[BufferSize];
+        }; // Buffer
 
-forall( otype T )
-void ?{}( Buffer(T) & buffer ) with( buffer ) { [front, back, count] = 0; }
+        void ?{}( Buffer(T) & buffer ) with( buffer ) { [front, back, count] = 0; }
 
-forall( otype T )
-int query( Buffer(T) & buffer ) { return buffer.count; }
+        int query( Buffer(T) & buffer ) { return buffer.count; } // read-only, no mutual exclusion
 
-forall( otype T )                                                                               // forward
-T remove( Buffer(T) & mutex buffer );
+        T remove( Buffer(T) & mutex buffer );                           // forward
 
-forall( otype T )
-void insert( Buffer(T) & mutex buffer, T elem ) with( buffer ) {
-        if ( count == BufferSize ) waitfor( remove, buffer );
-        elements[back] = elem;
-        back = ( back + 1 ) % BufferSize;
-        count += 1;
-}
+        void insert( Buffer(T) & mutex buffer, T elem ) with( buffer ) {
+                if ( count == BufferSize ) waitfor( remove, buffer );
+                elements[back] = elem;
+                back = ( back + 1 ) % BufferSize;
+                count += 1;
+        } // insert
 
-forall( otype T )
-T remove( Buffer(T) & mutex buffer ) with( buffer ) {
-        if ( count == 0 ) waitfor( insert, buffer );
-        T elem = elements[front];
-        front = ( front + 1 ) % BufferSize;
-        count -= 1;
-        return elem;
+        T remove( Buffer(T) & mutex buffer ) with( buffer ) {
+                if ( count == 0 ) waitfor( insert, buffer );
+                T elem = elements[front];
+                front = ( front + 1 ) % BufferSize;
+                count -= 1;
+                return elem;
+        } // remove
 }
 

src/tests/concurrent/examples/boundedBufferINT.c

@@ -8 +8 @@
 // Created On       : Mon Oct 30 12:45:13 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Apr 20 22:18:18 2018
-// Update Count     : 78
+// Last Modified On : Thu Apr 26 23:08:17 2018
+// Update Count     : 82
 //
 
@@ -22 +22 @@
 enum { BufferSize = 50 };
 
-forall( otype T )
-monitor Buffer {
-        condition full, empty;
-        int front, back, count;
-        T elements[BufferSize];
-};
+forall( otype T ) {
+        monitor Buffer {
+                condition full, empty;
+                int front, back, count;
+                T elements[BufferSize];
+        }; // Buffer
 
-forall( otype T )
-void ?{}( Buffer(T) & buffer ) with( buffer ) { [front, back, count] = 0; }
+        void ?{}( Buffer(T) & buffer ) with( buffer ) { [front, back, count] = 0; }
 
-forall( otype T )
-int query( Buffer(T) & buffer ) { return buffer.count; }
+        int query( Buffer(T) & buffer ) { return buffer.count; } // read-only, no mutual exclusion
 
-forall( otype T )
-void insert( Buffer(T) & mutex buffer, T elem ) with( buffer ) {
-        if ( count == BufferSize ) wait( empty );
-        elements[back] = elem;
-        back = ( back + 1 ) % BufferSize;
-        count += 1;
-        signal( full );
-}
+        void insert( Buffer(T) & mutex buffer, T elem ) with( buffer ) {
+                if ( count == BufferSize ) wait( empty );
+                elements[back] = elem;
+                back = ( back + 1 ) % BufferSize;
+                count += 1;
+                signal( full );
+        } // insert
 
-forall( otype T )
-T remove( Buffer(T) & mutex buffer ) with( buffer ) {
-        if ( count == 0 ) wait( full );
-        T elem = elements[front];
-        front = ( front + 1 ) % BufferSize;
-        count -= 1;
-        signal( empty );
-        return elem;
+        T remove( Buffer(T) & mutex buffer ) with( buffer ) {
+                if ( count == 0 ) wait( full );
+                T elem = elements[front];
+                front = ( front + 1 ) % BufferSize;
+                count -= 1;
+                signal( empty );
+                return elem;
+        } // remove
 }
 

src/tests/concurrent/preempt.c

@@ -17 +17 @@
 #endif
 
+extern void __cfaabi_check_preemption();
+
 static volatile int counter = 0;
 
@@ -29 +31 @@
 void main(worker_t & this) {
         while(counter < N) {
+                __cfaabi_check_preemption();
                 if( (counter % 7) == this.value ) {
+                        __cfaabi_check_preemption();
                         int next = __atomic_add_fetch_4(&counter, 1, __ATOMIC_SEQ_CST);
+                        __cfaabi_check_preemption();
                         if( (next % 100) == 0 ) printf("%d\n", (int)next);
+                        __cfaabi_check_preemption();
                 }
+                __cfaabi_check_preemption();
         }
 }