Changeset e2f601f for libcfa/src/executor.cfa

Timestamp:

May 13, 2021, 3:49:30 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

aff7e86, c457dc41

Parents:

8cd5434 (diff), 69914cbc (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/executor.cfa (modified) (2 diffs)

libcfa/src/executor.cfa

@@ -7 +7 @@
 #include <containers/list.hfa>
 
-forall( T & | $dlistable(T, T) ) {
+forall( T &, TLink& = dlink(T) | embedded(T, TLink, dlink(T)) ) {
         monitor Buffer {                                                                        // unbounded buffer
-                dlist( T, T ) queue;                                                    // unbounded list of work requests
+                dlist( T, TLink ) queue;                                                // unbounded list of work requests
                 condition delay;
         }; // Buffer
 
-        void insert( Buffer(T) & mutex buf, T * elem ) with(buf) {
-                dlist( T, T ) * qptr = &queue;                                  // workaround https://cforall.uwaterloo.ca/trac/ticket/166
+        void insert( Buffer(T, TLink) & mutex buf, T * elem ) with(buf) {
+                dlist( T, TLink ) * qptr = &queue;                              // workaround https://cforall.uwaterloo.ca/trac/ticket/166
                 insert_last( *qptr, *elem );                                    // insert element into buffer
                 signal( delay );                                                                // restart
         } // insert
 
-        T * remove( Buffer(T) & mutex buf ) with(buf) {
-                dlist( T, T ) * qptr = &queue;                                  // workaround https://cforall.uwaterloo.ca/trac/ticket/166
-                // if ( (*qptr)`is_empty ) wait( delay );                       // no request to process ? => wait
-          if ( (*qptr)`is_empty ) return 0p;                            // no request to process ? => wait
-                return &pop_first( *qptr );
+        T * remove( Buffer(T, TLink) & mutex buf ) with(buf) {
+                dlist( T, TLink ) * qptr = &queue;                              // workaround https://cforall.uwaterloo.ca/trac/ticket/166
+                // if ( (*qptr)`isEmpty ) wait( delay );                // no request to process ? => wait
+          if ( (*qptr)`isEmpty ) return 0p;                                     // no request to process ? => wait
+                return &try_pop_front( *qptr );
         } // remove
 } // forall
@@ -29 +29 @@
 struct WRequest {                                                                               // client request, no return
         void (* action)( void );
-        DLISTED_MGD_IMPL_IN(WRequest)
+        inline dlink(WRequest);
 }; // WRequest
-DLISTED_MGD_IMPL_OUT(WRequest)
+P9_EMBEDDED(WRequest, dlink(WRequest))
 
 void ?{}( WRequest & req ) with(req) { action = 0; }