Changeset b110bcc for tests/concurrent/channels/parallel_harness.hfa

Timestamp:

Apr 21, 2023, 5:36:12 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, master

Children:

28f8f15, 6e4c44d

Parents:

2ed94a9 (diff), 699a97d (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:

• tests/concurrent/channels/parallel_harness.hfa (modified) (4 diffs)

tests/concurrent/channels/parallel_harness.hfa

@@ -100 +100 @@
 
 int test( size_t Processors, size_t Channels, size_t Producers, size_t Consumers, size_t ChannelSize ) {
-    size_t Clusters = 1;
+    size_t Clusters = Processors;
     // create a cluster
     cluster clus[Clusters];
@@ -108 +108 @@
     }
 
-    channels = anew( Channels );
+    channels = aalloc( Channels );
 
     // sout | "Processors: " | Processors | " ProdsPerChan: " | Producers | " ConsPerChan: " | Consumers | "Channels: " | Channels | " Channel Size: " | ChannelSize;
@@ -139 +139 @@
     while( cons_done_count != Consumers * Channels ) {
         for ( i; Channels ) {
-            if ( has_waiting_consumers( channels[i] ) ){
+            if ( has_waiters( channels[i] ) ){
                 #ifdef BIG
                 bigObject b{0};
@@ -150 +150 @@
         
     }
-    // for ( i; Channels ) {
-    //     // sout | get_count( channels[i] );
-    //     if ( get_count( channels[i] ) < Consumers ){
-    //         #ifdef BIG
-    //         bigObject b{0};
-    //         #endif
-    //         for ( j; Consumers ) {
-    //             #ifdef BIG
-    //             insert( channels[i], b );
-    //             #else
-    //             insert( channels[i], 0 );
-    //             #endif
-    //         }
-    //     }
-    // }
+
     sout | "cons";
     for ( i; Consumers * Channels ) {