Changeset 16988e8 for src/tests/concurrent/examples/boundedBuffer.c

Timestamp:

Dec 6, 2017, 11:49:36 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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, resolv-new, with_gc

Children:

16a63a78

Parents:

a85e44c (diff), 971d9f2 (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

File:

• src/tests/concurrent/examples/boundedBuffer.c (modified) (2 diffs)

src/tests/concurrent/examples/boundedBuffer.c

@@ -8 +8 @@
 // Created On       : Mon Oct 30 12:45:13 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Oct 30 23:02:46 2017
-// Update Count     : 9
+// Last Modified On : Tue Dec  5 23:01:51 2017
+// Update Count     : 10
 //
 
@@ -30 +30 @@
 int query( Buffer & buffer ) { return buffer.count; }
 
-void insert( Buffer & mutex buffer, int elem ) {
-        if ( buffer.count == 20 ) wait( buffer.empty );
-        buffer.elements[buffer.back] = elem;
-        buffer.back = ( buffer.back + 1 ) % 20;
-        buffer.count += 1;
-        signal( buffer.full );
+void insert( Buffer & mutex buffer, int elem ) with( buffer ) {
+        if ( count == 20 ) wait( empty );
+        elements[back] = elem;
+        back = ( back + 1 ) % 20;
+        count += 1;
+        signal( full );
 }
-int remove( Buffer & mutex buffer ) {
-        if ( buffer.count == 0 ) wait( buffer.full );
-        int elem = buffer.elements[buffer.front];
-        buffer.front = ( buffer.front + 1 ) % 20;
-        buffer.count -= 1;
-        signal( buffer.empty );
+int remove( Buffer & mutex buffer ) with( buffer ) {
+        if ( count == 0 ) wait( full );
+        int elem = elements[front];
+        front = ( front + 1 ) % 20;
+        count -= 1;
+        signal( empty );
         return elem;
 }