Changeset 4ee36bf0 for src/tests/boundedBuffer.c

Timestamp:

Nov 8, 2017, 2:50:35 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

049ead9

Parents:

136ccd7 (diff), e35f30a (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 cleanup-dtors

File:

• src/tests/boundedBuffer.c (modified) (3 diffs)

src/tests/boundedBuffer.c

@@ -1 @@
-// 
+//
 // The contents of this file are covered under the licence agreement in the
 // file "LICENCE" distributed with Cforall.
-// 
-// boundedBuffer.c -- 
-// 
+//
+// boundedBuffer.c --
+//
 // Author           : Peter A. Buhr
 // Created On       : Mon Oct 30 12:45:13 2017
@@ -10 +10 @@
 // Last Modified On : Mon Oct 30 23:02:46 2017
 // Update Count     : 9
-// 
+//
 
 #include <stdlib>
@@ -31 +31 @@
 
 void insert( Buffer & mutex buffer, int elem ) {
-        if ( buffer.count == 20 ) wait( &buffer.empty );
+        if ( buffer.count == 20 ) wait( buffer.empty );
         buffer.elements[buffer.back] = elem;
         buffer.back = ( buffer.back + 1 ) % 20;
         buffer.count += 1;
-        signal( &buffer.full );
+        signal( buffer.full );
 }
 int remove( Buffer & mutex buffer ) {
-        if ( buffer.count == 0 ) wait( &buffer.full );
+        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 );
+        signal( buffer.empty );
         return elem;
 }