Changeset 2c24971

Timestamp:

May 11, 2023, 8:28:12 PM (2 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master

Children:

8fa3b660

Parents:

9eb7f07c (diff), 7b53bfd (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) (1 diff)
• tests/concurrent/channels/.expect/handoff.txt (added)
• tests/concurrent/channels/handoff.cfa (added)
• tests/concurrent/waituntil/.expect/one_chan_spin.txt (added)
• tests/concurrent/waituntil/one_chan.cfa (modified) (2 diffs)
• tests/concurrent/waituntil/one_chan_spin.cfa (added)

libcfa/src/concurrency/channel.hfa

@@ -73 +73 @@
     if ( size != 0 ) delete( buffer );
 }
-static inline size_t get_count( channel(T) & chan ) with(chan) { return count; }
+static inline size_t get_count( channel(T) & chan ) with(chan) { return __atomic_load_n( &count, __ATOMIC_SEQ_CST); }
 static inline size_t get_size( channel(T) & chan ) with(chan) { return size; }
 static inline bool has_waiters( channel(T) & chan ) with(chan) { return !cons`isEmpty || !prods`isEmpty; }

tests/concurrent/waituntil/one_chan.cfa

@@ -37 +37 @@
         printf("waiting for empty channels\n");
         LINE_COUNTER = 3;
-        size_t C_count = get_count( C );
-        LINE_COUNTER = 5;
-        while( C_count > 0 ) { 
-            C_count = get_count( C );
-        }
+        // size_t C_count = get_count( C );
+        // LINE_COUNTER = 5;
+        // while( C_count > 0 ) { 
+        //     C_count = get_count( C );
+        // }
         LINE_COUNTER = 7;
         printf("sending sentinels\n");
@@ -50 +50 @@
         LINE_COUNTER = 17;
     }
+    assert(get_count( C ) == 0);
     LINE_COUNTER = 19;
     if ( total != globalTotal )