Changeset d61d034

Timestamp:

Jan 13, 2023, 4:30:28 PM (16 months ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, master

Children:

34a1d2e, 997185e

Parents:

8bb86ce (diff), 42b739d7 (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

Files:

• libcfa/src/concurrency/channel.hfa (modified) (3 diffs)
• tests/concurrent/channels/parallel_harness.hfa (modified) (5 diffs)
• tests/concurrent/channels/zero_size.cfa (modified) (1 diff)

libcfa/src/concurrency/channel.hfa

@@ -35 +35 @@
 static inline void ?{}( channel(T) &c ){ ((channel(T) &)c){ 0 }; }
 static inline void ^?{}( channel(T) &c ) with(c) { delete( buffer ); }
-inline size_t get_count( channel(T) & chan ) with(chan) { return count; }
-inline size_t get_size( channel(T) & chan ) with(chan) { return size; }
+static inline size_t get_count( channel(T) & chan ) with(chan) { return count; }
+static inline size_t get_size( channel(T) & chan ) with(chan) { return size; }
+static inline bool has_waiters( channel(T) & chan ) with(chan) { return !empty( cons ) || !empty( prods ); }
+static inline bool has_waiting_consumers( channel(T) & chan ) with(chan) { return !empty( cons ); }
+static inline bool has_waiting_producers( channel(T) & chan ) with(chan) { return !empty( prods ); }
 
-inline void insert_( channel(T) & chan, T elem ) with(chan) {
+static inline void insert_( channel(T) & chan, T elem ) with(chan) {
     memcpy((void *)&buffer[back], (void *)&elem, sizeof(T));
     count += 1;
@@ -46 +49 @@
 
 
-inline void insert( channel(T) & chan, T elem ) with(chan) {
+static inline void insert( channel(T) & chan, T elem ) with(chan) {
     lock( mutex_lock );
 
@@ -72 +75 @@
 }
 
-inline T remove( channel(T) & chan ) with(chan) {
+static inline T remove( channel(T) & chan ) with(chan) {
     lock( mutex_lock );
     T retval;

tests/concurrent/channels/parallel_harness.hfa

@@ -38 +38 @@
 
 volatile bool cons_done = false, prod_done = false;
+volatile int cons_done_count = 0;
 size_t cons_check = 0, prod_check = 0;
 
@@ -64 +65 @@
     lock(o);
     total_operations += runs;
+    cons_done_count++;
     cons_check = cons_check ^ my_check;
     // sout | "C: " | runs;
@@ -128 +130 @@
     }
 
-    sleep(10`s);
+    sleep(1`s);
     prod_done = true;
 
@@ -137 +139 @@
     sout | "prods";
     cons_done = true;
-    for ( i; Channels ) {
-        // sout | get_count( channels[i] );
-        if ( get_count( channels[i] ) < Consumers ){
-            #ifdef BIG
-            bigObject b{0};
-            #endif
-            for ( j; Consumers ) {
+    while( cons_done_count != Consumers * Channels ) {
+        for ( i; Channels ) {
+            if ( has_waiting_consumers( channels[i] ) ){
                 #ifdef BIG
+                bigObject b{0};
                 insert( channels[i], b );
                 #else
@@ -151 +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 ) {

tests/concurrent/channels/zero_size.cfa

@@ -1 +1 @@
 #include "parallel_harness.hfa"
 
-size_t Processors = 10, Channels = 10, Producers = 40, Consumers = 40, ChannelSize = 0;
+size_t Processors = 10, Channels = 1, Producers = 10, Consumers = 10, ChannelSize = 0;
 
 int main() {