Changeset a1ecdd1

Timestamp:

Dec 13, 2017, 9:11:25 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

1edf37f, 59073fd

Parents:

edb6f79

Message:

generic bounded buffer, not working

File:

• src/tests/concurrent/examples/boundedBuffer.c (modified) (7 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 : Tue Dec  5 23:01:51 2017
-// Update Count     : 10
+// Last Modified On : Wed Dec 13 21:01:49 2017
+// Update Count     : 27
 //
 
@@ -18 +18 @@
 #include <unistd.h>                                                                             // getpid
 
+forall( otype T )
 monitor Buffer {
         condition full, empty;
         int front, back, count;
-        int elements[20];
+        T elements[20];
 };
 
-void ?{}( Buffer & buffer ) {
+forall( otype T )
+void ?{}( Buffer(T) & buffer ) {
         buffer.front = buffer.back = buffer.count = 0;
 }
 
-int query( Buffer & buffer ) { return buffer.count; }
+forall( otype T )
+int query( Buffer(T) & buffer ) { return buffer.count; }
 
-void insert( Buffer & mutex buffer, int elem ) with( buffer ) {
+forall( otype T )
+void insert( Buffer(T) & mutex buffer, T elem ) with( buffer ) {
         if ( count == 20 ) wait( empty );
         elements[back] = elem;
@@ -37 +41 @@
         signal( full );
 }
-int remove( Buffer & mutex buffer ) with( buffer ) {
+
+forall( otype T )
+T remove( Buffer(T) & mutex buffer ) with( buffer ) {
         if ( count == 0 ) wait( full );
-        int elem = elements[front];
+        T elem = elements[front];
         front = ( front + 1 ) % 20;
         count -= 1;
@@ -47 +53 @@
 
 thread Producer {
-        Buffer & buffer;
+        Buffer(int) & buffer;
         unsigned int N;
 };
@@ -57 +63 @@
         insert( prod.buffer, -1 );
 }
-void ?{}( Producer & prod, Buffer * buffer, unsigned int N ) {
+void ?{}( Producer & prod, Buffer(int) * buffer, unsigned int N ) {
         &prod.buffer = buffer;
         prod.N = N;
-                }
+}
 
 thread Consumer {
-        Buffer & buffer;
+        Buffer(int) & buffer;
         int & sum;                                              // summation of producer values
 };
@@ -75 +81 @@
         } // for
 }
-void ?{}( Consumer & cons, Buffer * buffer, int * sum ) {
+void ?{}( Consumer & cons, Buffer(int) * buffer, int * sum ) {
         &cons.buffer = buffer;
         &cons.sum = sum;
@@ -81 +87 @@
 
 int main() {
-        Buffer buffer;
+        Buffer(int) buffer;
         enum { Prods = 5, Cons = 5 };
         Producer * prods[Prods];