Changeset a51c0c0

Timestamp:

May 25, 2020, 5:38:15 PM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

c1dfa4e

Parents:

089ee6b

Message:

formatting, change buffer remove to not block for empty buffer so worker spins

File:

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

libcfa/src/executor.cfa

@@ -4 +4 @@
 // buffer.
 
+#include <thread.hfa>
 #include <containers/list.hfa>
-#include <thread.hfa>
-//#include <malloc.h>                                                                           // trace
 
 forall( dtype T | $dlistable(T, T) ) {
@@ -22 +21 @@
         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 ) wait( delay );                       // no request to process ? => wait
+          if ( (*qptr)`is_empty ) return 0p;                            // no request to process ? => wait
                 return &pop_first( *qptr );
         } // remove
-
-//      void ?{}( Buffer(T) & ) {}
-//      void ^?{}( Buffer(T) & mutex ) {}
 } // forall
 
@@ -74 +71 @@
         unsigned int nprocessors, nworkers, nrqueues;           // number of processors/threads/request queues
         bool sepClus;                                                                           // use same or separate cluster for executor
+        unsigned int next;                                                                      // demultiplexed across worker buffers
 }; // Executor
-
-static thread_local unsigned int next;                                  // demultiplexed across worker buffers
 
 unsigned int tickets( Executor & ex ) with(ex) {
@@ -109 +105 @@
         ex{ nprocessors, nprocessors, nprocessors, sepClus };
 }
-void ?{}( Executor & ex ) {                                                             // special for current cluster
+void ?{}( Executor & ex ) {                                                             // special for current cluster, no processors added
         ex{ 0, active_cluster()->nprocessors, false };
 }
@@ -131 +127 @@
         free( workers );
 //      adelete( nrqueues, requests );
-        for ( i; nrqueues ) ^?{}( requests[i] );
+        for ( i; nrqueues ) ^?{}( requests[i] );                        // FIX ME: problem with resolver
         free( requests );
         free( processors );
@@ -145 +141 @@
 int counter = 0;
 
-void workie( void ) {
+void work( void ) {
         __atomic_add_fetch( &counter, 1, __ATOMIC_SEQ_CST );
-//      fprintf( stderr, "workie\n" );
+        // fprintf( stderr, "workie\n" );
 }
 
@@ -155 +151 @@
         processor p[7];
         {
-                printf( "%d\n", active_cluster()->nprocessors );
                 Executor exector;
                 for ( i; times ) {
-                        send( exector, workie );
-                        if ( i % 100 == 0 ) {
-//                        fprintf( stderr, "%d\n", i );
-                                yield();
-                        }
+                        send( exector, work );
+                        if ( i % 100 == 0 ) yield();
                 } // for
         }