Changeset 3d5701e for libcfa/src/executor.cfa

Timestamp:

Feb 25, 2020, 1:17:33 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

7dc2e015

Parents:

9fb8f01 (diff), dd9e1ca (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:

resolve conflict

File:

• libcfa/src/executor.cfa (modified) (2 diffs)

libcfa/src/executor.cfa

@@ -8 +8 @@
 #include <stdio.h>
 
-forall( otype T | is_node(T) | is_monitor(T) ) {
-    monitor Buffer {                                    // unbounded buffer
-        __queue_t( T ) queue;                           // unbounded list of work requests
-        condition delay;
-    }; // Buffer
-
+forall( dtype T )
+monitor Buffer {                                        // unbounded buffer
+    __queue_t( T ) queue;                               // unbounded list of work requests
+    condition delay;
+}; // Buffer
+forall( dtype T | is_node(T) ) {
     void insert( Buffer( T ) & mutex buf, T * elem ) with(buf) {
         append( queue, elem );                          // insert element into buffer
@@ -20 +20 @@
 
     T * remove( Buffer( T ) & mutex buf ) with(buf) {
-        if ( ! queue ) wait( delay );                   // no request to process ? => wait
-        return pop_head( queue );
+        if ( queue.head != 0 ) wait( delay );                   // no request to process ? => wait
+//      return pop_head( queue );
     } // remove
 } // distribution