Changeset 1afda5a2 for tests

Timestamp:

Dec 19, 2022, 9:37:55 PM (3 years ago)

Author:

caparsons <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

199456c, ebbe941

Parents:

8e64cb4 (diff), d18540f (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

Location:

tests/concurrent/pthread

Files:

• .expect/bounded_buffer.txt (modified) (1 diff)
• bounded_buffer.cfa (modified) (2 diffs)

tests/concurrent/pthread/.expect/bounded_buffer.txt

@@ -1 @@
-producer total value is 23426
-consumer total value is 23426
+producer total value is 24150
+consumer total value is 24150

tests/concurrent/pthread/bounded_buffer.cfa

@@ -63 +63 @@
 
 void *producer( void *arg ) {
-        Buffer(int) &buf = *(Buffer(int)*)arg;
-        const int NoOfItems = rand() % 40;
+    Buffer(int) &buf = *(Buffer(int)*)arg;
+        const int NoOfItems = prng(*active_thread(), 40);
         int item;
         for ( int i = 1; i <= NoOfItems; i += 1 ) {                     // produce a bunch of items
-                item = rand() % 100 + 1;                                                // produce a random number
+                item = prng(*active_thread(), 1, 101);                  // produce a random number
                 //sout | "Producer:" | pthread_self() | " value:" | item;
                 insert( buf,item );                                                             // insert element into queue
@@ -101 +101 @@
     pthread_mutex_init(&consumer_cnt_lock, NULL);
         // parallelism
-    srandom( 1003 );
+    set_seed( 1003 );
 
         processor p[5];