Changeset 8b74fa7 for libcfa/src

Timestamp:

Oct 27, 2022, 11:20:19 AM (2 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master

Children:

a167c70c

Parents:

878cfcc

Message:

cluster now support 'set_concurrency' which addes/removes processors internal to clusters

Location:

libcfa/src/concurrency

Files:

• kernel.hfa (modified) (3 diffs)
• kernel/startup.cfa (modified) (6 diffs)

libcfa/src/concurrency/kernel.hfa

@@ -160 +160 @@
 // P9_EMBEDDED( processor, dlink(processor) )
 static inline tytagref( dlink(processor), dlink(processor) ) ?`inner( processor & this ) {
-    dlink(processor) & b = this.link;
-    tytagref( dlink(processor), dlink(processor) ) result = { b };
-    return result;
+        dlink(processor) & b = this.link;
+        tytagref( dlink(processor), dlink(processor) ) result = { b };
+        return result;
 }
 
@@ -269 +269 @@
                 io_context_params params;
         } io;
+
+        struct {
+                struct processor ** procs;
+                unsigned cnt;
+        } managed;
 
         #if !defined(__CFA_NO_STATISTICS__)
@@ -298 +303 @@
 static inline struct cluster   * active_cluster  () { return publicTLS_get( this_processor )->cltr; }
 
+// set the number of internal processors
+// these processors are in addition to any explicitly declared processors
+unsigned set_concurrency( cluster & this, unsigned new_count );
+
 #if !defined(__CFA_NO_STATISTICS__)
         void print_stats_now( cluster & this, int flags );

libcfa/src/concurrency/kernel/startup.cfa

@@ -16 +16 @@
 #define __cforall_thread__
 #define _GNU_SOURCE
+
+// #define __CFA_DEBUG_PRINT_RUNTIME_CORE__
 
 // C Includes
@@ -336 +338 @@
 
                 /* paranoid */ verify( this.do_terminate == true );
-                __cfaabi_dbg_print_safe("Kernel : destroyed main processor context %p\n", &runner);
+                __cfadbg_print_safe(runtime_core, "Kernel : destroyed main processor context %p\n", &runner);
         }
 
@@ -397 +399 @@
         (proc->runner){ proc, &info };
 
-        __cfaabi_dbg_print_safe("Coroutine : created stack %p\n", get_coroutine(proc->runner)->stack.storage);
+        __cfadbg_print_safe(runtime_core, "Coroutine : created stack %p\n", get_coroutine(proc->runner)->stack.storage);
 
         //Set global state
@@ -662 +664 @@
         io.params = io_params;
 
+        managed.procs = 0p;
+        managed.cnt = 0;
+
         doregister(this);
 
@@ -677 +682 @@
 
 void ^?{}(cluster & this) libcfa_public {
+        set_concurrency( this, 0 );
+
         destroy(this.io.arbiter);
 
@@ -848 +855 @@
 }
 
+unsigned set_concurrency( cluster & this, unsigned new ) libcfa_public {
+        unsigned old = this.managed.cnt;
+
+        __cfadbg_print_safe(runtime_core, "Kernel : resizing cluster from %u to %u\n", old, (unsigned)new);
+
+        // Delete all the old unneeded procs
+        if(old > new) for(i; (unsigned)new ~ old) {
+                __cfadbg_print_safe(runtime_core, "Kernel : destroying %u\n", i);
+                delete( this.managed.procs[i] );
+        }
+
+        // Allocate new array (uses realloc and memcpies the data)
+        this.managed.procs = alloc( new, this.managed.procs`realloc );
+        this.managed.cnt = new;
+
+        // Create the desired new procs
+        if(old < new) for(i; old ~ new) {
+                __cfadbg_print_safe(runtime_core, "Kernel : constructing %u\n", i);
+                (*(this.managed.procs[i] = alloc())){ this };
+        }
+
+        // return the old count
+        return old;
+}
+
 #if defined(__CFA_WITH_VERIFY__)
 static bool verify_fwd_bck_rng(void) {