Changeset d61d034 for libcfa/src/concurrency

Timestamp:

Jan 13, 2023, 4:30:28 PM (23 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

File:

• libcfa/src/concurrency/channel.hfa (modified) (3 diffs)

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;