Changes in src/tests/boundedBuffer.c [6c7b1e7:4cedd9f]

File:

• src/tests/boundedBuffer.c (modified) (5 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
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Oct 30 23:02:46 2017
-// Update Count     : 9
-// 
+// Last Modified On : Mon Oct 30 18:00:10 2017
+// Update Count     : 7
+//
 
 #include <stdlib>
-#include <fstream>                                                                              // random
+#include <fstream>
 #include <kernel>
 #include <thread>
-#include <unistd.h>                                                                             // getpid
+#include <unistd.h>                                     // getpid
 
 monitor Buffer {
@@ -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;
 }
@@ -52 +52 @@
 void main( Producer & prod ) {
         for ( int i = 1; i <= prod.N; i += 1 ) {
-                yield( random( 5 ) );
+                yield( rand48( 5 ) );
                 insert( prod.buffer, 1 );
         } // for
@@ -69 +69 @@
         cons.sum = 0;
         for ( ;; ) {
-                yield( random( 5 ) );
+                yield( rand48( 5 ) );
                 int item = remove( cons.buffer );
                 if ( item == -1 ) break;                                // sentinel ?
@@ -90 +90 @@
         processor p;
 
-        //random_seed( getpid() );
-        random_seed( 1003 );
+        //rand48seed( getpid() );
+        rand48seed( 1003 );
 
         for ( i = 0; i < Cons; i += 1 ) {                       // create consumers